On 05/10/15 08:18, Christoph Willing wrote:
On 05/10/15 07:44, Benjamin Trigona-Harany wrote:On October 4, 2015 22:46:44 Christoph Willing wrote:However for qgis, an additional SlackBuild for 'qwtpolar' will be required to replace the quite old private version of qwtpolar contained in the qgis source tarball (since it is incompatible with the up to date qwt). Fortunately qgis configuration facilitates the use of external qwtpolar (which I'll email the qgis maintainer about by separate email) and, to enable this to work, I've prepared a new SlackBuild for qwtpolar which I'll submit at the same time as the updated SlackBuild for qwt. I've built and tested qgis with the new qwt & qwtpolar combination and it all seems to work fine.Can you post the new qwt and qwtpolar SlackBuilds here prior to submitting them? I can then test against QGIS and submit an update in conjunction.Yes, will do.
The qwt & qwtpolar SlackBuilds are attached for testing prior to submission. To incorporate the changes, the qgis.info file should name qwtpolar instead of qwt in the REQUIRES line (qwtpolar already REQUIRES qwt); in the qgis.SlackBuild, configure to use external qwtpolar and give location of the qwtpolar include directory by adding:
-DWITH_INTERNAL_QWTPOLAR="off" \ -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
I was reminded that implications for other SlackBuilds which _optionally_ require qwt also need to be checked - I'll work through those today
For those interested, the SlackBuilds which have qwt as an optional build dependency are ophcrack and gnuradio. AFAICS this proposed qwt update has no effect on either of these (although for different reasons).
In fact ophcrack, which REQUIRES qwt when the build environment has GRAPH=yes, doesn't even build with the existing qwt version so updating qwt has no effect on ophcrack. An even older qwt in the 5.x.x series is required for ophcrack to build with GRAPH=yes.
The SlackBuild for gnuradio builds just fine with the updated qwt version. No particular options need to be set; if qwt is installed at build time, it is detected and (presumably) used. I say 'presumably' because I'm unsure how to test the runtime. Does anyone else know how to run gnuradio and perhaps test this more thoroughly?
chris
qwt.tar.gz
Description: application/gzip
qwtpolar.tar.gz
Description: application/gzip
diff --git a/gis/qgis/qgis.SlackBuild b/gis/qgis/qgis.SlackBuild
index 0cdd36a..24473a3 100644
--- a/gis/qgis/qgis.SlackBuild
+++ b/gis/qgis/qgis.SlackBuild
@@ -89,6 +89,8 @@ cmake . \
-DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \
-DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
-DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
+ -DWITH_INTERNAL_QWTPOLAR="off" \
+ -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
$WITHSERVER \
$WITHGRASS
diff --git a/gis/qgis/qgis.info b/gis/qgis/qgis.info
index a6b8be5..f4104b3 100644
--- a/gis/qgis/qgis.info
+++ b/gis/qgis/qgis.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://qgis.org/downloads/qgis-2.10.1.tar.bz2";
MD5SUM="8d719b6013ba0e2adb9a2dd642e9e9c5"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="gdal libspatialindex libspatialite numpy psycopg2 qwt"
+REQUIRES="gdal libspatialindex libspatialite numpy psycopg2 qwtpolar"
MAINTAINER="Benjamin Trigona-Harany"
EMAIL="slackbui...@jaxartes.net"
_______________________________________________ SlackBuilds-users mailing list SlackBuilds-users@slackbuilds.org http://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users Archives - http://lists.slackbuilds.org/pipermail/slackbuilds-users/ FAQ - http://slackbuilds.org/faq/
