From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- sci-geosciences/qgis/Manifest | 8 +- .../qgis/files/qgis-2.18.3-app-icon.patch | 13 -- .../qgis/files/qgis-2.18.3-qscintilla-2.10.patch | 24 --- .../qgis/files/qgis-2.18.3-sip-4.19.1.patch | 42 ---- .../qgis/files/qgis-2.18.3-sip-4.19.patch | 237 --------------------- .../qgis/files/qgis-2.18.3-webkit.patch | 112 ---------- sci-geosciences/qgis/qgis-2.18.14.ebuild | 213 ++++++++++++++++++ 7 files changed, 216 insertions(+), 433 deletions(-) delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch delete mode 100644 sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch create mode 100644 sci-geosciences/qgis/qgis-2.18.14.ebuild (limited to 'sci-geosciences/qgis') diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 51daa3e89ffa..24aa3b3753a1 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,16 +1,14 @@ AUX qgis-2.18.12-cmake-lib-suffix.patch 454 SHA256 af1f41155f744165eff63a8ebee61849e99048cb96d8bb89273e3744e5c10e36 SHA512 f6b04bddf4d60d4eec257fb71cf87e15e7a72c34c1016e8eadeb660ebc7079cb8b9104041e4df5e7cbe0e00954ad65ced53b7e19f3f9f7cfbee1b791874ddcd7 WHIRLPOOL f60930ed0fb0010ebaf79d5af41e6124a5eb3cc00e74646743b1afa1738973bbc579a91d60316c2a74a48b07bf6ea13f604fe412fbdba360c5f6ff1687dc1051 AUX qgis-2.18.12-sip.patch 4471 SHA256 9b8be7b20f20361234b2e648ce65278bac8a39107bb52a1badde828002d7f542 SHA512 df08773c915ee640b6ef81ffdb1553e144f5530934bed3a37230824662fa99de91bcc52475f7232e44df3ebd147abf54f537b6a23b02563a5155c14a7d2cb9a6 WHIRLPOOL fec7021a807b4d0f7fefc17fe8699523c7a1fb5da01a090a6c70004990e192cbcf174fcd089a60edd0d9f135ea6493ade10c012c26ed6dfd5e35078003fe2beb -AUX qgis-2.18.3-app-icon.patch 450 SHA256 7172158c06f80552e5aa1da9c477ad87416290f166195f5959aa34aa66a6403a SHA512 725874337fe5d9301e481cea7f30b3f804b8277a79170dc64a7c24f131cb875c89e2d60f3d8aacf20fb31f6d1d8f0d4ac1750320ed5a6f0d28a20ac026decf7b WHIRLPOOL 6648c8f5e0648fffdc28413fe8bc3e880fc69bc7b79956fdbeb942e932b5cecd570ac2ed9336c9ba8ba12b6fdbe44ec443d1a5f1d2c47b0bd4b8aaf9af7fbc0d -AUX qgis-2.18.3-qscintilla-2.10.patch 979 SHA256 4cb5a765f10d7f08bbb992e406705b31619373d3fe07e22f49d339b7b1366d33 SHA512 3a74c41e3a27e4d66dc0b6812e987352daa7ea94e9c287867028716c66ef8ed6b959ec26e2a14c4c0e6f3cd29cbd0c34f9fc32f296292e6af4f37dfaba90862a WHIRLPOOL 24522d9da5f3962910b80a77a49171c9fa6a7e1e02a5098334c54504a85248d9611c708e0c32f9d06b294b0cf764d21b0e1b831eca493859ae3caa4e6960ba7d -AUX qgis-2.18.3-sip-4.19.1.patch 1375 SHA256 9f64810ec9e7956f1ffc94fe793b3f8acb6510a3e2c79007a8b4effbccfe4603 SHA512 178d2ef9196b950b25a90f5fdf296edbc229b1e071f7106d423ab3ac515f361161b495452b62115663c6a658de2b0dd3bae2a443c34d6d5f40db243ec6bccb91 WHIRLPOOL fb770c3c3a4f7ea81c8289630c98dd0c239ac215ff4612d11a6ffdc2aeeca6faacdacdd0f1e135a9cec65744cc6f11fbedb48b1a2012495668594bcf79b7d59f -AUX qgis-2.18.3-sip-4.19.patch 9262 SHA256 537a525d35bbf8b87f7f01fa4cf0691a2d0ddc7dbfb677ae8a39f2524de0daa6 SHA512 93b1cad9aabb790071da2790359d9703062ab26b2845463c2b8069c48ab57b569e67b5ed318e3740a5cc3714feaa1b16371d91be6aaaa0d166e2f7629b8326c9 WHIRLPOOL ef07b9949fa74486984dfa52adbe9a301cdcbd3d10b79c57ae50de1237edc85d35b2f8d3c69636d48f6d846b57be0102d94d9a322643908d40bdae8a7181dde8 -AUX qgis-2.18.3-webkit.patch 3421 SHA256 9ca27bb9c9ce3859f6ae0ade56f1914b102d7f055dae5cb34055fb5dc2a684ce SHA512 4ef6dcac0c9c8b6fe58fd3ed2bde8bb04377b39bc53a97dbc83873ebc3cdbcd5f31a046563131628578015e2542a37be334dfa6a2eecdef60094b895fc9ac367 WHIRLPOOL e1ffe2f079891551cac58d1cfce74f34cb8a8885fb172596bf51ee681cbf8fd7c4ea3e4cf3c05614d1fdfdfb62d6bb7346f2492056faf2160b3b70d3deff22c1 AUX qgis-2.18.6-featuresummary.patch 1009 SHA256 a41a5685947e6941318d68da3e309cca387913844654e9859ad6dd863cbf90fe SHA512 4f271d7fb5b39b49bd06cb6308e82b44088978e2fcc17e453dcdc71655000b91be06e08ce05a373ed45d25472422a7b317c12b19a3a41620df07ea723766b44e WHIRLPOOL 2bb5e0e8ba71c43b52d3ce4309f25cf8ed174d53196803521c393b12a3205b8f06fbe5fbcdb300988840c82b2322b222d626b799020cf516121edc642aedc3d2 AUX qgis-2.18.6-python.patch 647 SHA256 db3fad5e56c1c83b686aea92828f62b015317bd89d42ea02c6d911c64f75416b SHA512 71d3ab2c1669e76fbfdb5700906c4940f74111e698b19111f148c6e96dd900f9527fc92e6ddbd801318d788f7348ad8ac294fd26e5f7e5ed1bde5bdd6b23e49c WHIRLPOOL f4d2e1cb108e34d012fc5b17ad20dfce1fa8ab99fef9fc9a69f4c40de430701b5b8941354a7a9d07b11bb3bca1644c373e2d40e8174b5b61685fc60d888c93fe DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2 +DIST qgis-2.18.14.tar.bz2 84935301 SHA256 d82176ab71ce3e70aae1bbb65478a730ef85b6263a186fddea0eb599466136a5 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036 WHIRLPOOL 2d43a673e77c460eca9a2a87e914b7ebe1c20315e9ce3133f8285c0c5e5db89e25144a672453fc0ca1441bd1f52cd3bcc507904e3f215def619ef7155487aa35 +DIST qgis_sample_data-2.8.14.tar.gz 22119181 SHA256 cb1d92ce42df1e7c1cc2e25d02cb86e51a007a07f7f9d046123e80b0d4815d66 SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d WHIRLPOOL d17970636b1aad6f25ee5334b9bd9809c4c2f91c69ccf1cf4cc4b158c4484504cf718f18207c24c1865fec3d43f4ea74fa16ff8c8f9a55a65a29aa49aaadef0c DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5 EBUILD qgis-2.18.12-r100.ebuild 6075 SHA256 d28f574e1c37ac4f4ce5074bc2dd5efc12ccacf222d7a693c7ad60c39a7cb59b SHA512 721ed584321140c52890025c78e9faa32fb867fbe24572e3730c0ba3ef24864ab8c8338faf29ec93abc69dd581a00b319e533e42fb0a3c37435596212c8f2971 WHIRLPOOL bfb1cfefe14eba89f6e8a049aaf372d19514a379325353450f16856b24cbecf6575e64db192778c851c55dd941a3adfb12f8baccdb6f4919195873f83ed6598a EBUILD qgis-2.18.12.ebuild 5279 SHA256 e26d5ca8092c603a539ce3d2c40b028c4e6ec7253d619bdb250ccd5c02219c22 SHA512 8118478f8aa8bc7ca5221f48125b6fab899bb8bd4db12da89472fc853f1b0eb8094a51c715e1962970b67462b7ed7939f9a92142b52442fd9d735ab3ce9162a4 WHIRLPOOL 9906af26c34de96a6a8eb539da9dd98f3568d0f64a7b86d621a3f540529a636bd13b48742a3ca7f3c4ac815766b9eaf5003252988f787343b71b8d9855fb8e22 +EBUILD qgis-2.18.14.ebuild 5331 SHA256 c8afd993d8ccdae115484c6e64102d7596d9ab2f288e374a6628a1b7b932ccfa SHA512 b62acaea5e1f8a1467593f194cde90ef2558f64cd915f517a042299865822656db8a743c47cd2f8bfd3710fdbb7ec4ed66ba8f5cab681392db6852927d91b341 WHIRLPOOL 6987c7a6b54d8d61b84f31064a5748cdb5ec3c11891e0aa98cc3f038fd8594082782a3c49c2060ee1804d6028a050f30755146cf250da6365f810fa6297c3788 MISC ChangeLog 5606 SHA256 2194b9ce875fc2c047cd72860eb1102be58bc258fdb2304b3e3b432aabc6e6f6 SHA512 8e9f1a7e76fdd867f6ff55933e5d830ce63a11af198e507ac63398ccbb2d523a8aed5d0bf658fc6a70b2f8e3a67199147afcc5a3ed14875692e2aa765415f0ad WHIRLPOOL 345d823ba23855899e49dc9cc84d14010b0282546cb41904fe0e1752685375409382eb664b96819a0dce6b452a69e8bf93fafa8e53dc3ae34ae5015343f4de15 MISC ChangeLog-2015 6138 SHA256 b60aea60ba8f8b74f6af622e091a20328543791c9c09a25a0fc81aafbde619ac SHA512 a800fda8303e7cb23248e104b3abe7f3e0504747328cef3bcf59ef42770cc030ef01c0c73fa3f676152eddf6cd72bf570a3beea9936c459806487015a29f1099 WHIRLPOOL eb471fd020db5f343452fd0c2ee1914310d782de5374b5d5c4691b80fdd4a8943ece63717db5cbe619cf7178ddfaef4d97b0d61a3edcfaab0c259aa4143e81d8 MISC metadata.xml 1105 SHA256 179c61e75a0ca68c842bbb4aae598cd9bd8ed9902eb47459e789eb132d708270 SHA512 d16c2396c35d915e1d284aaa7b59118b9a66284fcd5e8cfef8b5835b88bf75e3a3ede1b6e7d939e403aa212190afc49b51deebc4868bfa38b44d2e6c25150fa4 WHIRLPOOL 1508c63a67b9eff0e6f43b8b7a25c0e5674557edf4c2914ae94d7d2535cd6a200f338b6fffe00059d8a130c22f630f14b57e4768e33b30fceca7dac4688c256b diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch b/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch deleted file mode 100644 index 88db963bcaff..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.3-app-icon.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp -index 4cdb07e..76ffc09 100644 ---- a/src/core/qgsapplication.cpp -+++ b/src/core/qgsapplication.cpp -@@ -396,7 +396,7 @@ QString QgsApplication::activeThemePath() - - QString QgsApplication::appIconPath() - { -- return QString( "qgis-icon-60x60.png" ); -+ return iconsPath() + QStringLiteral( "qgis-icon-60x60.png" ); - } - - QString QgsApplication::iconPath( const QString& iconFile ) diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch b/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch deleted file mode 100644 index fb714654579d..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.3-qscintilla-2.10.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 30577386cbe0ee9a5509e7f6f54df2c1194153ee Mon Sep 17 00:00:00 2001 -From: Larry Shaffer -Date: Thu, 2 Mar 2017 15:00:18 -0700 -Subject: [PATCH] Followup to dfe268f; update QScintilla new lib name in 2.10 - for Qt4 - -[ci skip] ---- - cmake/FindQScintilla.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake -index 7f97624..2f87e4c 100644 ---- a/cmake/FindQScintilla.cmake -+++ b/cmake/FindQScintilla.cmake -@@ -36,7 +36,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR) - if(ENABLE_QT5) - set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib) - else(ENABLE_QT5) -- set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib) -+ set(QSCINTILLA_LIBRARY_NAMES qscintilla2 qscintilla2_qt4 libqscintilla2 libqscintilla2.dylib) - endif(ENABLE_QT5) - - find_library(QSCINTILLA_LIBRARY diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch deleted file mode 100644 index ff8989227f69..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 85a0db24f32351f6096cd8282f03ad5c2f4e6ef5 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Wed, 1 Mar 2017 16:12:38 +0100 -Subject: [PATCH] Fix build against recent sip/PyQt4: - -qgsfiledownloader.sip:33:0: -src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()' - -RuntimeError: qgis._core cannot import type 'QList' from PyQt4.QtCore ---- - python/core/core.sip | 1 + - src/gui/qgsfiledownloader.h | 4 +++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/python/core/core.sip b/python/core/core.sip -index 8f0b6af..41f5450 100644 ---- a/python/core/core.sip -+++ b/python/core/core.sip -@@ -3,6 +3,7 @@ - - %Feature QT5_SUPPORT - -+%Import QtCore/QtCoremod.sip - %Import QtXml/QtXmlmod.sip - %Import QtNetwork/QtNetworkmod.sip - %Import QtSql/QtSqlmod.sip -diff --git a/src/gui/qgsfiledownloader.h b/src/gui/qgsfiledownloader.h -index c9276f7..841e4b6 100644 ---- a/src/gui/qgsfiledownloader.h -+++ b/src/gui/qgsfiledownloader.h -@@ -90,8 +90,10 @@ class GUI_EXPORT QgsFileDownloader : public QObject - void onSslErrors( QNetworkReply *reply, const QList &errors ); - #endif - -- private: -+ protected: - ~QgsFileDownloader(); -+ -+ private: - /** - * Abort current request and show an error if the instance has GUI - * notifications enabled. diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch deleted file mode 100644 index f72e0e4fd17d..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch +++ /dev/null @@ -1,237 +0,0 @@ -commit 718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb -Author: Juergen E. Fischer -Date: Sat Feb 11 21:02:05 2017 +0100 - - adapt bindings to sip 4.19 (fixes #16071) - -diff --git a/python/analysis/analysis.sip b/python/analysis/analysis.sip -index ceb5056..bd90e10 100644 ---- a/python/analysis/analysis.sip -+++ b/python/analysis/analysis.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._analysis, -- version=0, - keyword_arguments="Optional") - - %Import QtCore/QtCoremod.sip -diff --git a/python/analysis/network/networkanalysis.sip b/python/analysis/network/networkanalysis.sip -index fb446d1..d2c192b 100644 ---- a/python/analysis/network/networkanalysis.sip -+++ b/python/analysis/network/networkanalysis.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._networkanalysis, -- version=0, - keyword_arguments="Optional") - - %Import QtCore/QtCoremod.sip -diff --git a/python/core/conversions.sip b/python/core/conversions.sip -index 564d4de..f07d3ab 100644 ---- a/python/core/conversions.sip -+++ b/python/core/conversions.sip -@@ -747,7 +747,7 @@ template - - // QMap is implemented as a Python dictionary. - template --%MappedType QMap /DocType="dict-of-qint64-TYPE"/ -+%MappedType QMap - { - %TypeHeaderCode - #include -@@ -1873,7 +1873,7 @@ template - }; - - // QList is implemented as a Python list of QgsField. --%MappedType QList /DocType="list-of-qgsfield"/ -+%MappedType QList - { - %TypeHeaderCode - #include -@@ -1978,7 +1978,7 @@ template - - %If (QVECTORINT_CONVERSION) - // QVector is implemented as a Python list of integers. --%MappedType QVector /DocType="list-of-int"/ -+%MappedType QVector - { - %TypeHeaderCode - #include -diff --git a/python/core/core.sip b/python/core/core.sip -index 577c4c1..8f0b6af 100644 ---- a/python/core/core.sip -+++ b/python/core/core.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._core, -- version=0, - keyword_arguments="Optional") - - %Feature QT5_SUPPORT -diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip -index c14ba53..f9b7854 100644 ---- a/python/core/qgscoordinatetransform.sip -+++ b/python/core/qgscoordinatetransform.sip -@@ -15,6 +15,7 @@ - class QgsCoordinateTransform : QObject - { - %TypeHeaderCode -+extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part - #include - %End - -@@ -215,5 +216,5 @@ class QgsCoordinateTransform : QObject - - signals: - /** Signal when an invalid pj_transform() has occurred */ -- void invalidTransformInput() const; -+ void invalidTransformInput() const; - }; -diff --git a/python/core/qgsfeature.sip b/python/core/qgsfeature.sip -index 596f8a8..4009b50 100644 ---- a/python/core/qgsfeature.sip -+++ b/python/core/qgsfeature.sip -@@ -4,7 +4,7 @@ typedef QMap QgsAttributeMap; - typedef QVector QgsAttributes; - - // QgsAttributes is implemented as a Python list of Python objects. --%MappedType QgsAttributes /DocType="list-of-attributes"/ -+%MappedType QgsAttributes - { - %TypeHeaderCode - #include -diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip -index 488b58b..3d99555 100644 ---- a/python/core/qgspallabeling.sip -+++ b/python/core/qgspallabeling.sip -@@ -1,5 +1,5 @@ - // QMap is implemented as a Python dictionary. --%MappedType QMap /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined*"/ -+%MappedType QMap - { - %TypeHeaderCode - #include -diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip -index 0685e20..ad3431c 100644 ---- a/python/core/qgsvectorlayerfeatureiterator.sip -+++ b/python/core/qgsvectorlayerfeatureiterator.sip -@@ -70,5 +70,6 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator - //void updateFeatureGeometry( QgsFeature& f ); - - private: -- QgsVectorLayerFeatureIterator(); -+ QgsVectorLayerFeatureIterator( const QgsVectorLayerFeatureIterator &rhs ); -+ - }; -diff --git a/python/core/raster/qgsrasterprojector.sip b/python/core/raster/qgsrasterprojector.sip -index 47bb697..40b9a10 100644 ---- a/python/core/raster/qgsrasterprojector.sip -+++ b/python/core/raster/qgsrasterprojector.sip -@@ -55,7 +55,7 @@ class QgsRasterProjector : QgsRasterInterface - - int bandCount() const; - -- int dataType( int bandNo ) const; -+ QGis::DataType dataType( int bandNo ) const; - - /** \brief set source and destination CRS */ - void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS, -diff --git a/python/gui/editorwidgets/qgsdatetimeedit.sip b/python/gui/editorwidgets/qgsdatetimeedit.sip -index deda76d..be658a1 100644 ---- a/python/gui/editorwidgets/qgsdatetimeedit.sip -+++ b/python/gui/editorwidgets/qgsdatetimeedit.sip -@@ -37,6 +37,7 @@ class QgsDateTimeEdit : QDateTimeEdit - - protected: - virtual void resizeEvent( QResizeEvent* event ); -- - void mousePressEvent( QMouseEvent*event ); -+ virtual void fixup(QString & input) const; -+ virtual QValidator::State validate(QString &text, int &pos) const; - }; -diff --git a/python/gui/editorwidgets/qgsdoublespinbox.sip b/python/gui/editorwidgets/qgsdoublespinbox.sip -index 1666a02..58f589d 100644 ---- a/python/gui/editorwidgets/qgsdoublespinbox.sip -+++ b/python/gui/editorwidgets/qgsdoublespinbox.sip -@@ -80,4 +80,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox - protected: - virtual void changeEvent( QEvent* event ); - virtual void paintEvent( QPaintEvent* event ); -+ virtual void fixup(QString & input) const; - }; -diff --git a/python/gui/editorwidgets/qgsspinbox.sip b/python/gui/editorwidgets/qgsspinbox.sip -index d560641..c953470 100644 ---- a/python/gui/editorwidgets/qgsspinbox.sip -+++ b/python/gui/editorwidgets/qgsspinbox.sip -@@ -78,7 +78,7 @@ class QgsSpinBox : QSpinBox - virtual QValidator::State validate( QString & input, int & pos ) const; - - protected: -- - virtual void changeEvent( QEvent* event ); - virtual void paintEvent( QPaintEvent* event ); -+ virtual void fixup(QString &input) const; - }; -diff --git a/python/gui/gui.sip b/python/gui/gui.sip -index 240c636..727ac70 100644 ---- a/python/gui/gui.sip -+++ b/python/gui/gui.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._gui, -- version=0, - keyword_arguments="Optional") - - %Feature HAVE_QSCI_SIP -diff --git a/python/gui/qgslonglongvalidator.sip b/python/gui/qgslonglongvalidator.sip -index 9def830..7500357 100644 ---- a/python/gui/qgslonglongvalidator.sip -+++ b/python/gui/qgslonglongvalidator.sip -@@ -8,7 +8,7 @@ class QgsLongLongValidator : QValidator - QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent ); - ~QgsLongLongValidator(); - -- QValidator::State validate( QString &input, int& ) const; -+ virtual QValidator::State validate( QString &input, int& ) const; - - void setBottom( qint64 bottom ); - void setTop( qint64 top ); -@@ -17,4 +17,6 @@ class QgsLongLongValidator : QValidator - - qint64 bottom() const; - qint64 top() const; -+ -+ virtual void fixup(QString &input) const; - }; -diff --git a/python/server/qgswmsconfigparser.sip b/python/server/qgswmsconfigparser.sip -index f05752c..d231637 100644 ---- a/python/server/qgswmsconfigparser.sip -+++ b/python/server/qgswmsconfigparser.sip -@@ -115,7 +115,7 @@ class QgsWMSConfigParser - virtual void setScaleDenominator( double denom ) = 0; - virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0; - -- virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0; -+ // virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0; - - virtual int nLayers() const = 0; - -diff --git a/python/server/qgswmsprojectparser.sip b/python/server/qgswmsprojectparser.sip -index f6dd579..13fea73 100644 ---- a/python/server/qgswmsprojectparser.sip -+++ b/python/server/qgswmsprojectparser.sip -@@ -63,7 +63,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser - void setScaleDenominator( double ) /*override*/; - void addExternalGMLData( const QString&, QDomDocument* ) /*override*/ ; - -- QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ; -+ // QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ; - - /** Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success*/ - int layersAndStyles( QStringList& layers, QStringList& styles ) const /*override*/ ; -diff --git a/python/server/server.sip b/python/server/server.sip -index 537cd0b..355d3fa 100644 ---- a/python/server/server.sip -+++ b/python/server/server.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._server, -- version=0, - keyword_arguments="Optional") - - diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch b/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch deleted file mode 100644 index 971ffde83a9b..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch +++ /dev/null @@ -1,112 +0,0 @@ -commit 222ae663e6ee6f718e45faafd63758c319fec135 -Author: Andreas Sturmlechner -Date: Sun Feb 19 12:51:48 2017 +0100 - - Fix QtWebKit automagic - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3936521..4268019 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -288,6 +288,10 @@ ELSE() - MESSAGE(STATUS "Found Qt version: ${QTVERSION}") - ENDIF() - -+IF(WITH_QTWEBKIT) -+ SET(OPTIONAL_QTWEBKIT ${QT_QTWEBKIT_LIBRARY}) -+ENDIF(WITH_QTWEBKIT) -+ - IF (WITH_QTMOBILITY) - FIND_PACKAGE(QtMobility 1.1.0) - ENDIF (WITH_QTMOBILITY) -diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt -index 15579de..b6ef545 100644 ---- a/src/app/CMakeLists.txt -+++ b/src/app/CMakeLists.txt -@@ -609,7 +609,7 @@ TARGET_LINK_LIBRARIES(qgis_app - ${QWT_LIBRARY} - ${QT_QTSQL_LIBRARY} - ${QT_QTUITOOLS_LIBRARY} -- ${QT_QTWEBKIT_LIBRARY} -+ ${OPTIONAL_QTWEBKIT} - #should only be needed for win - ${QT_QTMAIN_LIBRARY} - ${QWTPOLAR_LIBRARY} -diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt -index e53c1de..1a72070 100644 ---- a/src/browser/CMakeLists.txt -+++ b/src/browser/CMakeLists.txt -@@ -80,7 +80,7 @@ TARGET_LINK_LIBRARIES(qbrowser - ${QT_QTNETWORK_LIBRARY} - ${QT_QTSVG_LIBRARY} - ${QT_QTXML_LIBRARY} -- ${QT_QTWEBKIT_LIBRARY} -+ ${OPTIONAL_QTWEBKIT} - ${QT_QTMAIN_LIBRARY} - ${SQLITE3_LIBRARY} - ) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index e2d9ae8..cd8e305 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -981,7 +981,7 @@ TARGET_LINK_LIBRARIES(qgis_core - ${QT_QTGUI_LIBRARY} - ${QT_QTNETWORK_LIBRARY} - ${QT_QTSVG_LIBRARY} -- ${QT_QTWEBKIT_LIBRARY} -+ ${OPTIONAL_QTWEBKIT} - ${QT_QTSQL_LIBRARY} - ${QCA_LIBRARY} - -diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt -index cec5ad1..ffd0966 100644 ---- a/src/helpviewer/CMakeLists.txt -+++ b/src/helpviewer/CMakeLists.txt -@@ -68,7 +68,7 @@ TARGET_LINK_LIBRARIES(qgis_help - ${QT_QTNETWORK_LIBRARY} - ${QT_QTSVG_LIBRARY} - ${QT_QTXML_LIBRARY} -- ${QT_QTWEBKIT_LIBRARY} -+ ${OPTIONAL_QTWEBKIT} - ${QT_QTMAIN_LIBRARY} - ${SQLITE3_LIBRARY} - ) -diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt -index b605a6a..aa45a27 100644 ---- a/tests/bench/CMakeLists.txt -+++ b/tests/bench/CMakeLists.txt -@@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(qgis_bench - ${QT_QTNETWORK_LIBRARY} - ${QT_QTSVG_LIBRARY} - ${QT_QTXML_LIBRARY} -- ${QT_QTWEBKIT_LIBRARY} -+ ${OPTIONAL_QTWEBKIT} - ${QT_QTMAIN_LIBRARY} - ${QT_QTTEST_LIBRARY} - ) -diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt -index f1c823a..94d8692 100644 ---- a/tests/src/gui/CMakeLists.txt -+++ b/tests/src/gui/CMakeLists.txt -@@ -102,7 +102,7 @@ MACRO (ADD_QGIS_TEST testname testsrc) - ${QT_QTSVG_LIBRARY} - ${QT_QTTEST_LIBRARY} - ${QT_QTNETWORK_LIBRARY} -- ${QT_QTWEBKIT_LIBRARY} -+ ${OPTIONAL_QTWEBKIT} - ${QT_QTMAIN_LIBRARY} - ${PROJ_LIBRARY} - ${GEOS_LIBRARY} -diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt -index 7e8b2e9..0388150 100644 ---- a/tests/src/providers/CMakeLists.txt -+++ b/tests/src/providers/CMakeLists.txt -@@ -124,7 +124,7 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug) - ${QT_QTNETWORK_LIBRARY} - ${QT_QTSVG_LIBRARY} - ${QT_QTXML_LIBRARY} -- ${QT_QTWEBKIT_LIBRARY} -+ ${OPTIONAL_QTWEBKIT} - ${QT_QTMAIN_LIBRARY} - ${QT_QTSCRIPT_LIBRARY} - qgis_core diff --git a/sci-geosciences/qgis/qgis-2.18.14.ebuild b/sci-geosciences/qgis/qgis-2.18.14.ebuild new file mode 100644 index 000000000000..badd711d115a --- /dev/null +++ b/sci-geosciences/qgis/qgis-2.18.14.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +inherit cmake-utils eutils gnome2-utils python-single-r1 qmake-utils xdg-utils + +DESCRIPTION="User friendly Geographic Information System" +HOMEPAGE="https://www.qgis.org/" +SRC_URI=" + https://qgis.org/downloads/qgis-${PV}.tar.bz2 + examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples georeferencer grass mapserver oracle postgres python" + +REQUIRED_USE=" + mapserver? ( python ) + python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND=" + app-crypt/qca:2[qt4,ssl] + >=dev-db/spatialite-4.1.0 + dev-db/sqlite:3 + dev-libs/expat + dev-libs/qjson + dev-qt/designer:4 + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtscript:4 + dev-qt/qtsvg:4 + dev-qt/qtsql:4 + sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}] + sci-libs/geos + sci-libs/libspatialindex:= + sci-libs/proj + x11-libs/qscintilla:=[qt4(-)] + >=x11-libs/qwt-6.1.2:6=[svg,qt4(-)] + >=x11-libs/qwtpolar-1[qt4(-)] + georeferencer? ( sci-libs/gsl:= ) + grass? ( >=sci-geosciences/grass-7.0.0:= ) + mapserver? ( dev-libs/fcgi ) + oracle? ( + dev-db/oracle-instantclient:= + sci-libs/gdal:=[oracle] + ) + postgres? ( dev-db/postgresql:= ) + python? ( ${PYTHON_DEPS} + dev-python/future[${PYTHON_USEDEP}] + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + sys-devel/bison + sys-devel/flex +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="test" + +PATCHES=( + # TODO upstream + "${FILESDIR}/${PN}-2.18.6-featuresummary.patch" + # Taken from redhat + "${FILESDIR}/${PN}-2.18.12-sip.patch" + # git master + "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" +) + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + sed -i -e "s:\${QT_BINARY_DIR}:$(qt4_get_bindir):" \ + CMakeLists.txt || die "Failed to fix lrelease path" + + cd src/plugins || die + use georeferencer || cmake_comment_add_subdirectory georeferencer +} + +src_configure() { + local mycmakeargs=( + -DQGIS_MANUAL_SUBDIR=/share/man/ + -DBUILD_SHARED_LIBS=ON + -DQGIS_LIB_SUBDIR=$(get_libdir) + -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis + -DQWT_INCLUDE_DIR=/usr/include/qwt6 + -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so + -DWITH_INTERNAL_QWTPOLAR=OFF + -DPEDANTIC=OFF + -DWITH_APIDOC=OFF + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=OFF + -DWITH_GRASS=$(usex grass) + -DWITH_SERVER=$(usex mapserver) + -DWITH_ORACLE=$(usex oracle) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_BINDINGS=$(usex python) + -DWITH_QTWEBKIT=OFF + ) + + if has_version '