nixpkgs/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch
2018-08-09 17:36:51 +02:00

48 lines
1.3 KiB
Diff

--- a/backend/wbpublic/grt/spatial_handler.h
+++ b/backend/wbpublic/grt/spatial_handler.h
@@ -24,12 +24,12 @@
#ifndef SPATIAL_HANDLER_H_
#define SPATIAL_HANDLER_H_
-#include <gdal/ogrsf_frmts.h>
-#include <gdal/ogr_api.h>
-#include <gdal/gdal_pam.h>
-#include <gdal/memdataset.h>
-#include <gdal/gdal_alg.h>
-#include <gdal/gdal.h>
+#include <ogrsf_frmts.h>
+#include <ogr_api.h>
+#include <gdal_pam.h>
+#include <memdataset.h>
+#include <gdal_alg.h>
+#include <gdal.h>
#include <deque>
#include "base/geometry.h"
#include "wbpublic_public_interface.h"
--- a/backend/wbpublic/grtui/geom_draw_box.h
+++ b/backend/wbpublic/grtui/geom_draw_box.h
@@ -25,7 +25,7 @@
#define _GEOM_DRAW_BOX_H_
#include <mforms/drawbox.h>
-#include <gdal/ogr_geometry.h>
+#include <ogr_geometry.h>
#include "wbpublic_public_interface.h"
class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox {
--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp
@@ -21,9 +21,9 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <gdal/ogrsf_frmts.h>
-#include <gdal/ogr_api.h>
-#include <gdal/gdal.h>
+#include <ogrsf_frmts.h>
+#include <ogr_api.h>
+#include <gdal.h>
#include <grts/structs.db.query.h>
#include <grtpp_util.h>