CVS commit: pkgsrc/geography/qgis

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Tue Jun 28 16:57:51 UTC 2016

Modified Files:
        pkgsrc/geography/qgis: PLIST PLIST.python distinfo options.mk
Added Files:
        pkgsrc/geography/qgis/patches: patch-src_crssync_CMakeLists.txt

Log Message:
Build fixes:
- even if python bindings are not selected, it is needed as a tool
  for build
- during build, it wants to run an executable from the build dir,
  which fails to find a not-yet-installed shared librarie.
  Fixed by calling it with appropriate LD_LIBRARY_PATH set
- fix PLIST
no PKGREVISION bump as it didn't build before.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/geography/qgis/PLIST \
    pkgsrc/geography/qgis/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/qgis/PLIST.python
cvs rdiff -u -r1.8 -r1.9 pkgsrc/geography/qgis/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/qgis/patches/patch-src_crssync_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/qgis/PLIST
diff -u pkgsrc/geography/qgis/PLIST:1.5 pkgsrc/geography/qgis/PLIST:1.6
--- pkgsrc/geography/qgis/PLIST:1.5     Tue Feb  2 04:33:57 2016
+++ pkgsrc/geography/qgis/PLIST Tue Jun 28 16:57:51 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/02/02 04:33:57 dbj Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/06/28 16:57:51 bouyer Exp $
 bin/qbrowser
 bin/qgis
 bin/qgis_bench
@@ -618,8 +618,6 @@ lib/libqgis_gui.so.${PKGVERSION}
 lib/libqgis_gui.so
 lib/libqgis_networkanalysis.so.${PKGVERSION}
 lib/libqgis_networkanalysis.so
-lib/libqgispython.so.${PKGVERSION}
-lib/libqgispython.so
 lib/qgis/crssync
 lib/qgis/plugins/libbasicauthmethod.so
 lib/qgis/plugins/libcoordinatecaptureplugin.so
Index: pkgsrc/geography/qgis/options.mk
diff -u pkgsrc/geography/qgis/options.mk:1.5 pkgsrc/geography/qgis/options.mk:1.6
--- pkgsrc/geography/qgis/options.mk:1.5        Tue Feb  2 04:33:57 2016
+++ pkgsrc/geography/qgis/options.mk    Tue Jun 28 16:57:51 2016
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2016/02/02 04:33:57 dbj Exp $
+# $NetBSD: options.mk,v 1.6 2016/06/28 16:57:51 bouyer Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qgis
 PKG_SUPPORTED_OPTIONS= python
@@ -12,6 +12,8 @@ PKG_SUPPORTED_OPTIONS=        python
 
 .if empty(PKG_OPTIONS:Mpython)
 CMAKE_ARGS+=           -DWITH_BINDINGS:BOOL=FALSE
+PYTHON_FOR_BUILD_ONLY= YES
+.include "../../lang/python/application.mk"
 .else
 CMAKE_ARGS+=           -DWITH_BINDINGS:BOOL=TRUE
 CMAKE_ARGS+=           -DSIP_BINARY_PATH:PATH=${BUILDLINK_PREFIX.py-sip}/bin

Index: pkgsrc/geography/qgis/PLIST.python
diff -u pkgsrc/geography/qgis/PLIST.python:1.1 pkgsrc/geography/qgis/PLIST.python:1.2
--- pkgsrc/geography/qgis/PLIST.python:1.1      Tue Feb  2 04:33:57 2016
+++ pkgsrc/geography/qgis/PLIST.python  Tue Jun 28 16:57:51 2016
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST.python,v 1.1 2016/02/02 04:33:57 dbj Exp $
+@comment $NetBSD: PLIST.python,v 1.2 2016/06/28 16:57:51 bouyer Exp $
+lib/libqgispython.so.${PKGVERSION}
+lib/libqgispython.so
 share/qgis/python/console/__init__.py
 share/qgis/python/console/console.py
 share/qgis/python/console/console_compile_apis.py

Index: pkgsrc/geography/qgis/distinfo
diff -u pkgsrc/geography/qgis/distinfo:1.8 pkgsrc/geography/qgis/distinfo:1.9
--- pkgsrc/geography/qgis/distinfo:1.8  Tue Feb  2 04:33:57 2016
+++ pkgsrc/geography/qgis/distinfo      Tue Jun 28 16:57:51 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2016/02/02 04:33:57 dbj Exp $
+$NetBSD: distinfo,v 1.9 2016/06/28 16:57:51 bouyer Exp $
 
 SHA1 (qgis-2.12.3.tar.bz2) = b2b8b6bda01ebec7ccbc8ab41d0e00fa6be217be
 RMD160 (qgis-2.12.3.tar.bz2) = 6b3350e978d27397020b01983ceaa00104d1bd17
@@ -13,3 +13,4 @@ SHA1 (patch-mac_CMakeLists.txt) = 2468c0
 SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
 SHA1 (patch-src_core_CMakeLists.txt) = 4c504717fbce05984e9ac5867d407f9dcfa11d25
 SHA1 (patch-src_core_qgsapplication.cpp) = f6e81f86220c6bf85b55ee2f5fd8d6c7667ec385
+SHA1 (patch-src_crssync_CMakeLists.txt) = 49b551cd2231704dac0872b7c8893b5bdda3e0ad

Added files:

Index: pkgsrc/geography/qgis/patches/patch-src_crssync_CMakeLists.txt
diff -u /dev/null pkgsrc/geography/qgis/patches/patch-src_crssync_CMakeLists.txt:1.1
--- /dev/null   Tue Jun 28 16:57:51 2016
+++ pkgsrc/geography/qgis/patches/patch-src_crssync_CMakeLists.txt      Tue Jun 28 16:57:51 2016
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_crssync_CMakeLists.txt,v 1.1 2016/06/28 16:57:51 bouyer Exp $
+Fix executing dynamically-linked executable from the build directory
+
+--- src/crssync/CMakeLists.txt.orig    2016-06-26 16:02:58.000000000 +0200
++++ src/crssync/CMakeLists.txt 2016-06-26 16:04:09.000000000 +0200
+@@ -22,7 +22,7 @@
+       )
+ ELSE(MSVC AND NOT USING_NMAKE)
+       ADD_CUSTOM_TARGET(synccrsdb
+-              COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync
++              COMMAND env LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../lib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync
+               DEPENDS crssync
+       )
+ ENDIF(MSVC AND NOT USING_NMAKE)