* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-08-26 19:19 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-08-26 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 460d238503099c2b47d3c4e2ed1a30b31f412faf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 18:34:20 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 19:18:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460d2385
sci-geosciences/qgis: 2.18.12 version bump (qt4-based)
Fix lrelease/lupdate paths
Switch to xdg-utils
Fix x11-libs/qscintilla[qt4] .so subdir path
Tested-by: Andreas Plesch <andreasplesch <AT> netscape.net>
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-2.18.12-cmake-lib-suffix.patch | 11 ++
sci-geosciences/qgis/files/qgis-2.18.12-sip.patch | 185 ++++++++++++++++++
sci-geosciences/qgis/qgis-2.18.12.ebuild | 212 +++++++++++++++++++++
4 files changed, 409 insertions(+)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b922dbe1347..ec2e8bd6ae2 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
DIST qgis-2.18.10.tar.bz2 84503710 SHA256 b2754daa6870008132702008c285dc94830e92ef0bd64e548ce5b47f2dec3fef SHA512 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 WHIRLPOOL ea983e6f0043df1484496c341ad905d672c55b548494ad9ae10ec0cf8731ecd148f0536a0557489a8d42cbe97bd91db261de868609bd4004997f35f7a00bee3d
+DIST qgis-2.18.12.tar.bz2 84936155 SHA256 7af709ac86bf7fb3350962beddd273f169ecfa6f3f60d3254c708a26a429023a SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea WHIRLPOOL 1b58189ade46b1f3d351939aa0b7fd9629fece8bcf419e967006833cad1aa6d799e036b12a856e92a4e3be6c2a768f693d430dffd5d3c706c84978f5b754fcd2
DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
new file mode 100644
index 00000000000..5a1e8fcd955
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
@@ -0,0 +1,11 @@
+--- a/cmake/PyQtMacros.cmake 2016-08-26 05:58:37.000000000 -0600
++++ b/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600
+@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+ ELSE(WIN32)
+ # TODO osx
+ SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
+- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+ ENDIF(WIN32)
+
+ FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch b/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch
new file mode 100644
index 00000000000..07db9b029bf
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch
@@ -0,0 +1,185 @@
+diff --git a/python/core/conversions.sip b/python/core/conversions.sip
+index f07d3ab1db..948821e91e 100644
+--- a/python/core/conversions.sip
++++ b/python/core/conversions.sip
+@@ -2041,3 +2041,178 @@ register_from_qvariant_convertor = (void (*)(FromQVariantConvertorFn))sipImportS
+ register_from_qvariant_convertor(null_from_qvariant_convertor);
+ %End
+ %End
++
++// QList<QVariant> is implemented as a Python list.
++%MappedType QList<QVariant> /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/
++{
++%TypeHeaderCode
++#include <qlist.h>
++%End
++
++%ConvertFromTypeCode
++ // Create the list.
++ PyObject *l;
++
++ if ((l = PyList_New(sipCpp->size())) == NULL)
++ return NULL;
++
++ // Set the list elements.
++ for (int i = 0; i < sipCpp->size(); ++i)
++ {
++ QVariant *t = new QVariant(sipCpp->at(i));
++ PyObject *tobj;
++
++ if ((tobj = sipConvertFromNewType(t, sipType_QVariant, sipTransferObj)) == NULL)
++ {
++ Py_DECREF(l);
++ delete t;
++
++ return NULL;
++ }
++
++ PyList_SET_ITEM(l, i, tobj);
++ }
++
++ return l;
++%End
++
++%ConvertToTypeCode
++ SIP_SSIZE_T len;
++
++ // Check the type if that is all that is required.
++ if (sipIsErr == NULL)
++ {
++ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++ return 0;
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *itm = PySequence_ITEM(sipPy, i);
++ bool ok = (itm && sipCanConvertToType(itm, sipType_QVariant, SIP_NOT_NONE));
++
++ Py_XDECREF(itm);
++
++ if (!ok)
++ return 0;
++ }
++
++ return 1;
++ }
++
++ QList<QVariant> *ql = new QList<QVariant>;
++ len = PySequence_Size(sipPy);
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *itm = PySequence_ITEM(sipPy, i);
++ int state;
++ QVariant *t = reinterpret_cast<QVariant *>(sipConvertToType(itm, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++
++ Py_DECREF(itm);
++
++ if (*sipIsErr)
++ {
++ sipReleaseType(t, sipType_QVariant, state);
++
++ delete ql;
++ return 0;
++ }
++
++ ql->append(*t);
++
++ sipReleaseType(t, sipType_QVariant, state);
++ }
++
++ *sipCppPtr = ql;
++
++ return sipGetState(sipTransferObj);
++%End
++};
++
++
++// QList<QPolygonF> is implemented as a Python list.
++%MappedType QList<QPolygonF> /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/
++{
++%TypeHeaderCode
++#include <qlist.h>
++%End
++
++%ConvertFromTypeCode
++ // Create the list.
++ PyObject *l;
++
++ if ((l = PyList_New(sipCpp->size())) == NULL)
++ return NULL;
++
++ // Set the list elements.
++ for (int i = 0; i < sipCpp->size(); ++i)
++ {
++ QPolygonF *t = new QPolygonF(sipCpp->at(i));
++ PyObject *tobj;
++
++ if ((tobj = sipConvertFromNewType(t, sipType_QPolygonF, sipTransferObj)) == NULL)
++ {
++ Py_DECREF(l);
++ delete t;
++
++ return NULL;
++ }
++
++ PyList_SET_ITEM(l, i, tobj);
++ }
++
++ return l;
++%End
++
++%ConvertToTypeCode
++ SIP_SSIZE_T len;
++
++ // Check the type if that is all that is required.
++ if (sipIsErr == NULL)
++ {
++ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
++ return 0;
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *itm = PySequence_ITEM(sipPy, i);
++ bool ok = (itm && sipCanConvertToType(itm, sipType_QPolygonF, SIP_NOT_NONE));
++
++ Py_XDECREF(itm);
++
++ if (!ok)
++ return 0;
++ }
++
++ return 1;
++ }
++
++ QList<QPolygonF> *ql = new QList<QPolygonF>;
++ len = PySequence_Size(sipPy);
++
++ for (SIP_SSIZE_T i = 0; i < len; ++i)
++ {
++ PyObject *itm = PySequence_ITEM(sipPy, i);
++ int state;
++ QPolygonF *t = reinterpret_cast<QPolygonF *>(sipConvertToType(itm, sipType_QPolygonF, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++
++ Py_DECREF(itm);
++
++ if (*sipIsErr)
++ {
++ sipReleaseType(t, sipType_QPolygonF, state);
++
++ delete ql;
++ return 0;
++ }
++
++ ql->append(*t);
++
++ sipReleaseType(t, sipType_QPolygonF, state);
++ }
++
++ *sipCppPtr = ql;
++
++ return sipGetState(sipTransferObj);
++%End
++};
+--
+2.12.0
diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
new file mode 100644
index 00000000000..d0a0f668239
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.12.ebuild
@@ -0,0 +1,212 @@
+# 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="http://www.qgis.org/"
+SRC_URI="
+ http://qgis.org/downloads/qgis-${PV}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
+
+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,webkit?,${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}] )
+ )
+ webkit? ( dev-qt/qtwebkit:4 )
+"
+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"
+ "${FILESDIR}/${PN}-2.18.6-python.patch"
+ # Taken from redhat
+ "${FILESDIR}/${P}-sip.patch"
+ # git master
+ "${FILESDIR}/${P}-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=$(usex webkit)
+ )
+
+ if has_version '<x11-libs/qscintilla-2.10'; then
+ mycmakeargs+=(
+ -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so
+ )
+ fi
+
+ if use grass; then
+ mycmakeargs+=(
+ -DWITH_GRASS7=ON
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ -DBINDINGS_GLOBAL_INSTALL=ON
+ -DWITH_PYSPATIALITE=ON
+ -DWITH_INTERNAL_DATEUTIL=OFF
+ -DWITH_INTERNAL_FUTURE=OFF
+ -DWITH_INTERNAL_MARKUPSAFE=OFF
+ -DWITH_INTERNAL_PYTZ=OFF
+ -DWITH_INTERNAL_SIX=OFF
+ -DWITH_INTERNAL_YAML=OFF
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ domenu debian/qgis.desktop
+
+ local size type
+ for size in 16 22 24 32 48 64 96 128 256; do
+ newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+ newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+ for type in qgs qml qlr qpt; do
+ newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+ done
+ done
+ newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ python_optimize "${ED%/}"/usr/share/qgis/python
+
+ if use grass; then
+ python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2024-11-08 13:31 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2024-11-08 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 67f1ecd5e2c1da1c543a90c022bc119cbc5fe416
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 7 19:24:13 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 13:29:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f1ecd5
sci-geosciences/qgis: drop 3.28.10
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-3.28.10-protobuf-23.patch | 27 --
.../qgis/files/qgis-3.28.9-exiv2-0.28.patch | 41 ---
sci-geosciences/qgis/metadata.xml | 2 -
sci-geosciences/qgis/qgis-3.28.10.ebuild | 284 ---------------------
5 files changed, 355 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index aebd41dc20ba..004237aff2ee 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
DIST qgis-3.38.3.tar.bz2 175959255 BLAKE2B 7fdc310cb8464bcc1b2168b14b661a41941c2ec22b5075f5c40796b15feeb8becec44e38905c6c970c94584b71e6d6798d0c072870f0f10555441db9399fa597 SHA512 ebf3899c9d80499f48cde713f31372fd46066c40aaeb1dacdf0778a86d6321cf73d5b68a9f03aa2423df8508142776e26878f3d845e773d4e44a86793ab92484
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch b/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch
deleted file mode 100644
index db76ec041d1f..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3754e386b38e84e50fffde5bab00af0512eb62ba Mon Sep 17 00:00:00 2001
-From: Blottiere Paul <blottiere.paul@gmail.com>
-Date: Thu, 27 Jul 2023 06:20:26 +0200
-Subject: [PATCH] Fix build on Arch with recent version of protobuf
-
----
- CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e43125b6a39b..7008b2bde246 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -370,7 +370,12 @@ if(WITH_CORE)
- message (SEND_ERROR "sqlite3 dependency was not found!")
- endif()
-
-- find_package(Protobuf REQUIRED) # for decoding of vector tiles in MVT format
-+ find_package(Protobuf CONFIG)
-+ find_package(Protobuf REQUIRED)
-+ if((${Protobuf_VERSION} GREATER 4.23) OR (${Protobuf_VERSION} EQUAL 4.23))
-+ set(Protobuf_LITE_LIBRARY protobuf::libprotobuf-lite)
-+ endif()
-+
- message(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}")
- if (NOT Protobuf_PROTOC_EXECUTABLE)
- message (SEND_ERROR "Protobuf library's 'protoc' tool was not found!")
diff --git a/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch b/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
deleted file mode 100644
index b41ba70003c1..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4de207e0ca26067146ac58133e64c17fdf755c6a Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sun, 9 Jul 2023 10:01:49 +0200
-Subject: [PATCH] Fix build with exiv2 0.28
-
-(cherry picked from commit 32f5418fc4f7bb2ee986dee1824ff2989c113a94)
----
- src/core/raster/qgsexiftools.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/core/raster/qgsexiftools.cpp b/src/core/raster/qgsexiftools.cpp
-index 1fbd6a84a8c..f64e07e9165 100644
---- a/src/core/raster/qgsexiftools.cpp
-+++ b/src/core/raster/qgsexiftools.cpp
-@@ -94,7 +94,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
- case Exiv2::signedLong:
- case Exiv2::unsignedLongLong:
- case Exiv2::signedLongLong:
-+#if EXIV2_TEST_VERSION (0, 28, 0)
-+ val = QVariant::fromValue( it->toUint32() );
-+#else
- val = QVariant::fromValue( it->toLong() );
-+#endif
- break;
-
- case Exiv2::tiffDouble:
-@@ -108,7 +112,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
- case Exiv2::signedByte:
- case Exiv2::tiffIfd:
- case Exiv2::tiffIfd8:
-+#if EXIV2_TEST_VERSION (0, 28, 0)
-+ val = QVariant::fromValue( static_cast< int >( it->toUint32() ) );
-+#else
- val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
-+#endif
- break;
-
- case Exiv2::date:
---
-2.41.0
-
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 8116d12198d2..926489fafeeb 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -21,9 +21,7 @@
<flag name="mapserver">Determines whether mapserver should be built</flag>
<flag name="netcdf">Enable MDAL support for GRIB and XMDF formats</flag>
<flag name="pdal">Enable support for PDAL for point clouds via <pkg>sci-libs/pdal</pkg></flag>
- <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
<flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag>
- <flag name="serial">Enable support for serial GPS using <pkg>dev-qt/qtserialport</pkg></flag>
<flag name="webengine">Enable webengine support using <pkg>dev-qt/qtwebengine</pkg></flag>
</use>
<upstream>
diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild
deleted file mode 100644
index bff6a620ed00..000000000000
--- a/sci-geosciences/qgis/qgis-3.28.10.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-# We only package the LTS releases right now
-# We could package more but would ideally only stabilise the LTS ones
-# at least.
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64"
-fi
-inherit cmake flag-o-matic python-single-r1 virtualx xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- mapserver? ( python )
- test? ( postgres )
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="!test? ( test )"
-
-# At some point the dependency on qwtpolar should be
-# replaced with a dependency on qwt[polar]. Currently
-# it does not build with qwt-6.2[polar] though.
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain[qt5(+)]
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- >=sci-libs/proj-4.9.3:=
- sys-libs/zlib
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( sci-geosciences/grass:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- pdal? ( sci-libs/pdal:= )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
- serial? ( dev-qt/qtserialport:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-BDEPEND="${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- app-alternatives/yacc
- app-alternatives/lex
- doc? ( app-text/doxygen )
- test? (
- $(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_USEDEP},testlib]
- dev-python/nose2[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- ')
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.28.9-exiv2-0.28.patch" # 3.34.0; bug 906470
- "${FILESDIR}/${P}-protobuf-23.patch" # git master; bug 912846
-)
-
-src_prepare() {
- cmake_src_prepare
- # Tests want to be run inside a git repo
- if [[ ${PV} != *9999* ]]; then
- if use test; then
- git init -q || die
- git config user.email "larry@gentoo.org" || die
- git config user.name "Larry the Cow" || die
- git add . || die
- git commit -m "init" || die
- fi
- fi
-}
-
-src_configure() {
- # -Werror=strict-aliasing
- # https://bugs.gentoo.org/862660
- # https://github.com/qgis/QGIS/issues/56859
- #
- # Do not trust with LTO either
- append-flags -fno-strict-aliasing
- filter-lto
-
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=$(usex doc)
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=$(usex test)
- -DWITH_3D=$(usex 3d)
- -DWITH_GSL=$(usex georeferencer)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_PDAL=$(usex pdal)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QT5SERIALPORT=$(usex serial)
- -DWITH_QTWEBKIT=OFF
- )
-
- # We list all supported versions *by upstream for this version*
- # here, even if we're not allowing it (e.g. bugs for now), so
- # we enable/disable all the right versions. This is so qgis doesn't
- # try to automatically use a version the build system knows about.
- local supported_grass_versions=( 7 8 )
- if use grass; then
- # We can do this because we have a := dep on grass &
- # it changes subslot (ABI) when major versions change, so
- # the logic here doesn't end up becoming stale.
- readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
- readarray -d'.' -t v <<<"${f[2]}"
- grassdir="grass${v[0]}${v[1]}"
-
- GRASSDIR=/usr/$(get_libdir)/${grassdir}
-
- einfo "Supported versions: ${supported_grass_versions[@]}"
- einfo "Found GRASS version: ${v[0]}*"
-
- local known_grass_version
- # GRASS isn't slotted (in Gentoo, anyway) so we pick
- # the best version we can to build against, and disable the others.
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- case "${known_grass_version}" in
- "${v[0]}")
- einfo "GRASS version ${known_grass_version} is supported. Enabling."
- mycmakeargs+=(
- "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
- "-DWITH_GRASS${known_grass_version}=ON"
- )
- ;;
- *)
- einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- ;;
- esac
- done
- else
- local known_grass_version
- for known_grass_version in "${supported_grass_versions[@]}" ; do
- mycmakeargs+=(
- "-DWITH_GRASS${known_grass_version}=OFF"
- )
- done
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_test() {
- local myctestargs=(
- # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
- -E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_c
ore_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimited
TextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVec
torLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)'
-
- --output-on-failure
- )
-
- virtx cmake_src_test -j1
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2023-08-23 7:55 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2023-08-23 7:55 UTC (permalink / raw
To: gentoo-commits
commit: 9782ee2b120840acc4bc75d9cd6a9231d2a17c0e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 22 19:09:49 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 07:55:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9782ee2b
sci-geosciences/qgis: add 3.28.10
Closes: https://bugs.gentoo.org/912846
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-3.28.10-protobuf-23.patch | 27 ++
sci-geosciences/qgis/qgis-3.28.10.ebuild | 276 +++++++++++++++++++++
3 files changed, 304 insertions(+)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 2a47cdc347cd..c9da5c5aba8f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
+DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56
DIST qgis-3.28.6.tar.bz2 158638644 BLAKE2B 2613022c0cf2f9da86c195ba83d110d5825c6347fc45b4e953b44dee1ad8fde1541e51670e3a15a0f6c3f5158d7a7f84544bf5ab4e956d78e68523c04af1204f SHA512 4b1f39bb690173e8f8bb394e293e074ed748f18a6d108110bebbcb11305d230c1706013d05bb04d027dc2e06405228323904a33601586f79c22b402ec3987336
DIST qgis-3.28.9.tar.bz2 159516017 BLAKE2B 2f1e19ff407ad430bef5a6696eb46dd25013634f8e3760312ec3e706aaea322427a4ae2be13b9b7888ba95d5d4c7f8de75d71a195a2078577e09e5d5f415542b SHA512 d3c30ab375c0e92573c4e6d1f193cbea932d8aa5f19aea2f177335c00ba63481dd67fd0a8bbc3586a882ae8ebcba698d0c222e7a3d0aaf75e99649ea404fe784
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch b/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch
new file mode 100644
index 000000000000..db76ec041d1f
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.28.10-protobuf-23.patch
@@ -0,0 +1,27 @@
+From 3754e386b38e84e50fffde5bab00af0512eb62ba Mon Sep 17 00:00:00 2001
+From: Blottiere Paul <blottiere.paul@gmail.com>
+Date: Thu, 27 Jul 2023 06:20:26 +0200
+Subject: [PATCH] Fix build on Arch with recent version of protobuf
+
+---
+ CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e43125b6a39b..7008b2bde246 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -370,7 +370,12 @@ if(WITH_CORE)
+ message (SEND_ERROR "sqlite3 dependency was not found!")
+ endif()
+
+- find_package(Protobuf REQUIRED) # for decoding of vector tiles in MVT format
++ find_package(Protobuf CONFIG)
++ find_package(Protobuf REQUIRED)
++ if((${Protobuf_VERSION} GREATER 4.23) OR (${Protobuf_VERSION} EQUAL 4.23))
++ set(Protobuf_LITE_LIBRARY protobuf::libprotobuf-lite)
++ endif()
++
+ message(STATUS "Found Protobuf: ${Protobuf_LIBRARIES}")
+ if (NOT Protobuf_PROTOC_EXECUTABLE)
+ message (SEND_ERROR "Protobuf library's 'protoc' tool was not found!")
diff --git a/sci-geosciences/qgis/qgis-3.28.10.ebuild b/sci-geosciences/qgis/qgis-3.28.10.ebuild
new file mode 100644
index 000000000000..ab7e8a81f77d
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.28.10.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="sqlite"
+
+# We only package the LTS releases right now
+# We could package more but would ideally only stabilise the LTS ones
+# at least.
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+ inherit git-r3
+else
+ SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+ examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake python-single-r1 virtualx xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml serial test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ mapserver? ( python )
+ test? ( postgres )
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="!test? ( test )"
+
+# At some point the dependency on qwtpolar should be
+# replaced with a dependency on qwt[polar]. Currently
+# it does not build with qwt-6.2[polar] though.
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+),ssl]
+ >=dev-db/spatialite-4.2.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/libzip:=
+ dev-libs/protobuf:=
+ dev-libs/qtkeychain[qt5(+)]
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-gfx/exiv2:=
+ >=sci-libs/gdal-3.0.4:=[geos]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ >=sci-libs/proj-4.9.3:=
+ sys-libs/zlib
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+ >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+ 3d? ( dev-qt/qt3d:5 )
+ georeferencer? ( sci-libs/gsl:= )
+ grass? ( sci-geosciences/grass:= )
+ hdf5? ( sci-libs/hdf5:= )
+ mapserver? ( dev-libs/fcgi )
+ netcdf? ( sci-libs/netcdf:= )
+ opencl? ( virtual/opencl )
+ oracle? (
+ dev-db/oracle-instantclient:=
+ sci-libs/gdal:=[oracle]
+ )
+ pdal? ( sci-libs/pdal:= )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/owslib[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/PyQt5[designer,gui,network,positioning,printsupport,sql,svg,widgets,${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ ')
+ )
+ qml? ( dev-qt/qtdeclarative:5 )
+ serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/qttest:5
+"
+RDEPEND="${COMMON_DEPEND}
+ sci-geosciences/gpsbabel
+"
+BDEPEND="${PYTHON_DEPS}
+ dev-qt/linguist-tools:5
+ sys-devel/bison
+ sys-devel/flex
+ doc? ( app-doc/doxygen )
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_USEDEP},testlib]
+ dev-python/nose2[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.28.9-exiv2-0.28.patch" # 3.34.0; bug 906470
+ "${FILESDIR}/${P}-protobuf-23.patch" # git master; bug 912846
+)
+
+src_prepare() {
+ cmake_src_prepare
+ # Tests want to be run inside a git repo
+ if [[ ${PV} != *9999* ]]; then
+ if use test; then
+ git init -q || die
+ git config user.email "larry@gentoo.org" || die
+ git config user.name "Larry the Cow" || die
+ git add . || die
+ git commit -m "init" || die
+ fi
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQGIS_MANUAL_SUBDIR=share/man/
+ -DQGIS_LIB_SUBDIR=$(get_libdir)
+ -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+ -DQWT_INCLUDE_DIR=/usr/include/qwt6
+ -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+ -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
+ -DPEDANTIC=OFF
+ -DUSE_CCACHE=OFF
+ -DWITH_ANALYSIS=ON
+ -DWITH_APIDOC=$(usex doc)
+ -DWITH_GUI=ON
+ -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=$(usex test)
+ -DWITH_3D=$(usex 3d)
+ -DWITH_GSL=$(usex georeferencer)
+ $(cmake_use_find_package hdf5 HDF5)
+ -DWITH_SERVER=$(usex mapserver)
+ $(cmake_use_find_package netcdf NetCDF)
+ -DUSE_OPENCL=$(usex opencl)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_QWTPOLAR=$(usex polar)
+ -DWITH_PDAL=$(usex pdal)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
+ -DWITH_QUICK=$(usex qml)
+ -DWITH_QT5SERIALPORT=$(usex serial)
+ -DWITH_QTWEBKIT=OFF
+ )
+
+ # We list all supported versions *by upstream for this version*
+ # here, even if we're not allowing it (e.g. bugs for now), so
+ # we enable/disable all the right versions. This is so qgis doesn't
+ # try to automatically use a version the build system knows about.
+ local supported_grass_versions=( 7 8 )
+ if use grass; then
+ # We can do this because we have a := dep on grass &
+ # it changes subslot (ABI) when major versions change, so
+ # the logic here doesn't end up becoming stale.
+ readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
+ readarray -d'.' -t v <<<"${f[2]}"
+ grassdir="grass${v[0]}${v[1]}"
+
+ GRASSDIR=/usr/$(get_libdir)/${grassdir}
+
+ einfo "Supported versions: ${supported_grass_versions[@]}"
+ einfo "Found GRASS version: ${v[0]}*"
+
+ local known_grass_version
+ # GRASS isn't slotted (in Gentoo, anyway) so we pick
+ # the best version we can to build against, and disable the others.
+ for known_grass_version in "${supported_grass_versions[@]}" ; do
+ case "${known_grass_version}" in
+ "${v[0]}")
+ einfo "GRASS version ${known_grass_version} is supported. Enabling."
+ mycmakeargs+=(
+ "-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
+ "-DWITH_GRASS${known_grass_version}=ON"
+ )
+ ;;
+ *)
+ einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
+ mycmakeargs+=(
+ "-DWITH_GRASS${known_grass_version}=OFF"
+ )
+ ;;
+ esac
+ done
+ else
+ local known_grass_version
+ for known_grass_version in "${supported_grass_versions[@]}" ; do
+ mycmakeargs+=(
+ "-DWITH_GRASS${known_grass_version}=OFF"
+ )
+ done
+ fi
+
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+ CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging
+
+ # bugs 612956, 648726
+ addpredict /dev/dri/renderD128
+ addpredict /dev/dri/renderD129
+
+ cmake_src_configure
+}
+
+src_test() {
+ local myctestargs=(
+ # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887
+ -E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_c
ore_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimited
TextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVec
torLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)'
+
+ --output-on-failure
+ )
+
+ virtx cmake_src_test -j1
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use python; then
+ python_optimize
+ python_optimize "${ED}"/usr/share/qgis/python
+ fi
+
+ if use grass; then
+ python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ xdg_pkg_postinst
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2020-12-22 22:54 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-12-22 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 467d0110a069cac15eb5bf460c64118fb5baafa6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 16:14:37 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 22:53:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467d0110
sci-geosciences/qgis: Drop 3.16.1
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../files/qgis-3.16.1-find-qt5linguisttools.patch | 27 ---
sci-geosciences/qgis/qgis-3.16.1.ebuild | 207 ---------------------
3 files changed, 235 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index eab8f63ecd9..123680b6b75 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,4 +1,3 @@
DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
-DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8
DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
deleted file mode 100644
index 01f60269439..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 23 Nov 2020 22:04:50 +0100
-Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
-
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
-Available since >= Qt-5.3.1 which is well below the current minimum for QGIS.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- i18n/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
-index a836e5cae5..7d7f79da89 100644
---- a/i18n/CMakeLists.txt
-+++ b/i18n/CMakeLists.txt
-@@ -1,4 +1,5 @@
--find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
-+find_package(Qt5LinguistTools REQUIRED)
-+set(QT_LRELEASE_EXECUTABLE Qt5::lrelease)
-
- macro(ADD_TRANSLATION_FILES _sources )
- foreach (_current_FILE ${ARGN})
---
-2.29.2
-
diff --git a/sci-geosciences/qgis/qgis-3.16.1.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild
deleted file mode 100644
index 2bc3ef993a9..00000000000
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} = *9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/en/site/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="${PYTHON_DEPS}
- dev-qt/linguist-tools:5
- sys-devel/bison
- sys-devel/flex
-"
-COMMON_DEPEND="
- >=app-crypt/qca-2.3.0:2[ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/protobuf:=
- dev-libs/qtkeychain:=
- dev-qt/designer:5
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtserialport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-gfx/exiv2:=
- >=sci-libs/gdal-3.0.4:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- >=sci-libs/proj-6.3.1:=
- sys-libs/zlib
- >=x11-libs/qscintilla-2.10.3:=
- >=x11-libs/qwt-6.1.3-r2:6=[svg]
- 3d? ( dev-qt/qt3d:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
- dev-python/jinja[${PYTHON_MULTI_USEDEP}]
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
- dev-python/owslib[${PYTHON_MULTI_USEDEP}]
- dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
- dev-python/pytz[${PYTHON_MULTI_USEDEP}]
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
- ')
- )
- qml? ( dev-qt/qtdeclarative:5 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qttest:5
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
- # TODO upstream
- "${FILESDIR}/${P}-featuresummary.patch"
- "${FILESDIR}/${P}-default-qmldir.patch"
- "${FILESDIR}/${P}-find-qt5linguisttools.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- sed -e "/QtWebKit.*.py/d" \
- -i python/PyQt/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_ANALYSIS=ON
- -DWITH_APIDOC=OFF
- -DWITH_GUI=ON
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- $(cmake_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QTWEBKIT=OFF
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
- mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2020-11-23 22:10 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-11-23 22:10 UTC (permalink / raw
To: gentoo-commits
commit: 5d8db0c6c8a1cc7556c66b3ade0bbf959ebe71b8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 22:10:06 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 22:10:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8db0c6
sci-geosciences/qgis: Fix Qt5LinguistTools detection (for lrelease)
Build system relied on lrelease available in PATH so far.
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/qgis-3.16.1-find-qt5linguisttools.patch | 27 ++++++++++++++++++++++
sci-geosciences/qgis/qgis-3.16.1.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
new file mode 100644
index 00000000000..01f60269439
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
@@ -0,0 +1,27 @@
+From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 23 Nov 2020 22:04:50 +0100
+Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
+
+Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
+Available since >= Qt-5.3.1 which is well below the current minimum for QGIS.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ i18n/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
+index a836e5cae5..7d7f79da89 100644
+--- a/i18n/CMakeLists.txt
++++ b/i18n/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
++find_package(Qt5LinguistTools REQUIRED)
++set(QT_LRELEASE_EXECUTABLE Qt5::lrelease)
+
+ macro(ADD_TRANSLATION_FILES _sources )
+ foreach (_current_FILE ${ARGN})
+--
+2.29.2
+
diff --git a/sci-geosciences/qgis/qgis-3.16.1.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild
index 54158d96a48..2bc3ef993a9 100644
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.1.ebuild
@@ -109,6 +109,7 @@ PATCHES=(
# TODO upstream
"${FILESDIR}/${P}-featuresummary.patch"
"${FILESDIR}/${P}-default-qmldir.patch"
+ "${FILESDIR}/${P}-find-qt5linguisttools.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2020-11-20 20:40 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-11-20 20:40 UTC (permalink / raw
To: gentoo-commits
commit: ca2e91369b76276e44cfd8355f209f60f92ef580
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 19:28:48 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 20:39:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2e9136
sci-geosciences/qgis: 3.16.1 version bump
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
...lt-qmldir.patch => qgis-3.16.1-default-qmldir.patch} | 13 +++++++------
...resummary.patch => qgis-3.16.1-featuresummary.patch} | 17 +++++++++--------
.../qgis/{qgis-9999.ebuild => qgis-3.16.1.ebuild} | 7 ++++---
sci-geosciences/qgis/qgis-9999.ebuild | 4 ++--
5 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 93502ed3377..d86c91000ad 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
+DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
similarity index 68%
rename from sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
rename to sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
index afcaa693ced..9a57d45984e 100644
--- a/sci-geosciences/qgis/files/qgis-9999-default-qmldir.patch
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-default-qmldir.patch
@@ -1,17 +1,18 @@
-From 9d095f7d502cbcea8c70c127be322568b71f6663 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 28 Apr 2019 12:41:51 +0200
+From ad432e066fcc3d985fb5a451ad128cdf35c1dad9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 20 Nov 2020 20:41:36 +0100
Subject: [PATCH] cmake: Fix DEFAULT_QML_DIR path to comply with LFS layout
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4626042ca4..fe93ff3c4f 100644
+index 61b4c863d0..e7d0bdc8d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -660,7 +660,7 @@ IF (WITH_CORE)
+@@ -750,7 +750,7 @@ if (WITH_CORE)
set (DEFAULT_LIBEXEC_SUBDIR lib${LIB_SUFFIX}/qgis)
set (DEFAULT_PLUGIN_SUBDIR lib${LIB_SUFFIX}/qgis/plugins)
set (DEFAULT_INCLUDE_SUBDIR include/qgis)
@@ -21,5 +22,5 @@ index 4626042ca4..fe93ff3c4f 100644
set (DEFAULT_SERVER_MODULE_SUBDIR ${DEFAULT_LIBEXEC_SUBDIR}/server)
endif()
--
-2.21.0
+2.29.2
diff --git a/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
similarity index 60%
rename from sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
rename to sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
index 8fa7ab0e842..b1098175647 100644
--- a/sci-geosciences/qgis/files/qgis-9999-featuresummary.patch
+++ b/sci-geosciences/qgis/files/qgis-3.16.1-featuresummary.patch
@@ -1,18 +1,19 @@
-From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 28 Apr 2019 00:10:21 +0200
+From f0fd6e80ad034cf7c49f4ba3708819424b6857b2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 20 Nov 2020 20:41:06 +0100
Subject: [PATCH] cmake: Use FeatureSummary
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4dff8ea0f4..4626042ca4 100644
+index f581b2c889..61b4c863d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -71,6 +71,8 @@ IF(NOT MSVC)
- endif(USE_CCACHE)
+@@ -111,6 +111,8 @@ if (FORCE_STATIC_PROVIDERS)
+ set (HAVE_STATIC_PROVIDERS TRUE)
endif()
+include(FeatureSummary)
@@ -20,12 +21,12 @@ index 4dff8ea0f4..4626042ca4 100644
# in generated makefiles use relative paths so the project dir is moveable
# Note commented out since it cause problems but it would be nice to resolve these and enable
#
-@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
+@@ -1035,3 +1037,5 @@ endif()
if (UNIX AND NOT APPLE)
add_subdirectory(linux)
endif()
+
+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--
-2.21.0
+2.29.2
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.16.1.ebuild
similarity index 95%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.16.1.ebuild
index 3f589eac32d..54158d96a48 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.1.ebuild
@@ -107,8 +107,8 @@ PATCHES=(
# git master
"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
# TODO upstream
- "${FILESDIR}/${PN}-9999-featuresummary.patch"
- "${FILESDIR}/${PN}-9999-default-qmldir.patch"
+ "${FILESDIR}/${P}-featuresummary.patch"
+ "${FILESDIR}/${P}-default-qmldir.patch"
)
pkg_setup() {
@@ -158,7 +158,8 @@ src_configure() {
)
fi
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+ mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
# bugs 612956, 648726
addpredict /dev/dri/renderD128
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 3f589eac32d..e895dc65581 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -107,8 +107,8 @@ PATCHES=(
# git master
"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
# TODO upstream
- "${FILESDIR}/${PN}-9999-featuresummary.patch"
- "${FILESDIR}/${PN}-9999-default-qmldir.patch"
+ "${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+ "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2020-10-23 23:27 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-10-23 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 04ec15cf24cdde041b3816f5f2d984b42109e2e0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 18:49:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 23:26:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ec15cf
sci-geosciences/qgis: 3.16.0 version bump
- python3_9
- Update HOMEPAGE
- Cleanup outdated qt5(+) IUSE defaults
- Drop IUSE=webkit
- Drop obsolete QTMIN
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-3.16.0-cmake-lib-suffix.patch | 12 +++++
.../qgis/{qgis-9999.ebuild => qgis-3.16.0.ebuild} | 60 +++++++++++-----------
sci-geosciences/qgis/qgis-9999.ebuild | 60 +++++++++++-----------
4 files changed, 73 insertions(+), 60 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e377493e5a9..212b0bba175 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,2 +1,3 @@
DIST qgis-3.10.9.tar.bz2 102418680 BLAKE2B 53599dab784fc42b7a4505e13b1fd97cdb7c696bf1a004425ea0e7b88659b9af40f74b7107ef6103a138f4bc8886eda0a99a07a1c1466fb73c94d55ea39d8ea8 SHA512 91bba01db04094a194d1437a00276f076cd88d9ebcfe4792f20da8fb4339c984262e2bf79f666cf23af13081da358bbfb69bdff086e4988701c4431f53732275
+DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
new file mode 100644
index 00000000000..1edba1f0e74
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.16.0-cmake-lib-suffix.patch
@@ -0,0 +1,12 @@
+diff -Naru a/cmake/PyQtMacros.cmake b/cmake/PyQtMacros.cmake
+--- a/cmake/PyQtMacros.cmake 2019-10-28 08:23:18.776024266 +0100
++++ b/cmake/PyQtMacros.cmake 2019-10-28 08:24:17.316024213 +0100
+@@ -36,7 +36,7 @@
+ ELSE(CMAKE_HOST_WIN32)
+ # TODO osx
+ SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
+- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
++ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
+ ENDIF(CMAKE_HOST_WIN32)
+
+ FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.16.0.ebuild
similarity index 79%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.16.0.ebuild
index 5009332eb58..21e60cc41b1 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.0.ebuild
@@ -3,9 +3,8 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -18,46 +17,46 @@ fi
inherit cmake desktop python-single-r1 qmake-utils xdg
DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
+HOMEPAGE="https://www.qgis.org/en/site/"
LICENSE="GPL-2+ GPL-3+"
SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
BDEPEND="${PYTHON_DEPS}
- >=dev-qt/linguist-tools-${QTMIN}:5
+ dev-qt/linguist-tools:5
sys-devel/bison
sys-devel/flex
"
COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
+ >=app-crypt/qca-2.3.0:2[ssl]
>=dev-db/spatialite-4.2.0
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtcore-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtpositioning-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtserialport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
+ dev-libs/qtkeychain:=
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtserialport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
>=sci-libs/proj-6.3.1:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
+ >=x11-libs/qscintilla-2.10.3:=
+ >=x11-libs/qwt-6.1.3-r2:6=[svg]
+ 3d? ( dev-qt/qt3d:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( =sci-geosciences/grass-7*:= )
hdf5? ( sci-libs/hdf5:= )
@@ -68,7 +67,7 @@ COMMON_DEPEND="
dev-db/oracle-instantclient:=
sci-libs/gdal:=[oracle]
)
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
postgres? ( dev-db/postgresql:= )
python? (
${PYTHON_DEPS}
@@ -78,11 +77,11 @@ COMMON_DEPEND="
dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
dev-python/owslib[${PYTHON_MULTI_USEDEP}]
dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
dev-python/pytz[${PYTHON_MULTI_USEDEP}]
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -90,11 +89,10 @@ COMMON_DEPEND="
postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
')
)
- qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+ qml? ( dev-qt/qtdeclarative:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QTMIN}:5
+ dev-qt/qttest:5
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
@@ -105,7 +103,7 @@ RESTRICT="test"
PATCHES=(
# git master
- "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+ "${FILESDIR}/${P}-cmake-lib-suffix.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
@@ -117,6 +115,8 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
+ sed -e "/QtWebKit.*.py/d" \
+ -i python/PyQt/CMakeLists.txt || die
}
src_configure() {
@@ -147,7 +147,7 @@ src_configure() {
-DWITH_BINDINGS=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
- -DWITH_QTWEBKIT=$(usex webkit)
+ -DWITH_QTWEBKIT=OFF
)
if use grass; then
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 5009332eb58..21e60cc41b1 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,9 +3,8 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE="sqlite"
-QTMIN="5.9.4"
if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
@@ -18,46 +17,46 @@ fi
inherit cmake desktop python-single-r1 qmake-utils xdg
DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
+HOMEPAGE="https://www.qgis.org/en/site/"
LICENSE="GPL-2+ GPL-3+"
SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml"
REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
BDEPEND="${PYTHON_DEPS}
- >=dev-qt/linguist-tools-${QTMIN}:5
+ dev-qt/linguist-tools:5
sys-devel/bison
sys-devel/flex
"
COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
+ >=app-crypt/qca-2.3.0:2[ssl]
>=dev-db/spatialite-4.2.0
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtcore-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
- >=dev-qt/qtpositioning-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtserialport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
+ dev-libs/qtkeychain:=
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtserialport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos]
sci-libs/geos
sci-libs/libspatialindex:=
>=sci-libs/proj-6.3.1:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QTMIN}:5 )
+ >=x11-libs/qscintilla-2.10.3:=
+ >=x11-libs/qwt-6.1.3-r2:6=[svg]
+ 3d? ( dev-qt/qt3d:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( =sci-geosciences/grass-7*:= )
hdf5? ( sci-libs/hdf5:= )
@@ -68,7 +67,7 @@ COMMON_DEPEND="
dev-db/oracle-instantclient:=
sci-libs/gdal:=[oracle]
)
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r2 )
postgres? ( dev-db/postgresql:= )
python? (
${PYTHON_DEPS}
@@ -78,11 +77,11 @@ COMMON_DEPEND="
dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
dev-python/owslib[${PYTHON_MULTI_USEDEP}]
dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
+ dev-python/PyQt5[designer,gui,network,printsupport,sql,svg,${PYTHON_MULTI_USEDEP}]
dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
dev-python/pytz[${PYTHON_MULTI_USEDEP}]
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.3[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
dev-python/six[${PYTHON_MULTI_USEDEP}]
@@ -90,11 +89,10 @@ COMMON_DEPEND="
postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
')
)
- qml? ( >=dev-qt/qtdeclarative-${QTMIN}:5 )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
+ qml? ( dev-qt/qtdeclarative:5 )
"
DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QTMIN}:5
+ dev-qt/qttest:5
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
@@ -105,7 +103,7 @@ RESTRICT="test"
PATCHES=(
# git master
- "${FILESDIR}/${PN}-3.10.0-cmake-lib-suffix.patch"
+ "${FILESDIR}/${P}-cmake-lib-suffix.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
"${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
@@ -117,6 +115,8 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
+ sed -e "/QtWebKit.*.py/d" \
+ -i python/PyQt/CMakeLists.txt || die
}
src_configure() {
@@ -147,7 +147,7 @@ src_configure() {
-DWITH_BINDINGS=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
- -DWITH_QTWEBKIT=$(usex webkit)
+ -DWITH_QTWEBKIT=OFF
)
if use grass; then
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2020-02-09 17:41 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2020-02-09 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 1db2ae292920e796c4419317db3c4a30a44d8d53
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 17:40:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 17:40:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1db2ae29
sci-geosciences/qgis: Drop 3.4.12
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-2.18.12-cmake-lib-suffix.patch | 11 --
.../qgis/files/qgis-3.4.12-qt-5.13.patch | 22 ---
sci-geosciences/qgis/qgis-3.4.12.ebuild | 218 ---------------------
4 files changed, 252 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 0065053e9ae..4716dc2a28a 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
DIST qgis-3.10.2.tar.bz2 101916273 BLAKE2B 4b5d424348609e8fd1822ea9594fb11d30ae060aff15d8d962a1b15a602c1bdf5d8a17976c5a487ded5e5764e7367b8024aa52f9620ba0ec57fb075426a3c9f2 SHA512 d2ba31a8b50e0fec901d89dba6ca8467a9e26033197e78c56caaf7cce6b9bb7a1617a75f8e6275356f921ba9e986611384ab77890a4d7f5911d632e42466bb9f
-DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch b/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
deleted file mode 100644
index 5a1e8fcd955..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.12-cmake-lib-suffix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/PyQtMacros.cmake 2016-08-26 05:58:37.000000000 -0600
-+++ b/cmake/PyQtMacros.cmake 2016-09-21 16:25:55.921411011 -0600
-@@ -42,7 +42,7 @@ MACRO(PYQT_WRAP_UI outfiles )
- ELSE(WIN32)
- # TODO osx
- SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
-- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
-+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
- ENDIF(WIN32)
-
- FOREACH(it ${ARGN})
diff --git a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch
deleted file mode 100644
index 9edb4427609..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
-From: Matthias Kuhn <matthias@opengis.ch>
-Date: Sat, 22 Jun 2019 10:11:31 +0200
-Subject: [PATCH] Add missing include
-
-Fix https://github.com/qgis/QGIS/issues/30316
----
- src/analysis/interpolation/qgsinterpolator.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h
-index 35343ccdf7f..5d694418299 100644
---- a/src/analysis/interpolation/qgsinterpolator.h
-+++ b/src/analysis/interpolation/qgsinterpolator.h
-@@ -19,6 +19,7 @@
- #define QGSINTERPOLATOR_H
-
- #include <QVector>
-+#include <QList>
- #include "qgis_sip.h"
- #include "qgis_analysis.h"
-
diff --git a/sci-geosciences/qgis/qgis-3.4.12.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild
deleted file mode 100644
index d5cb18ca5d4..00000000000
--- a/sci-geosciences/qgis/qgis-3.4.12.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} = *9999 ]]; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
- inherit git-r3
-else
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 x86"
-fi
-inherit cmake-utils desktop python-single-r1 qmake-utils xdg
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-BDEPEND="
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5
- sys-devel/bison
- sys-devel/flex
-"
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QT_MIN_VER}:5
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
- >=dev-qt/qtcore-${QT_MIN_VER}:5
- >=dev-qt/qtgui-${QT_MIN_VER}:5
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
- >=dev-qt/qtserialport-${QT_MIN_VER}:5
- >=dev-qt/qtsvg-${QT_MIN_VER}:5
- >=dev-qt/qtsql-${QT_MIN_VER}:5
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5
- >=dev-qt/qtxml-${QT_MIN_VER}:5
- >=sci-libs/gdal-2.2.3:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj:=
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- hdf5? ( sci-libs/hdf5:= )
- mapserver? ( dev-libs/fcgi )
- netcdf? ( sci-libs/netcdf:= )
- opencl? ( virtual/opencl )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- postgres? ( dev-db/postgresql:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/future[${PYTHON_MULTI_USEDEP}]
- dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
- dev-python/jinja[${PYTHON_MULTI_USEDEP}]
- dev-python/markupsafe[${PYTHON_MULTI_USEDEP}]
- dev-python/owslib[${PYTHON_MULTI_USEDEP}]
- dev-python/pygments[${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_MULTI_USEDEP}]
- dev-python/python-dateutil[${PYTHON_MULTI_USEDEP}]
- dev-python/pytz[${PYTHON_MULTI_USEDEP}]
- dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- dev-python/sip:=[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_MULTI_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}] )
- ')
- )
- qml? ( >=dev-qt/qtdeclarative-${QT_MIN_VER}:5 )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/qttest-${QT_MIN_VER}:5
- >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
- "${FILESDIR}/${P}-qt-5.13.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
- "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \
- -i CMakeLists.txt || die # TODO fixed in master
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQGIS_MANUAL_SUBDIR=share/man/
- -DQGIS_LIB_SUBDIR=$(get_libdir)
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
- -DQWT_INCLUDE_DIR=/usr/include/qwt6
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
- -DPEDANTIC=OFF
- -DUSE_CCACHE=OFF
- -DWITH_APIDOC=OFF
- -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- $(cmake-utils_use_find_package hdf5 HDF5)
- -DWITH_SERVER=$(usex mapserver)
- $(cmake-utils_use_find_package netcdf NetCDF)
- -DUSE_OPENCL=$(usex opencl)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QUICK=$(usex qml)
- -DWITH_QTWEBKIT=$(usex webkit)
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newmenu linux/org.qgis.qgis.desktop.in org.qgis.qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} linux/icons/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} linux/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} linux/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize "${ED}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- xdg_pkg_postinst
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2019-11-20 17:46 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-11-20 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 4c0a89fcb0d58a3823fa372b656bdd4b72b4b907
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 17:05:25 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 17:46:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0a89fc
sci-geosciences/qgis: Drop 3.2.3
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-geosciences/qgis/Manifest | 1 -
.../qgis/files/qgis-3.2.1-qtwebkit-optional.patch | 30 ---
sci-geosciences/qgis/qgis-3.2.3.ebuild | 220 ---------------------
3 files changed, 251 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index e7ea19d711f..415ec9dd917 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,2 @@
-DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22
DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch b/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
deleted file mode 100644
index 9e56bf5ae95..00000000000
--- a/sci-geosciences/qgis/files/qgis-3.2.1-qtwebkit-optional.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 55473e7e21a068dec904fd4146642c33a44ce22a Mon Sep 17 00:00:00 2001
-From: Denis Rouzaud <denis.rouzaud@gmail.com>
-Date: Wed, 8 Aug 2018 13:40:04 +0200
-Subject: [PATCH] fix build without webkit
-
----
- src/gui/qgsmaptip.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
-index d9fe4a32607..7af6f97672c 100644
---- a/src/gui/qgsmaptip.cpp
-+++ b/src/gui/qgsmaptip.cpp
-@@ -155,12 +155,16 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
-
- void QgsMapTip::resizeContent()
- {
-+#if WITH_QTWEBKIT
- // Get the content size
- QWebElement container = mWebView->page()->mainFrame()->findFirstElement(
- QStringLiteral( "#QgsWebViewContainer" ) );
- int width = container.geometry().width() + MARGIN_VALUE * 2;
- int height = container.geometry().height() + MARGIN_VALUE * 2;
- mWidget->resize( width, height );
-+#else
-+ mWebView->adjustSize();
-+#endif
- }
-
- void QgsMapTip::clear( QgsMapCanvas * )
\ No newline at end of file
diff --git a/sci-geosciences/qgis/qgis-3.2.3.ebuild b/sci-geosciences/qgis/qgis-3.2.3.ebuild
deleted file mode 100644
index 7c4de2ebd69..00000000000
--- a/sci-geosciences/qgis/qgis-3.2.3.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.4"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
- KEYWORDS="amd64 x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils desktop ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python +webkit"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+),ssl]
- >=dev-db/spatialite-4.2.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-libs/libzip:=
- dev-libs/qtkeychain[qt5(+)]
- >=dev-qt/designer-${QT_MIN_VER}:5
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
- >=dev-qt/qtcore-${QT_MIN_VER}:5
- >=dev-qt/qtgui-${QT_MIN_VER}:5
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
- >=dev-qt/qtsvg-${QT_MIN_VER}:5
- >=dev-qt/qtsql-${QT_MIN_VER}:5
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5
- >=dev-qt/qtxml-${QT_MIN_VER}:5
- >=sci-libs/gdal-2.2.3:=[geos]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( =sci-geosciences/grass-7*:= )
- mapserver? ( dev-libs/fcgi )
- oracle? (
- dev-db/oracle-instantclient:=
- sci-libs/gdal:=[oracle]
- )
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
- 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/owslib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- )
- webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5
- >=dev-qt/qttest-${QT_MIN_VER}:5
- >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
- sys-devel/bison
- sys-devel/flex
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${COMMON_DEPEND}
- sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
- # git master
- "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
- "${FILESDIR}/${PN}-3.2.1-qtwebkit-optional.patch" # bug 663394
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
- -i CMakeLists.txt || die "Failed to fix lrelease path"
-
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
- cd src/plugins || die
-}
-
-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-qt5.so
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_3D=$(usex 3d)
- -DWITH_GEOREFERENCER=$(usex georeferencer)
- -DWITH_GRASS7=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_QWTPOLAR=$(usex polar)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_CUSTOM_WIDGETS=$(usex python)
- -DWITH_QTWEBKIT=$(usex webkit)
- )
-
- if use grass; then
- mycmakeargs+=(
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
- # bugs 612956, 648726
- addpredict /dev/dri/renderD128
- addpredict /dev/dri/renderD129
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize "${ED%/}"/usr/share/qgis/python
- fi
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
- if has_version "<sci-geosciences/qgis-3"; then
- elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2019-04-28 15:27 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2019-04-28 15:27 UTC (permalink / raw
To: gentoo-commits
commit: 3df8529de826d43e13d5966131e3d918bc5604d0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 22:21:16 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 15:26:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df8529d
sci-geosciences/qgis: Rebased FeatureSummary patch
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qgis/files/qgis-3.4.7-featuresummary.patch | 31 ++++++++++++++++++++++
sci-geosciences/qgis/qgis-9999.ebuild | 2 ++
2 files changed, 33 insertions(+)
diff --git a/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
new file mode 100644
index 00000000000..ec971cef779
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.4.7-featuresummary.patch
@@ -0,0 +1,31 @@
+From 0744b51784b779eab4bb2e78ed084d31258b5b4d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 28 Apr 2019 00:10:21 +0200
+Subject: [PATCH] cmake: Use FeatureSummary
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4dff8ea0f4..4626042ca4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,6 +71,8 @@ IF(NOT MSVC)
+ endif(USE_CCACHE)
+ endif(NOT MSVC)
+
++include(FeatureSummary)
++
+ # in generated makefiles use relative paths so the project dir is moveable
+ # Note commented out since it cause problems but it would be nice to resolve these and enable
+ #
+@@ -937,3 +939,5 @@ ENDIF (WITH_CORE)
+ IF (UNIX AND NOT APPLE)
+ ADD_SUBDIRECTORY(linux)
+ ENDIF (UNIX AND NOT APPLE)
++
++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.21.0
+
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index a1d962905d6..e52d6bd4802 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -102,6 +102,8 @@ RESTRICT="test"
PATCHES=(
# git master
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+ # TODO upstream
+ "${FILESDIR}/${PN}-3.4.7-featuresummary.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2018-06-24 13:18 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-06-24 13:18 UTC (permalink / raw
To: gentoo-commits
commit: 055505c2bc2b434bf5961a55dd979bf72731988b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 12:50:26 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 13:18:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055505c2
sci-geosciences/qgis: Fix build with USE=grass w/ Qt-5.11.0
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../qgis/files/qgis-3.0.3-qt-5.11.0.patch | 38 ++++++++++++++++++++++
sci-geosciences/qgis/qgis-3.0.3-r1.ebuild | 1 +
2 files changed, 39 insertions(+)
diff --git a/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch b/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch
new file mode 100644
index 00000000000..abda33b2dd2
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.0.3-qt-5.11.0.patch
@@ -0,0 +1,38 @@
+From 83346e5ec77dc3474c01acd27d4a3e03690170b5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 24 Jun 2018 14:38:44 +0200
+Subject: [PATCH] Fix WITH_GRASS7 build with Qt-5.11.0 (missing headers)
+
+---
+ src/plugins/grass/qgsgrassmoduleinput.cpp | 1 +
+ src/plugins/grass/qgsgrassregion.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/plugins/grass/qgsgrassmoduleinput.cpp b/src/plugins/grass/qgsgrassmoduleinput.cpp
+index ebb8efd493..6968a34d8c 100644
+--- a/src/plugins/grass/qgsgrassmoduleinput.cpp
++++ b/src/plugins/grass/qgsgrassmoduleinput.cpp
+@@ -17,6 +17,7 @@
+ #include <QCompleter>
+ #include <QFileDialog>
+ #include <QFileInfo>
++#include <QHeaderView>
+ #include <QHBoxLayout>
+ #include <QIcon>
+ #include <QLatin1String>
+diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp
+index 00928da4a7..b31f1b9ae9 100644
+--- a/src/plugins/grass/qgsgrassregion.cpp
++++ b/src/plugins/grass/qgsgrassregion.cpp
+@@ -27,6 +27,8 @@
+
+ #include <QButtonGroup>
+ #include <QColorDialog>
++#include <QDoubleValidator>
++#include <QIntValidator>
+ #include <QMessageBox>
+ #include <QMouseEvent>
+ #include <QRubberBand>
+--
+2.18.0
+
diff --git a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
index 2b4443c3425..ff58cbbac4d 100644
--- a/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.3-r1.ebuild
@@ -102,6 +102,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
# TODO upstream
"${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
+ "${FILESDIR}/${P}-qt-5.11.0.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread[parent not found: <1523569335.91435c00d97ec375328fdc6b56d03fb98e0b4adc.asturm@gentoo>]
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
[not found] <1523569335.91435c00d97ec375328fdc6b56d03fb98e0b4adc.asturm@gentoo>
@ 2018-04-12 21:42 ` Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-04-12 21:42 UTC (permalink / raw
To: gentoo-commits
commit: 91435c00d97ec375328fdc6b56d03fb98e0b4adc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 7 16:02:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 21:42:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91435c00
sci-geosciences/qgis: Drop Qt4-based 2.8.{12,16}
Closes: https://bugs.gentoo.org/635798
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-geosciences/qgis/Manifest | 3 -
sci-geosciences/qgis/files/qgis-2.18.12-sip.patch | 185 ------------------
.../qgis/files/qgis-2.18.6-featuresummary.patch | 31 ---
sci-geosciences/qgis/qgis-2.18.12.ebuild | 209 ---------------------
sci-geosciences/qgis/qgis-2.18.16.ebuild | 207 --------------------
5 files changed, 635 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 12f160796e2..1834d00be28 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,2 @@
-DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2562517bb30983592043267adc28d878ad644162ad04d84440497c567d075225db3db5a215440dee7258a8faade3 SHA512 e34dd98d0d0aa5fdf1f980dbc1376c25a9a7ffaa59b1a2eba8423e7f44bc039b547f3f65368178a8c485fa34526dd9fece2e09d9372fed3b9a758f7286b690ea
-DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
-DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78
diff --git a/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch b/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch
deleted file mode 100644
index 07db9b029bf..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.12-sip.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff --git a/python/core/conversions.sip b/python/core/conversions.sip
-index f07d3ab1db..948821e91e 100644
---- a/python/core/conversions.sip
-+++ b/python/core/conversions.sip
-@@ -2041,3 +2041,178 @@ register_from_qvariant_convertor = (void (*)(FromQVariantConvertorFn))sipImportS
- register_from_qvariant_convertor(null_from_qvariant_convertor);
- %End
- %End
-+
-+// QList<QVariant> is implemented as a Python list.
-+%MappedType QList<QVariant> /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ QVariant *t = new QVariant(sipCpp->at(i));
-+ PyObject *tobj;
-+
-+ if ((tobj = sipConvertFromNewType(t, sipType_QVariant, sipTransferObj)) == NULL)
-+ {
-+ Py_DECREF(l);
-+ delete t;
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, tobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ SIP_SSIZE_T len;
-+
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ {
-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+ return 0;
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *itm = PySequence_ITEM(sipPy, i);
-+ bool ok = (itm && sipCanConvertToType(itm, sipType_QVariant, SIP_NOT_NONE));
-+
-+ Py_XDECREF(itm);
-+
-+ if (!ok)
-+ return 0;
-+ }
-+
-+ return 1;
-+ }
-+
-+ QList<QVariant> *ql = new QList<QVariant>;
-+ len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *itm = PySequence_ITEM(sipPy, i);
-+ int state;
-+ QVariant *t = reinterpret_cast<QVariant *>(sipConvertToType(itm, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+
-+ Py_DECREF(itm);
-+
-+ if (*sipIsErr)
-+ {
-+ sipReleaseType(t, sipType_QVariant, state);
-+
-+ delete ql;
-+ return 0;
-+ }
-+
-+ ql->append(*t);
-+
-+ sipReleaseType(t, sipType_QVariant, state);
-+ }
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
-+
-+
-+// QList<QPolygonF> is implemented as a Python list.
-+%MappedType QList<QPolygonF> /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/
-+{
-+%TypeHeaderCode
-+#include <qlist.h>
-+%End
-+
-+%ConvertFromTypeCode
-+ // Create the list.
-+ PyObject *l;
-+
-+ if ((l = PyList_New(sipCpp->size())) == NULL)
-+ return NULL;
-+
-+ // Set the list elements.
-+ for (int i = 0; i < sipCpp->size(); ++i)
-+ {
-+ QPolygonF *t = new QPolygonF(sipCpp->at(i));
-+ PyObject *tobj;
-+
-+ if ((tobj = sipConvertFromNewType(t, sipType_QPolygonF, sipTransferObj)) == NULL)
-+ {
-+ Py_DECREF(l);
-+ delete t;
-+
-+ return NULL;
-+ }
-+
-+ PyList_SET_ITEM(l, i, tobj);
-+ }
-+
-+ return l;
-+%End
-+
-+%ConvertToTypeCode
-+ SIP_SSIZE_T len;
-+
-+ // Check the type if that is all that is required.
-+ if (sipIsErr == NULL)
-+ {
-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
-+ return 0;
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *itm = PySequence_ITEM(sipPy, i);
-+ bool ok = (itm && sipCanConvertToType(itm, sipType_QPolygonF, SIP_NOT_NONE));
-+
-+ Py_XDECREF(itm);
-+
-+ if (!ok)
-+ return 0;
-+ }
-+
-+ return 1;
-+ }
-+
-+ QList<QPolygonF> *ql = new QList<QPolygonF>;
-+ len = PySequence_Size(sipPy);
-+
-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
-+ {
-+ PyObject *itm = PySequence_ITEM(sipPy, i);
-+ int state;
-+ QPolygonF *t = reinterpret_cast<QPolygonF *>(sipConvertToType(itm, sipType_QPolygonF, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
-+
-+ Py_DECREF(itm);
-+
-+ if (*sipIsErr)
-+ {
-+ sipReleaseType(t, sipType_QPolygonF, state);
-+
-+ delete ql;
-+ return 0;
-+ }
-+
-+ ql->append(*t);
-+
-+ sipReleaseType(t, sipType_QPolygonF, state);
-+ }
-+
-+ *sipCppPtr = ql;
-+
-+ return sipGetState(sipTransferObj);
-+%End
-+};
---
-2.12.0
diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch b/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch
deleted file mode 100644
index 0d4c99de9de..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 9 Apr 2017 20:21:28 +0200
-Subject: [PATCH 1/2] Use FeatureSummary
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed0a84013a..26f4659f61 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON)
- # set path to additional CMake modules
- SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-
-+include(FeatureSummary)
-+
- # in generated makefiles use relative paths so the project dir is moveable
- # Note commented out since it cause problems but it would be nice to resolve these and enable
- #
-@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX)
- SET(CPACK_PACKAGE_EXECUTABLES "qgis" "QGIS")
- SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
- INCLUDE(CPack)
-+
-+FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
---
-2.12.2
-
diff --git a/sci-geosciences/qgis/qgis-2.18.12.ebuild b/sci-geosciences/qgis/qgis-2.18.12.ebuild
deleted file mode 100644
index 94f4a69b124..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.12.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 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="http://www.qgis.org/"
-SRC_URI="
- http://qgis.org/downloads/qgis-${PV}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.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}/${P}-sip.patch"
- # git master
- "${FILESDIR}/${P}-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 '<x11-libs/qscintilla-2.10'; then
- mycmakeargs+=(
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so
- )
- fi
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DBINDINGS_GLOBAL_INSTALL=ON
- -DWITH_PYSPATIALITE=ON
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- )
- fi
-
- # bug 612956
- addpredict /dev/dri/renderD128
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.18.16.ebuild b/sci-geosciences/qgis/qgis-2.18.16.ebuild
deleted file mode 100644
index 2f935622f68..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.16.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2018 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"
- # 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 '<x11-libs/qscintilla-2.10'; then
- mycmakeargs+=(
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/qt4/libqscintilla2.so
- )
- fi
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DBINDINGS_GLOBAL_INSTALL=ON
- -DWITH_PYSPATIALITE=ON
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- )
- fi
-
- # bug 612956
- addpredict /dev/dri/renderD128
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2018-03-28 21:46 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-03-28 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 489310a6d906eb10bb0a7c0f5fa2c69eecd55551
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 28 20:40:39 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 28 21:45:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489310a6
sci-geosciences/qgis: 3.0.1 version bump
Bug: https://bugs.gentoo.org/635798
Package-Manager: Portage-2.3.25, Repoman-2.3.7
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-3.0.1-check-constraints.patch | 237 +++++++++++++++++++++
.../qgis/files/qgis-3.0.1-qt-5.11.patch | 199 +++++++++++++++++
sci-geosciences/qgis/qgis-3.0.1.ebuild | 222 +++++++++++++++++++
4 files changed, 659 insertions(+)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 3c03fb62317..9b2a249d1e5 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -2,5 +2,6 @@ DIST qgis-2.18.12.tar.bz2 84936155 BLAKE2B 0d47094ae8dac3101888140b5773a8e7b52d2
DIST qgis-2.18.14.tar.bz2 84935301 BLAKE2B 37468062894235608f6efd0b58311e019f57ec0b3e6db63d8fef92ae93ac95ed13fe51290ebd063d31f1ea2318a23d7bdabb0774b451a2305064162addb4da29 SHA512 da738ae25f1207441a52091af9a3e70fd17f95704a23e27f72ee4c7ba213fd9ccf2d6685d91c34f94c555ca2dce420d6a07840b1fa682d6b960abdf3ba177036
DIST qgis-2.18.16.tar.bz2 84976777 BLAKE2B ad68ce63698266bc081db7be0529ef50f66ee9c048b2e2a743cfc24d1ddb161c86c71283c09740a22c45476f863516f8855c69a5ccf074e9676d1ed5a09563a1 SHA512 1fe060c1d392f304eea10a211815e14081299a865e34114625f3a5f2a1b365f571bb30878a21cbf25bc32285ffc689d37cb7dbcab129ce5f03ccd6fa0781876d
DIST qgis-3.0.0.tar.bz2 94186303 BLAKE2B 2b2623c218a86af22ee13e1271e66244fc6191732db6bc694860015824525188308609c8758062910ba7065ca6790d4091beb15ff324d1a8410e65525cf785b0 SHA512 91201c5d48f9450734a6268f70cba830e363db15a979266af1a7f2ef73857ca11e89145d027f394d052d0536e54b4f62523b1ad49bbe698743fec882ceecfabe
+DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78
diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch b/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch
new file mode 100644
index 00000000000..c07cd554dbf
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch
@@ -0,0 +1,237 @@
+From f07389b421065d40abe9b5355c8e329229f792d9 Mon Sep 17 00:00:00 2001
+From: Denis Rouzaud <denis.rouzaud@gmail.com>
+Date: Sat, 24 Mar 2018 18:30:45 +0100
+Subject: [PATCH] fix constraints not checked when they should be (#6550)
+ (#6599)
+
+---
+ python/gui/qgsattributeform.sip.in | 15 ++++++++++++++-
+ src/gui/attributetable/qgsdualview.cpp | 9 ++++++---
+ src/gui/attributetable/qgsdualview.h | 2 +-
+ src/gui/qgsattributeform.cpp | 21 +++++++++++++++------
+ src/gui/qgsattributeform.h | 14 +++++++++++++-
+ tests/src/gui/testqgsattributeform.cpp | 14 +++++++-------
+ 6 files changed, 56 insertions(+), 19 deletions(-)
+
+diff --git a/python/gui/qgsattributeform.sip.in b/python/gui/qgsattributeform.sip.in
+index 8b489dd3089..45deba11a31 100644
+--- a/python/gui/qgsattributeform.sip.in
++++ b/python/gui/qgsattributeform.sip.in
+@@ -139,12 +139,25 @@ on all attribute widgets.
+
+ signals:
+
+- void attributeChanged( const QString &attribute, const QVariant &value );
++ void attributeChanged( const QString &attribute, const QVariant &value );
+ %Docstring
+ Notifies about changes of attributes
+
+ :param attribute: The name of the attribute that changed.
+ :param value: The new value of the attribute.
++
++.. deprecated:: since 3.0
++%End
++
++ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
++%Docstring
++Notifies about changes of attributes
++
++:param attribute: The name of the attribute that changed.
++:param value: The new value of the attribute.
++:param attributeChanged: If true, it corresponds to an actual change of the feature attribute
++
++.. versionadded:: 3.0.1
+ %End
+
+
+diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
+index d7ccfa1a8a1..2c640036a02 100644
+--- a/src/gui/attributetable/qgsdualview.cpp
++++ b/src/gui/attributetable/qgsdualview.cpp
+@@ -98,7 +98,7 @@ void QgsDualView::init( QgsVectorLayer *layer, QgsMapCanvas *mapCanvas, const Qg
+ mAttributeEditor->layout()->addWidget( mAttributeForm );
+ }
+
+- connect( mAttributeForm, &QgsAttributeForm::attributeChanged, this, &QgsDualView::featureFormAttributeChanged );
++ connect( mAttributeForm, &QgsAttributeForm::widgetValueChanged, this, &QgsDualView::featureFormAttributeChanged );
+ connect( mAttributeForm, &QgsAttributeForm::modeChanged, this, &QgsDualView::formModeChanged );
+ connect( mMasterModel, &QgsAttributeTableModel::modelChanged, mAttributeForm, &QgsAttributeForm::refreshFeature );
+ connect( mAttributeForm, &QgsAttributeForm::filterExpressionSet, this, &QgsDualView::filterExpressionSet );
+@@ -880,9 +880,12 @@ void QgsDualView::extentChanged()
+ emit filterChanged();
+ }
+
+-void QgsDualView::featureFormAttributeChanged()
++void QgsDualView::featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged )
+ {
+- mFeatureList->setCurrentFeatureEdited( true );
++ Q_UNUSED( attribute );
++ Q_UNUSED( value );
++ if ( attributeChanged )
++ mFeatureList->setCurrentFeatureEdited( true );
+ }
+
+ void QgsDualView::setFilteredFeatures( const QgsFeatureIds &filteredFeatures )
+diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
+index 73cb420f44b..264adbacb29 100644
+--- a/src/gui/attributetable/qgsdualview.h
++++ b/src/gui/attributetable/qgsdualview.h
+@@ -327,7 +327,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
+ * Will forward this signal to the feature list to visually represent
+ * that there has been an edit event.
+ */
+- void featureFormAttributeChanged();
++ void featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
+
+ /**
+ * Will be called periodically, when loading layers from slow data providers.
+diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
+index df1e98282f6..7a707c6fd7d 100644
+--- a/src/gui/qgsattributeform.cpp
++++ b/src/gui/qgsattributeform.cpp
+@@ -240,6 +240,7 @@ void QgsAttributeForm::changeAttribute( const QString &field, const QVariant &va
+
+ void QgsAttributeForm::setFeature( const QgsFeature &feature )
+ {
++ mIsSettingFeature = true;
+ mFeature = feature;
+
+ switch ( mMode )
+@@ -266,6 +267,7 @@ void QgsAttributeForm::setFeature( const QgsFeature &feature )
+ break;
+ }
+ }
++ mIsSettingFeature = false;
+ }
+
+ bool QgsAttributeForm::saveEdits()
+@@ -692,11 +694,7 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
+ QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( sender() );
+ Q_ASSERT( eww );
+
+- const QVariant oldValue = mFeature.attribute( eww->fieldIdx() );
+-
+- // Safety check, if we receive the same value again, no reason to do anything
+- if ( oldValue == value && oldValue.isNull() == value.isNull() )
+- return;
++ bool signalEmitted = false;
+
+ if ( mValuesInitialized )
+ mDirty = true;
+@@ -707,7 +705,12 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
+ case IdentifyMode:
+ case AddFeatureMode:
+ {
++ Q_NOWARN_DEPRECATED_PUSH
+ emit attributeChanged( eww->field().name(), value );
++ Q_NOWARN_DEPRECATED_PUSH
++ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature );
++
++ signalEmitted = true;
+
+ updateJoinedFields( *eww );
+
+@@ -739,7 +742,13 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value )
+
+ updateConstraints( eww );
+
+- emit attributeChanged( eww->field().name(), value );
++ if ( !signalEmitted )
++ {
++ Q_NOWARN_DEPRECATED_PUSH
++ emit attributeChanged( eww->field().name(), value );
++ Q_NOWARN_DEPRECATED_PUSH
++ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature );
++ }
+ }
+
+ void QgsAttributeForm::updateAllConstraints()
+diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h
+index 6102825b286..41f16cd8614 100644
+--- a/src/gui/qgsattributeform.h
++++ b/src/gui/qgsattributeform.h
+@@ -178,8 +178,19 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
+ *
+ * \param attribute The name of the attribute that changed.
+ * \param value The new value of the attribute.
++ * \deprecated since 3.0
+ */
+- void attributeChanged( const QString &attribute, const QVariant &value );
++ Q_DECL_DEPRECATED void attributeChanged( const QString &attribute, const QVariant &value );
++
++ /**
++ * Notifies about changes of attributes
++ *
++ * \param attribute The name of the attribute that changed.
++ * \param value The new value of the attribute.
++ * \param attributeChanged If true, it corresponds to an actual change of the feature attribute
++ * \since QGIS 3.0.1
++ */
++ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged );
+
+ /**
+ * Will be emitted before the feature is saved. Use this signal to perform sanity checks.
+@@ -367,6 +378,7 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
+ QMap<const QgsVectorLayerJoinInfo *, QgsFeature> mJoinedFeatures;
+ bool mValuesInitialized = false;
+ bool mDirty = false;
++ bool mIsSettingFeature = false;
+
+ struct ContainerInformation
+ {
+diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp
+index d4629cb0762..9b6d5c46444 100644
+--- a/tests/src/gui/testqgsattributeform.cpp
++++ b/tests/src/gui/testqgsattributeform.cpp
+@@ -111,24 +111,24 @@ void TestQgsAttributeForm::testFieldConstraint()
+ // build a form for this feature
+ QgsAttributeForm form2( layer );
+ form2.setFeature( ft );
+- QSignalSpy spy( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) );
++ QSignalSpy spy( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) );
+ ww = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[0] );
+
+ // set value to 1
+ ww->setValue( 1 );
+- QCOMPARE( spy.count(), 2 );
++ QCOMPARE( spy.count(), 1 );
+ QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel );
+
+ // set value to null
+ spy.clear();
+ ww->setValue( QVariant() );
+- QCOMPARE( spy.count(), 2 );
++ QCOMPARE( spy.count(), 1 );
+ QCOMPARE( constraintsLabel( &form2, ww )->text(), invalidLabel );
+
+ // set value to 1
+ spy.clear();
+ ww->setValue( 1 );
+- QCOMPARE( spy.count(), 2 );
++ QCOMPARE( spy.count(), 1 );
+ QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel );
+
+ // set a soft constraint
+@@ -205,11 +205,11 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
+ ww1 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[1] );
+ ww2 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[2] );
+ ww3 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[3] );
+- QSignalSpy spy2( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) );
++ QSignalSpy spy2( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) );
+
+ // change value
+ ww0->setValue( 2 ); // update col0
+- QCOMPARE( spy2.count(), 2 );
++ QCOMPARE( spy2.count(), 1 );
+
+ QCOMPARE( constraintsLabel( &form2, ww0 )->text(), inv ); // 2 < ( 1 + 2 )
+ QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() );
+@@ -219,7 +219,7 @@ void TestQgsAttributeForm::testFieldMultiConstraints()
+ // change value
+ spy2.clear();
+ ww0->setValue( 1 ); // update col0
+- QCOMPARE( spy2.count(), 2 );
++ QCOMPARE( spy2.count(), 1 );
+
+ QCOMPARE( constraintsLabel( &form2, ww0 )->text(), val ); // 1 < ( 1 + 2 )
+ QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() );
diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch b/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch
new file mode 100644
index 00000000000..c78c0dec3bb
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch
@@ -0,0 +1,199 @@
+From 0a903118389029fd25fbf4eddd20f60c8856ab4e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed, 28 Mar 2018 20:48:58 +0200
+Subject: [PATCH] Fix build with Qt-5.11 (missing headers)
+
+---
+ src/app/layout/qgslayoutpolylinewidget.cpp | 2 ++
+ src/app/layout/qgslayoutscalebarwidget.cpp | 1 +
+ src/app/layout/qgslayoutscalebarwidget.h | 2 ++
+ src/app/qgslabelinggui.cpp | 2 ++
+ src/app/qgsrulebasedlabelingwidget.cpp | 1 +
+ src/gui/layout/qgslayoutitemwidget.cpp | 2 ++
+ src/gui/layout/qgslayoutnewitempropertiesdialog.cpp | 2 ++
+ src/gui/qgscompoundcolorwidget.cpp | 1 +
+ src/gui/qgsextentgroupbox.cpp | 1 +
+ src/gui/qgsgradientcolorrampdialog.cpp | 1 +
+ src/gui/qgsgroupwmsdatadialog.cpp | 1 +
+ src/gui/qgstextformatwidget.cpp | 2 ++
+ src/gui/symbology/qgssymbollayerwidget.cpp | 1 +
+ src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp | 1 +
+ 14 files changed, 20 insertions(+)
+
+diff --git a/src/app/layout/qgslayoutpolylinewidget.cpp b/src/app/layout/qgslayoutpolylinewidget.cpp
+index 178968917a..28d5d25a4d 100644
+--- a/src/app/layout/qgslayoutpolylinewidget.cpp
++++ b/src/app/layout/qgslayoutpolylinewidget.cpp
+@@ -21,6 +21,8 @@
+ #include "qgslayoutitemregistry.h"
+ #include "qgslayout.h"
+ #include "qgslayoutundostack.h"
++
++#include <QButtonGroup>
+ #include <QFileDialog>
+
+ QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polyline )
+diff --git a/src/app/layout/qgslayoutscalebarwidget.cpp b/src/app/layout/qgslayoutscalebarwidget.cpp
+index c1b8ad1509..569a4e0573 100644
+--- a/src/app/layout/qgslayoutscalebarwidget.cpp
++++ b/src/app/layout/qgslayoutscalebarwidget.cpp
+@@ -19,6 +19,7 @@
+ #include "qgslayoutitemscalebar.h"
+ #include "qgslayout.h"
+ #include "qgsguiutils.h"
++
+ #include <QColorDialog>
+ #include <QFontDialog>
+ #include <QWidget>
+diff --git a/src/app/layout/qgslayoutscalebarwidget.h b/src/app/layout/qgslayoutscalebarwidget.h
+index a60b777bfa..ec7cc46cca 100644
+--- a/src/app/layout/qgslayoutscalebarwidget.h
++++ b/src/app/layout/qgslayoutscalebarwidget.h
+@@ -20,6 +20,8 @@
+ #include "ui_qgslayoutscalebarwidgetbase.h"
+ #include "qgslayoutitemwidget.h"
+
++#include <QButtonGroup>
++
+ class QgsLayoutItemScaleBar;
+
+ /**
+diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
+index e5cf8ff626..4d6a83700d 100644
+--- a/src/app/qgslabelinggui.cpp
++++ b/src/app/qgslabelinggui.cpp
+@@ -24,6 +24,8 @@
+ #include "qgsauxiliarystorage.h"
+ #include "qgsnewauxiliarylayerdialog.h"
+
++#include <QButtonGroup>
++
+ QgsExpressionContext QgsLabelingGui::createExpressionContext() const
+ {
+ QgsExpressionContext expContext;
+diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp
+index 6f1f77ef9a..57b7d34799 100644
+--- a/src/app/qgsrulebasedlabelingwidget.cpp
++++ b/src/app/qgsrulebasedlabelingwidget.cpp
+@@ -26,6 +26,7 @@
+ #include "qgsvectorlayerlabeling.h"
+ #include "qgslogger.h"
+
++#include <QAction>
+ #include <QClipboard>
+ #include <QMessageBox>
+
+diff --git a/src/gui/layout/qgslayoutitemwidget.cpp b/src/gui/layout/qgslayoutitemwidget.cpp
+index 1d3d4f8171..d68799234b 100644
+--- a/src/gui/layout/qgslayoutitemwidget.cpp
++++ b/src/gui/layout/qgslayoutitemwidget.cpp
+@@ -21,6 +21,8 @@
+ #include "qgsprintlayout.h"
+ #include "qgslayoutatlas.h"
+
++#include <QButtonGroup>
++
+ //
+ // QgsLayoutConfigObject
+ //
+diff --git a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
+index 9fa5f98358..c53d002acb 100644
+--- a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
++++ b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
+@@ -19,6 +19,8 @@
+ #include "qgslayoutpagecollection.h"
+ #include "qgsgui.h"
+
++#include <QButtonGroup>
++
+ QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Qt::WindowFlags flags )
+ : QDialog( parent, flags )
+ {
+diff --git a/src/gui/qgscompoundcolorwidget.cpp b/src/gui/qgscompoundcolorwidget.cpp
+index a7dbb77501..48032a2456 100644
+--- a/src/gui/qgscompoundcolorwidget.cpp
++++ b/src/gui/qgscompoundcolorwidget.cpp
+@@ -20,6 +20,7 @@
+ #include "qgsapplication.h"
+ #include "qgssettings.h"
+
++#include <QHeaderView>
+ #include <QPushButton>
+ #include <QMenu>
+ #include <QToolButton>
+diff --git a/src/gui/qgsextentgroupbox.cpp b/src/gui/qgsextentgroupbox.cpp
+index ffc8ab7195..d5d77db6a0 100644
+--- a/src/gui/qgsextentgroupbox.cpp
++++ b/src/gui/qgsextentgroupbox.cpp
+@@ -24,6 +24,7 @@
+
+ #include <QMenu>
+ #include <QAction>
++#include <QDoubleValidator>
+
+ QgsExtentGroupBox::QgsExtentGroupBox( QWidget *parent )
+ : QgsCollapsibleGroupBox( parent )
+diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp
+index fcc93d74fb..317f373423 100644
+--- a/src/gui/qgsgradientcolorrampdialog.cpp
++++ b/src/gui/qgsgradientcolorrampdialog.cpp
+@@ -22,6 +22,7 @@
+ #include "qgssettings.h"
+
+ #include <QColorDialog>
++#include <QHeaderView>
+ #include <QInputDialog>
+ #include <QPainter>
+ #include <QTableWidget>
+diff --git a/src/gui/qgsgroupwmsdatadialog.cpp b/src/gui/qgsgroupwmsdatadialog.cpp
+index 456c813f5f..f9bb15ab6d 100644
+--- a/src/gui/qgsgroupwmsdatadialog.cpp
++++ b/src/gui/qgsgroupwmsdatadialog.cpp
+@@ -16,6 +16,7 @@
+ #include "qgsapplication.h"
+ #include "qgsgroupwmsdatadialog.h"
+
++#include <QRegExpValidator>
+
+ QgsGroupWmsDataDialog::QgsGroupWmsDataDialog( QWidget *parent, Qt::WindowFlags fl )
+ : QDialog( parent, fl )
+diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp
+index 8c3c67d8e9..9005a40081 100644
+--- a/src/gui/qgstextformatwidget.cpp
++++ b/src/gui/qgstextformatwidget.cpp
+@@ -29,6 +29,8 @@
+ #include "qgseffectstack.h"
+ #include "qgspainteffectregistry.h"
+
++#include <QButtonGroup>
++
+ QgsTextFormatWidget::QgsTextFormatWidget( const QgsTextFormat &format, QgsMapCanvas *mapCanvas, QWidget *parent )
+ : QWidget( parent )
+ , mMapCanvas( mapCanvas )
+diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp
+index 3a5f3c5314..da599a27ae 100644
+--- a/src/gui/symbology/qgssymbollayerwidget.cpp
++++ b/src/gui/symbology/qgssymbollayerwidget.cpp
+@@ -43,6 +43,7 @@
+ #include "qgsauxiliarystorage.h"
+
+ #include <QAbstractButton>
++#include <QButtonGroup>
+ #include <QColorDialog>
+ #include <QCursor>
+ #include <QDir>
+diff --git a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
+index 4cc3e8b301..d377d718b7 100644
+--- a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
++++ b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
+@@ -29,6 +29,7 @@
+ #include "qgssettings.h"
+ #include "qgsmapcanvas.h"
+
++#include <QButtonGroup>
+ #include <QListWidgetItem>
+ #include <QMessageBox>
+ #include <QFileDialog>
+--
+2.16.3
+
diff --git a/sci-geosciences/qgis/qgis-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild
new file mode 100644
index 00000000000..fcf4f8846c7
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.0.1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.1"
+
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+ examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+ KEYWORDS="~amd64 ~x86"
+else
+ GIT_ECLASS="git-r3"
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
+
+REQUIRED_USE="
+ mapserver? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+),ssl]
+ >=dev-db/spatialite-4.2.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/libzip:=
+ dev-libs/qtkeychain[qt5(+)]
+ >=dev-qt/designer-${QT_MIN_VER}:5
+ >=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+ >=dev-qt/qtcore-${QT_MIN_VER}:5
+ >=dev-qt/qtgui-${QT_MIN_VER}:5
+ >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+ >=dev-qt/qtpositioning-${QT_MIN_VER}:5
+ >=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+ >=dev-qt/qtsvg-${QT_MIN_VER}:5
+ >=dev-qt/qtsql-${QT_MIN_VER}:5
+ >=dev-qt/qtwidgets-${QT_MIN_VER}:5
+ >=dev-qt/qtxml-${QT_MIN_VER}:5
+ >=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ sci-libs/proj
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+ >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+ 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+ georeferencer? ( sci-libs/gsl:= )
+ grass? ( >=sci-geosciences/grass-7.0.0:= )
+ mapserver? ( dev-libs/fcgi )
+ oracle? (
+ dev-db/oracle-instantclient:=
+ sci-libs/gdal:=[oracle]
+ )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ 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/owslib[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ )
+ webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-qt/linguist-tools-${QT_MIN_VER}:5
+ >=dev-qt/qttest-${QT_MIN_VER}:5
+ >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+ 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=(
+ # git master
+ "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+ # release-3_0 branch
+ "${FILESDIR}/${P}-check-constraints.patch"
+ # TODO upstream
+ "${FILESDIR}/${P}-qt-5.11.patch"
+ "${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+ -i CMakeLists.txt || die "Failed to fix lrelease path"
+
+ sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+ -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+ -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+ -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+ cd src/plugins || die
+}
+
+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-qt5.so
+ -DPEDANTIC=OFF
+ -DWITH_APIDOC=OFF
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DWITH_3D=$(usex 3d)
+ -DWITH_GEOREFERENCER=$(usex georeferencer)
+ -DWITH_GRASS=$(usex grass)
+ -DWITH_SERVER=$(usex mapserver)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_QWTPOLAR=$(usex polar)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
+ -DWITH_QTWEBKIT=$(usex webkit)
+ )
+
+ if use grass; then
+ mycmakeargs+=(
+ -DWITH_GRASS7=ON
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ )
+ fi
+
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+ # bugs 612956, 648726
+ addpredict /dev/dri/renderD128
+ addpredict /dev/dri/renderD129
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ domenu debian/qgis.desktop
+
+ local size type
+ for size in 16 22 24 32 48 64 96 128 256; do
+ newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+ newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+ for type in qgs qml qlr qpt; do
+ newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+ done
+ done
+ newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ python_optimize "${ED%/}"/usr/share/qgis/python
+
+ if use grass; then
+ python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+ if has_version "<sci-geosciences/qgis-3"; then
+ elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+ fi
+
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2018-03-05 6:06 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2018-03-05 6:06 UTC (permalink / raw
To: gentoo-commits
commit: 0f2133ecf5177fd1489f8cf93946266cf70c6a4b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 5 00:57:31 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 5 06:06:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f2133ec
sci-geosciences/qgis: Fix DEPENDs
Closes: https://bugs.gentoo.org/649526
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../qgis/files/qgis-3.0.0-featuresummary.patch | 31 ++++++++++++++++++++++
sci-geosciences/qgis/metadata.xml | 1 +
.../{qgis-9999.ebuild => qgis-3.0.0-r1.ebuild} | 12 ++++++---
sci-geosciences/qgis/qgis-9999.ebuild | 12 ++++++---
4 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
new file mode 100644
index 00000000000..8787dc09196
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-3.0.0-featuresummary.patch
@@ -0,0 +1,31 @@
+From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 9 Apr 2017 20:21:28 +0200
+Subject: [PATCH 1/2] Use FeatureSummary
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed0a84013a..26f4659f61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON)
+ # set path to additional CMake modules
+ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
++include(FeatureSummary)
++
+ # in generated makefiles use relative paths so the project dir is moveable
+ # Note commented out since it cause problems but it would be nice to resolve these and enable
+ #
+@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX)
+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
+ INCLUDE(CPack)
+ ENDIF (WITH_CORE)
++
++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.12.2
+
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index 511bb239d69..da9f159f45d 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -14,6 +14,7 @@
tracks from your GPS.
</longdescription>
<use>
+ <flag name="3d">Build QGIS 3D library using <pkg>dev-qt/qt3d</pkg></flag>
<flag name="designer">Build custom widgets for <pkg>dev-qt/designer</pkg></flag>
<flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
similarity index 94%
copy from sci-geosciences/qgis/qgis-9999.ebuild
copy to sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
index d773dd57187..4f627756c81 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.qgis.org/"
LICENSE="GPL-2+ GPL-3+"
SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
REQUIRED_USE="
mapserver? ( python )
@@ -36,6 +36,7 @@ COMMON_DEPEND="
dev-libs/expat
dev-libs/libzip:=
dev-libs/qtkeychain[qt5(+)]
+ >=dev-qt/designer-${QT_MIN_VER}:5
>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
>=dev-qt/qtcore-${QT_MIN_VER}:5
>=dev-qt/qtgui-${QT_MIN_VER}:5
@@ -52,7 +53,7 @@ COMMON_DEPEND="
sci-libs/proj
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 )
+ 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( >=sci-geosciences/grass-7.0.0:= )
mapserver? ( dev-libs/fcgi )
@@ -69,7 +70,7 @@ COMMON_DEPEND="
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+ dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -98,6 +99,8 @@ RESTRICT="test"
PATCHES=(
# git master
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+ # TODO upstream
+ "${FILESDIR}/${P}-featuresummary.patch"
)
pkg_setup() {
@@ -130,7 +133,7 @@ src_configure() {
-DWITH_APIDOC=OFF
-DWITH_QSPATIALITE=ON
-DENABLE_TESTS=OFF
- -DWITH_CUSTOM_WIDGETS=$(usex designer)
+ -DWITH_3D=$(usex 3d)
-DWITH_GEOREFERENCER=$(usex georeferencer)
-DWITH_GRASS=$(usex grass)
-DWITH_SERVER=$(usex mapserver)
@@ -138,6 +141,7 @@ src_configure() {
-DWITH_QWTPOLAR=$(usex polar)
-DWITH_POSTGRESQL=$(usex postgres)
-DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QTWEBKIT=$(usex webkit)
)
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index d773dd57187..3c190c67ffb 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.qgis.org/"
LICENSE="GPL-2+ GPL-3+"
SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle polar postgres python webkit"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
REQUIRED_USE="
mapserver? ( python )
@@ -36,6 +36,7 @@ COMMON_DEPEND="
dev-libs/expat
dev-libs/libzip:=
dev-libs/qtkeychain[qt5(+)]
+ >=dev-qt/designer-${QT_MIN_VER}:5
>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
>=dev-qt/qtcore-${QT_MIN_VER}:5
>=dev-qt/qtgui-${QT_MIN_VER}:5
@@ -52,7 +53,7 @@ COMMON_DEPEND="
sci-libs/proj
>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
- designer? ( >=dev-qt/designer-${QT_MIN_VER}:5 )
+ 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
georeferencer? ( sci-libs/gsl:= )
grass? ( >=sci-geosciences/grass-7.0.0:= )
mapserver? ( dev-libs/fcgi )
@@ -69,7 +70,7 @@ COMMON_DEPEND="
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+ dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -98,6 +99,8 @@ RESTRICT="test"
PATCHES=(
# git master
"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+ # TODO upstream
+ "${FILESDIR}/${PN}-3.0.0-featuresummary.patch"
)
pkg_setup() {
@@ -130,7 +133,7 @@ src_configure() {
-DWITH_APIDOC=OFF
-DWITH_QSPATIALITE=ON
-DENABLE_TESTS=OFF
- -DWITH_CUSTOM_WIDGETS=$(usex designer)
+ -DWITH_3D=$(usex 3d)
-DWITH_GEOREFERENCER=$(usex georeferencer)
-DWITH_GRASS=$(usex grass)
-DWITH_SERVER=$(usex mapserver)
@@ -138,6 +141,7 @@ src_configure() {
-DWITH_QWTPOLAR=$(usex polar)
-DWITH_POSTGRESQL=$(usex postgres)
-DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QTWEBKIT=$(usex webkit)
)
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-12-21 2:38 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-12-21 2:38 UTC (permalink / raw
To: gentoo-commits
commit: e1c869e494ee8bd1d937942b5571a25a08769bf9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 02:24:43 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 02:34:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c869e4
sci-geosciences/qgis: Drop old
Closes: https://bugs.gentoo.org/623780
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../qgis/files/qgis-2.18.6-python.patch | 25 ---
sci-geosciences/qgis/metadata.xml | 1 -
sci-geosciences/qgis/qgis-2.18.12-r100.ebuild | 234 ---------------------
3 files changed, 260 deletions(-)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch b/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
deleted file mode 100644
index b8a812d3e4f..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.6-python.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 13d8e30bbe0ee17fff32a3eba90cd217d277e5ac
-Author: Marco Bernasocchi <marco@opengis.ch>
-Date: Wed Dec 7 19:08:24 2016 +1300
-
- fix 2.18 build with Qt5 by executing pyuic
-
-diff --git a/scripts/pyuic-wrapper.sh b/scripts/pyuic-wrapper.sh
-index d6fb497a84..aa146b31bb 100755
---- a/scripts/pyuic-wrapper.sh
-+++ b/scripts/pyuic-wrapper.sh
-@@ -15,12 +15,12 @@
- ###########################################################################
-
-
--PYUIC4=$1
-+PYUIC=$1
- LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
- PYTHONPATH=$3:$PYTHONPATH
- PYTHON=$4
- shift 4
-
- export LD_LIBRARY_PATH PYTHONPATH
--
-+$PYUIC $@
- exec $PYTHON $(dirname $0)/pyuic-wrapper.py $@
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index c64b2c6468e..511bb239d69 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -19,6 +19,5 @@
<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
<flag name="mapserver">Determines whether mapserver should be built</flag>
<flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag>
- <flag name="touch">Enable support for touch input devices</flag>
</use>
</pkgmetadata>
diff --git a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild b/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
deleted file mode 100644
index 2e8591032de..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.12-r100.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="sqlite"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
-
-REQUIRED_USE="
- mapserver? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5,ssl]
- >=dev-db/spatialite-4.1.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- x11-libs/qscintilla:=[qt5]
- >=x11-libs/qwt-6.1.2:6=[qt5,svg]
- >=x11-libs/qwtpolar-1.1.1-r1[qt5]
- designer? ( dev-qt/designer:5 )
- 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/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[qt5,${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}
- dev-qt/linguist-tools:5
- dev-qt/qttest:5
- dev-qt/qtxmlpatterns:5
- 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"
- "${FILESDIR}/${PN}-2.18.6-python.patch"
- # Taken from redhat
- "${FILESDIR}/${P}-sip.patch"
- # git master
- "${FILESDIR}/${P}-cmake-lib-suffix.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
- -i CMakeLists.txt || die "Failed to fix lrelease path"
-
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
- 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-qt5.so
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DENABLE_QT5=ON
- -DWITH_CUSTOM_WIDGETS=$(usex designer)
- -DWITH_GRASS=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_TOUCH="$(usex touch)"
- )
-# # FIXME: Re-add when segfaults were figured out upstream, bug #612070
-# -DWITH_QTWEBKIT=$(usex webkit)
-
- if has_version '<x11-libs/qscintilla-2.10'; then
- mycmakeargs+=(
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
- )
- fi
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DBINDINGS_GLOBAL_INSTALL=ON
- -DWITH_PYSPATIALITE=ON
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-07-01 15:56 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-07-01 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 0eb013faa01916545544abbcaae5d9952fe683a2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 22:14:17 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 1 15:56:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb013fa
sci-geosciences/qgis: Drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sci-geosciences/qgis/Manifest | 2 -
.../qgis-2.18.9-broken-psycopg2-encoding.patch | 32 ---
.../qgis-2.18.9-dbmanager-plugin-exceptions.patch | 89 --------
.../qgis-2.18.9-fix-plugin-config-settings.patch | 23 ---
.../files/qgis-2.18.9-uncaught-exception.patch | 40 ----
sci-geosciences/qgis/qgis-2.18.7.ebuild | 221 --------------------
sci-geosciences/qgis/qgis-2.18.9.ebuild | 226 ---------------------
7 files changed, 633 deletions(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index b5df166015b..b922dbe1347 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,5 +1,3 @@
DIST qgis-2.18.10.tar.bz2 84503710 SHA256 b2754daa6870008132702008c285dc94830e92ef0bd64e548ce5b47f2dec3fef SHA512 7f72515b72842a8612675c552f0091ca8b7075bda7fa3dbad09641532148af98cbeb17ee0eb3518204e59ce3a87db2eaef9ba57192ee5ade183b1c300e7a96d8 WHIRLPOOL ea983e6f0043df1484496c341ad905d672c55b548494ad9ae10ec0cf8731ecd148f0536a0557489a8d42cbe97bd91db261de868609bd4004997f35f7a00bee3d
DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
-DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f
-DIST qgis-2.18.9.tar.bz2 84453524 SHA256 a922af0e4b3bcf8e790d7fc50752bc96771abfc2d093365cb3260b45c27225a1 SHA512 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 WHIRLPOOL cfc6006eed3e948407eea79c57eb543be700d99ff0eb38e07263ec8659dee4ceafac8879dc95ac7b275efe44708d4a949d71dfd9800e8a9cb013527aabcea8e3
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch b/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
deleted file mode 100644
index b6eb1d17159..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2c8e03de391ac8a878d56e0a491c6a70b7a4c589 Mon Sep 17 00:00:00 2001
-From: Borys Jurgiel <info@borysjurgiel.pl>
-Date: Sat, 3 Jun 2017 16:54:54 +0200
-Subject: [PATCH] [PROCESSING] [regression] One more fix for broken encoding of
- psycopg2 error messages
-
----
- python/plugins/processing/tools/postgis.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/plugins/processing/tools/postgis.py b/python/plugins/processing/tools/postgis.py
-index 69fab99b7f4..96c88f95f63 100644
---- a/python/plugins/processing/tools/postgis.py
-+++ b/python/plugins/processing/tools/postgis.py
-@@ -205,7 +205,7 @@ def __init__(self, host=None, port=None, dbname=None, user=None,
- break
- except psycopg2.OperationalError as e:
- if i == 3:
-- raise DbError(unicode(e))
-+ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'))
-
- err = unicode(e)
- user = self.uri.username()
-@@ -821,7 +821,7 @@ def _exec_sql(self, cursor, sql):
- try:
- cursor.execute(sql)
- except psycopg2.Error as e:
-- raise DbError(unicode(e), e.cursor.query)
-+ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'), e.cursor.query)
-
- def _exec_sql_and_commit(self, sql):
- """Tries to execute and commit some action, on error it rolls
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch b/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
deleted file mode 100644
index 0b780c22ca6..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From dae921c51f85f2dde2bab9b18a0d7c7c31bc700b Mon Sep 17 00:00:00 2001
-From: Luigi Pirelli <luipir@gmail.com>
-Date: Thu, 11 May 2017 17:40:32 +0200
-Subject: [PATCH] [DB Manager] previewing layers in Virtual layers section
- remove them from the Layers panel: fixies #16476 plus more vlayer db_manager
- plugin fixes to reduce (but can't avoid) exceptions due to C++/SIP object
- removes
-
----
- python/plugins/db_manager/db_plugins/vlayers/connector.py | 10 ++++++++++
- python/plugins/db_manager/layer_preview.py | 11 +++++++----
- 2 files changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/python/plugins/db_manager/db_plugins/vlayers/connector.py b/python/plugins/db_manager/db_plugins/vlayers/connector.py
-index e64f2ec57b6..4c8cb4dca1b 100644
---- a/python/plugins/db_manager/db_plugins/vlayers/connector.py
-+++ b/python/plugins/db_manager/db_plugins/vlayers/connector.py
-@@ -96,6 +96,10 @@ def getLayer(self, l):
- lid = self.layers.get(l)
- if lid is None:
- return lid
-+ # the instance can refer to a layer in map previe and not in qgis general canvas
-+ if lid not in QgsMapLayerRegistry.instance().mapLayers().keys():
-+ self.layers.pop(l)
-+ return None
- return QgsMapLayerRegistry.instance().mapLayer(lid)
-
-
-@@ -246,12 +250,16 @@ def getRasterTables(self, schema=None):
- def getTableRowCount(self, table):
- t = table[1]
- l = VLayerRegistry.instance().getLayer(t)
-+ if not l or not l.isValid():
-+ return None
- return l.featureCount()
-
- def getTableFields(self, table):
- """ return list of columns in table """
- t = table[1]
- l = VLayerRegistry.instance().getLayer(t)
-+ if not l or not l.isValid():
-+ return []
- # id, name, type, nonnull, default, pk
- n = l.dataProvider().fields().size()
- f = [(i, f.name(), f.typeName(), False, None, False)
-@@ -277,6 +285,8 @@ def getTableExtent(self, table, geom):
- l = QgsMapLayerRegistry.instance().mapLayer(t)
- else:
- l = VLayerRegistry.instance().getLayer(t)
-+ if not l or not l.isValid():
-+ return None
- e = l.extent()
- r = (e.xMinimum(), e.yMinimum(), e.xMaximum(), e.yMaximum())
- return r
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
-index 1f7cec65526..27bba0a8f13 100644
---- a/python/plugins/db_manager/layer_preview.py
-+++ b/python/plugins/db_manager/layer_preview.py
-@@ -25,7 +25,7 @@
- from qgis.PyQt.QtWidgets import QApplication
-
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
-
- from .db_plugins.plugin import Table
-
-@@ -113,15 +113,18 @@ def _loadTablePreview(self, table, limit=False):
- else:
- vl = table.toMapLayer()
-
-- if not vl.isValid():
-+ if vl and not vl.isValid():
- vl.deleteLater()
- vl = None
-
- # remove old layer (if any) and set new
- if self.currentLayer:
-- QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
-+ # but not remove it if in layer list panel
-+ # fix https://issues.qgis.org/issues/16476
-+ if not QgsProject.instance().layerTreeRoot().findLayer(self.currentLayer.id()):
-+ QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
-
-- if vl:
-+ if vl and vl.isValid():
- self.setLayerSet([QgsMapCanvasLayer(vl)])
- QgsMapLayerRegistry.instance().addMapLayers([vl], False)
- self.zoomToFullExtent()
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch b/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
deleted file mode 100644
index cbf03f146ca..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 008f38574e78f0557aae890f508cf5e148545d15 Mon Sep 17 00:00:00 2001
-From: "Juergen E. Fischer" <jef@norbit.de>
-Date: Wed, 31 May 2017 13:50:03 +0200
-Subject: [PATCH] processing: only reset existing menu 'settings' (followup
- e78fc620)
-
----
- python/plugins/processing/gui/ConfigDialog.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py
-index 85d8641fb48..d2776b7dca0 100644
---- a/python/plugins/processing/gui/ConfigDialog.py
-+++ b/python/plugins/processing/gui/ConfigDialog.py
-@@ -256,6 +256,8 @@ def resetMenusToDefaults(self):
- for provider in providers:
- for alg in provider.algs:
- d = defaultMenuEntries.get(alg.commandLineName(), "")
-+ if "MENU_" + alg.commandLineName() not in ProcessingConfig.settings:
-+ continue
- setting = ProcessingConfig.settings["MENU_" + alg.commandLineName()]
- item = self.items[setting]
- item.setData(d, Qt.EditRole)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch b/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
deleted file mode 100644
index 4785385458b..00000000000
--- a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ed03e99ee582cb4abd1ae08cf333da8c0975a4c8 Mon Sep 17 00:00:00 2001
-From: Luigi Pirelli <luipir@gmail.com>
-Date: Tue, 9 May 2017 13:39:23 +0200
-Subject: [PATCH] catch uncatched exception when item has lost reference.
- fixies #15868
-
----
- python/plugins/db_manager/layer_preview.py | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
-index 27bba0a8f13..9947b1ef4d8 100644
---- a/python/plugins/db_manager/layer_preview.py
-+++ b/python/plugins/db_manager/layer_preview.py
-@@ -25,7 +25,7 @@
- from qgis.PyQt.QtWidgets import QApplication
-
- from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
--from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
-+from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject, QgsMessageLog
-
- from .db_plugins.plugin import Table
-
-@@ -78,11 +78,13 @@ def setDirty(self, val=True):
- def _clear(self):
- """ remove any layers from preview canvas """
- if self.item is not None:
-- ## skip exception on RuntimeError fixes #6892
- try:
- self.item.aboutToChange.disconnect(self.setDirty)
-- except RuntimeError:
-- pass
-+ ## skip exception on RuntimeError fixes #6892
-+ ## skip TypeError and generic Exceptions fixes #15868
-+ ## generally due the remove of self.item object or C++ referenced object
-+ except Exception as ex:
-+ QgsMessageLog.logMessage(unicode(ex))
-
- self.item = None
- self.dirty = False
diff --git a/sci-geosciences/qgis/qgis-2.18.7.ebuild b/sci-geosciences/qgis/qgis-2.18.7.ebuild
deleted file mode 100644
index 72e00e7022a..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.7.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# 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"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
-
-REQUIRED_USE="
- mapserver? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5,ssl]
- >=dev-db/spatialite-4.1.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- x11-libs/qscintilla:=[qt5]
- >=x11-libs/qwt-6.1.2:6=[qt5,svg]
- >=x11-libs/qwtpolar-1.1.1-r1[qt5]
- designer? ( dev-qt/designer:5 )
- 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/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[qt5,${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}
- dev-qt/qttest:5
- dev-qt/qtxmlpatterns:5
- 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=(
- "${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
- "${FILESDIR}/${PN}-2.18.6-python.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- 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-qt5.so
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DENABLE_QT5=ON
- -DENABLE_PYTHON3=$(python_is_python3)
- -DWITH_CUSTOM_WIDGETS=$(usex designer)
- -DWITH_GRASS=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_TOUCH="$(usex touch)"
- )
-# # FIXME: Re-add when segfaults were figured out upstream, bug #612070
-# -DWITH_QTWEBKIT=$(usex webkit)
-
- if has_version '<x11-libs/qscintilla-2.10'; then
- mycmakeargs+=(
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
- )
- fi
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DBINDINGS_GLOBAL_INSTALL=ON
- -DWITH_PYSPATIALITE=ON
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.18.9.ebuild b/sci-geosciences/qgis/qgis-2.18.9.ebuild
deleted file mode 100644
index 5464545389b..00000000000
--- a/sci-geosciences/qgis/qgis-2.18.9.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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"
-
-if [[ ${PV} != *9999 ]]; then
- SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
- KEYWORDS="~amd64 ~x86"
-else
- GIT_ECLASS="git-r3"
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
-
-REQUIRED_USE="
- mapserver? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- app-crypt/qca:2[qt5,ssl]
- >=dev-db/spatialite-4.1.0
- dev-db/sqlite:3
- dev-libs/expat
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtpositioning:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsvg:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- x11-libs/qscintilla:=[qt5]
- >=x11-libs/qwt-6.1.2:6=[qt5,svg]
- >=x11-libs/qwtpolar-1.1.1-r1[qt5]
- designer? ( dev-qt/designer:5 )
- 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/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[qt5,${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}
- dev-qt/qttest:5
- dev-qt/qtxmlpatterns:5
- 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=(
- "${FILESDIR}/${P}-broken-psycopg2-encoding.patch"
- "${FILESDIR}/${P}-fix-plugin-config-settings.patch"
- "${FILESDIR}/${P}-dbmanager-plugin-exceptions.patch"
- "${FILESDIR}/${P}-uncaught-exception.patch"
- # TODO upstream
- "${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
- "${FILESDIR}/${PN}-2.18.6-python.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- 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-qt5.so
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DENABLE_QT5=ON
- -DENABLE_PYTHON3=$(python_is_python3)
- -DWITH_CUSTOM_WIDGETS=$(usex designer)
- -DWITH_GRASS=$(usex grass)
- -DWITH_SERVER=$(usex mapserver)
- -DWITH_ORACLE=$(usex oracle)
- -DWITH_POSTGRESQL=$(usex postgres)
- -DWITH_BINDINGS=$(usex python)
- -DWITH_TOUCH="$(usex touch)"
- )
-# # FIXME: Re-add when segfaults were figured out upstream, bug #612070
-# -DWITH_QTWEBKIT=$(usex webkit)
-
- if has_version '<x11-libs/qscintilla-2.10'; then
- mycmakeargs+=(
- -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
- )
- fi
-
- if use grass; then
- mycmakeargs+=(
- -DWITH_GRASS7=ON
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- )
- fi
-
- if use python; then
- mycmakeargs+=(
- -DBINDINGS_GLOBAL_INSTALL=ON
- -DWITH_PYSPATIALITE=ON
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-06-04 10:25 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-06-04 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 7879a7c8176a4ca10e5597adc85cbdb21d776e63
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 09:13:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 10:25:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7879a7c8
sci-geosciences/qgis: 2.18.9 version bump
Package-Manager: Portage-2.3.5, Repoman-2.3.1
sci-geosciences/qgis/Manifest | 1 +
.../qgis-2.18.9-broken-psycopg2-encoding.patch | 32 +++
.../qgis-2.18.9-dbmanager-plugin-exceptions.patch | 89 ++++++++
.../qgis-2.18.9-fix-plugin-config-settings.patch | 23 +++
.../files/qgis-2.18.9-uncaught-exception.patch | 40 ++++
sci-geosciences/qgis/qgis-2.18.9.ebuild | 226 +++++++++++++++++++++
6 files changed, 411 insertions(+)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 30daa171447..11391f1e144 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
DIST qgis-2.18.7.tar.bz2 84928689 SHA256 ab05060e6b91909f61a21205ee12ddf79ebd85a7d7b81ab3b7dabfd032aa2e5b SHA512 e7908ebe8049d0ca2e99980ba8ac6e9b6941811c96d6139db87072315404987da0ec7272f77abacaddf5fb4bd540a0be7f64e44662fa32d2d4eb11b85421744d WHIRLPOOL 25320b1bacaeaf1486aa6a95b8df32e0a1b4713aedb5237f46e7aa538ef682b9cbd9eff70914727e426193fb0821df437e4732b118e71a4e12d90308cbbb066f
+DIST qgis-2.18.9.tar.bz2 84453524 SHA256 a922af0e4b3bcf8e790d7fc50752bc96771abfc2d093365cb3260b45c27225a1 SHA512 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4 WHIRLPOOL cfc6006eed3e948407eea79c57eb543be700d99ff0eb38e07263ec8659dee4ceafac8879dc95ac7b275efe44708d4a949d71dfd9800e8a9cb013527aabcea8e3
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch b/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
new file mode 100644
index 00000000000..b6eb1d17159
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.9-broken-psycopg2-encoding.patch
@@ -0,0 +1,32 @@
+From 2c8e03de391ac8a878d56e0a491c6a70b7a4c589 Mon Sep 17 00:00:00 2001
+From: Borys Jurgiel <info@borysjurgiel.pl>
+Date: Sat, 3 Jun 2017 16:54:54 +0200
+Subject: [PATCH] [PROCESSING] [regression] One more fix for broken encoding of
+ psycopg2 error messages
+
+---
+ python/plugins/processing/tools/postgis.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/python/plugins/processing/tools/postgis.py b/python/plugins/processing/tools/postgis.py
+index 69fab99b7f4..96c88f95f63 100644
+--- a/python/plugins/processing/tools/postgis.py
++++ b/python/plugins/processing/tools/postgis.py
+@@ -205,7 +205,7 @@ def __init__(self, host=None, port=None, dbname=None, user=None,
+ break
+ except psycopg2.OperationalError as e:
+ if i == 3:
+- raise DbError(unicode(e))
++ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'))
+
+ err = unicode(e)
+ user = self.uri.username()
+@@ -821,7 +821,7 @@ def _exec_sql(self, cursor, sql):
+ try:
+ cursor.execute(sql)
+ except psycopg2.Error as e:
+- raise DbError(unicode(e), e.cursor.query)
++ raise DbError(unicode(e.pgerror, e.cursor.connection.encoding, 'replace'), e.cursor.query)
+
+ def _exec_sql_and_commit(self, sql):
+ """Tries to execute and commit some action, on error it rolls
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch b/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
new file mode 100644
index 00000000000..0b780c22ca6
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.9-dbmanager-plugin-exceptions.patch
@@ -0,0 +1,89 @@
+From dae921c51f85f2dde2bab9b18a0d7c7c31bc700b Mon Sep 17 00:00:00 2001
+From: Luigi Pirelli <luipir@gmail.com>
+Date: Thu, 11 May 2017 17:40:32 +0200
+Subject: [PATCH] [DB Manager] previewing layers in Virtual layers section
+ remove them from the Layers panel: fixies #16476 plus more vlayer db_manager
+ plugin fixes to reduce (but can't avoid) exceptions due to C++/SIP object
+ removes
+
+---
+ python/plugins/db_manager/db_plugins/vlayers/connector.py | 10 ++++++++++
+ python/plugins/db_manager/layer_preview.py | 11 +++++++----
+ 2 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/python/plugins/db_manager/db_plugins/vlayers/connector.py b/python/plugins/db_manager/db_plugins/vlayers/connector.py
+index e64f2ec57b6..4c8cb4dca1b 100644
+--- a/python/plugins/db_manager/db_plugins/vlayers/connector.py
++++ b/python/plugins/db_manager/db_plugins/vlayers/connector.py
+@@ -96,6 +96,10 @@ def getLayer(self, l):
+ lid = self.layers.get(l)
+ if lid is None:
+ return lid
++ # the instance can refer to a layer in map previe and not in qgis general canvas
++ if lid not in QgsMapLayerRegistry.instance().mapLayers().keys():
++ self.layers.pop(l)
++ return None
+ return QgsMapLayerRegistry.instance().mapLayer(lid)
+
+
+@@ -246,12 +250,16 @@ def getRasterTables(self, schema=None):
+ def getTableRowCount(self, table):
+ t = table[1]
+ l = VLayerRegistry.instance().getLayer(t)
++ if not l or not l.isValid():
++ return None
+ return l.featureCount()
+
+ def getTableFields(self, table):
+ """ return list of columns in table """
+ t = table[1]
+ l = VLayerRegistry.instance().getLayer(t)
++ if not l or not l.isValid():
++ return []
+ # id, name, type, nonnull, default, pk
+ n = l.dataProvider().fields().size()
+ f = [(i, f.name(), f.typeName(), False, None, False)
+@@ -277,6 +285,8 @@ def getTableExtent(self, table, geom):
+ l = QgsMapLayerRegistry.instance().mapLayer(t)
+ else:
+ l = VLayerRegistry.instance().getLayer(t)
++ if not l or not l.isValid():
++ return None
+ e = l.extent()
+ r = (e.xMinimum(), e.yMinimum(), e.xMaximum(), e.yMaximum())
+ return r
+diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
+index 1f7cec65526..27bba0a8f13 100644
+--- a/python/plugins/db_manager/layer_preview.py
++++ b/python/plugins/db_manager/layer_preview.py
+@@ -25,7 +25,7 @@
+ from qgis.PyQt.QtWidgets import QApplication
+
+ from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
+-from qgis.core import QgsVectorLayer, QgsMapLayerRegistry
++from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
+
+ from .db_plugins.plugin import Table
+
+@@ -113,15 +113,18 @@ def _loadTablePreview(self, table, limit=False):
+ else:
+ vl = table.toMapLayer()
+
+- if not vl.isValid():
++ if vl and not vl.isValid():
+ vl.deleteLater()
+ vl = None
+
+ # remove old layer (if any) and set new
+ if self.currentLayer:
+- QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
++ # but not remove it if in layer list panel
++ # fix https://issues.qgis.org/issues/16476
++ if not QgsProject.instance().layerTreeRoot().findLayer(self.currentLayer.id()):
++ QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayer.id()])
+
+- if vl:
++ if vl and vl.isValid():
+ self.setLayerSet([QgsMapCanvasLayer(vl)])
+ QgsMapLayerRegistry.instance().addMapLayers([vl], False)
+ self.zoomToFullExtent()
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch b/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
new file mode 100644
index 00000000000..cbf03f146ca
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.9-fix-plugin-config-settings.patch
@@ -0,0 +1,23 @@
+From 008f38574e78f0557aae890f508cf5e148545d15 Mon Sep 17 00:00:00 2001
+From: "Juergen E. Fischer" <jef@norbit.de>
+Date: Wed, 31 May 2017 13:50:03 +0200
+Subject: [PATCH] processing: only reset existing menu 'settings' (followup
+ e78fc620)
+
+---
+ python/plugins/processing/gui/ConfigDialog.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/python/plugins/processing/gui/ConfigDialog.py b/python/plugins/processing/gui/ConfigDialog.py
+index 85d8641fb48..d2776b7dca0 100644
+--- a/python/plugins/processing/gui/ConfigDialog.py
++++ b/python/plugins/processing/gui/ConfigDialog.py
+@@ -256,6 +256,8 @@ def resetMenusToDefaults(self):
+ for provider in providers:
+ for alg in provider.algs:
+ d = defaultMenuEntries.get(alg.commandLineName(), "")
++ if "MENU_" + alg.commandLineName() not in ProcessingConfig.settings:
++ continue
+ setting = ProcessingConfig.settings["MENU_" + alg.commandLineName()]
+ item = self.items[setting]
+ item.setData(d, Qt.EditRole)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch b/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
new file mode 100644
index 00000000000..4785385458b
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.9-uncaught-exception.patch
@@ -0,0 +1,40 @@
+From ed03e99ee582cb4abd1ae08cf333da8c0975a4c8 Mon Sep 17 00:00:00 2001
+From: Luigi Pirelli <luipir@gmail.com>
+Date: Tue, 9 May 2017 13:39:23 +0200
+Subject: [PATCH] catch uncatched exception when item has lost reference.
+ fixies #15868
+
+---
+ python/plugins/db_manager/layer_preview.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/python/plugins/db_manager/layer_preview.py b/python/plugins/db_manager/layer_preview.py
+index 27bba0a8f13..9947b1ef4d8 100644
+--- a/python/plugins/db_manager/layer_preview.py
++++ b/python/plugins/db_manager/layer_preview.py
+@@ -25,7 +25,7 @@
+ from qgis.PyQt.QtWidgets import QApplication
+
+ from qgis.gui import QgsMapCanvas, QgsMapCanvasLayer, QgsMessageBar
+-from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject
++from qgis.core import QgsVectorLayer, QgsMapLayerRegistry, QgsProject, QgsMessageLog
+
+ from .db_plugins.plugin import Table
+
+@@ -78,11 +78,13 @@ def setDirty(self, val=True):
+ def _clear(self):
+ """ remove any layers from preview canvas """
+ if self.item is not None:
+- ## skip exception on RuntimeError fixes #6892
+ try:
+ self.item.aboutToChange.disconnect(self.setDirty)
+- except RuntimeError:
+- pass
++ ## skip exception on RuntimeError fixes #6892
++ ## skip TypeError and generic Exceptions fixes #15868
++ ## generally due the remove of self.item object or C++ referenced object
++ except Exception as ex:
++ QgsMessageLog.logMessage(unicode(ex))
+
+ self.item = None
+ self.dirty = False
diff --git a/sci-geosciences/qgis/qgis-2.18.9.ebuild b/sci-geosciences/qgis/qgis-2.18.9.ebuild
new file mode 100644
index 00000000000..5464545389b
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.9.ebuild
@@ -0,0 +1,226 @@
+# 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"
+
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+ KEYWORDS="~amd64 ~x86"
+else
+ GIT_ECLASS="git-r3"
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="designer examples georeferencer grass mapserver oracle postgres python touch"
+
+REQUIRED_USE="
+ mapserver? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5,ssl]
+ >=dev-db/spatialite-4.1.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtsvg:5
+ dev-qt/qtsql:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ sci-libs/proj
+ x11-libs/qscintilla:=[qt5]
+ >=x11-libs/qwt-6.1.2:6=[qt5,svg]
+ >=x11-libs/qwtpolar-1.1.1-r1[qt5]
+ designer? ( dev-qt/designer:5 )
+ 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/PyQt5[sql,svg,webkit,${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt5,${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}
+ dev-qt/qttest:5
+ dev-qt/qtxmlpatterns:5
+ 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=(
+ "${FILESDIR}/${P}-broken-psycopg2-encoding.patch"
+ "${FILESDIR}/${P}-fix-plugin-config-settings.patch"
+ "${FILESDIR}/${P}-dbmanager-plugin-exceptions.patch"
+ "${FILESDIR}/${P}-uncaught-exception.patch"
+ # TODO upstream
+ "${FILESDIR}/${PN}-2.18.6-featuresummary.patch"
+ "${FILESDIR}/${PN}-2.18.6-python.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ 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-qt5.so
+ -DWITH_INTERNAL_QWTPOLAR=OFF
+ -DPEDANTIC=OFF
+ -DWITH_APIDOC=OFF
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DENABLE_QT5=ON
+ -DENABLE_PYTHON3=$(python_is_python3)
+ -DWITH_CUSTOM_WIDGETS=$(usex designer)
+ -DWITH_GRASS=$(usex grass)
+ -DWITH_SERVER=$(usex mapserver)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_TOUCH="$(usex touch)"
+ )
+# # FIXME: Re-add when segfaults were figured out upstream, bug #612070
+# -DWITH_QTWEBKIT=$(usex webkit)
+
+ if has_version '<x11-libs/qscintilla-2.10'; then
+ mycmakeargs+=(
+ -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
+ )
+ fi
+
+ if use grass; then
+ mycmakeargs+=(
+ -DWITH_GRASS7=ON
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ -DBINDINGS_GLOBAL_INSTALL=ON
+ -DWITH_PYSPATIALITE=ON
+ -DWITH_INTERNAL_DATEUTIL=OFF
+ -DWITH_INTERNAL_FUTURE=OFF
+ -DWITH_INTERNAL_MARKUPSAFE=OFF
+ -DWITH_INTERNAL_PYTZ=OFF
+ -DWITH_INTERNAL_SIX=OFF
+ -DWITH_INTERNAL_YAML=OFF
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ domenu debian/qgis.desktop
+
+ local size type
+ for size in 16 22 24 32 48 64 96 128 256; do
+ newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+ newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+ for type in qgs qml qlr qpt; do
+ newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+ done
+ done
+ newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ python_optimize "${ED%/}"/usr/share/qgis/python
+
+ if use grass; then
+ python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-04-09 20:42 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-04-09 20:42 UTC (permalink / raw
To: gentoo-commits
commit: dde563923f3bbc453abe5469af32cb712bd677ce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 20:47:00 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 20:42:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde56392
sci-geosciences/qgis: 2.18.6 version bump, Qt5 build
Gentoo-bug: 607044
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sci-geosciences/qgis/Manifest | 1 +
.../qgis/files/qgis-2.18.6-featuresummary.patch | 31 +++
sci-geosciences/qgis/metadata.xml | 3 +-
sci-geosciences/qgis/qgis-2.18.6.ebuild | 223 +++++++++++++++++++++
4 files changed, 257 insertions(+), 1 deletion(-)
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index f8b2f462316..ae7609f86d8 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,4 @@
DIST qgis-2.18.3.tar.bz2 83508061 SHA256 743f4f22f8a17b1fd0ae575ed4da1d20ab1fe06561564d097b75c21fddf9b394 SHA512 6d2256cf85ebc1f1ddd3636f8a48284de95c42e3adb26e780b4847208c5ead80dd6a44c1a11d263bcc15bfbd7337d62d10b738ad8a7076382dbe4c4a011ff6fc WHIRLPOOL d342b3d0dd211c63f49e9b3292a585e6fd64d5837cd9bf4fe7bb53a9bd437220d7f5274b012d2732196bd5425388fa9a985fc5d342be5aee9e7fd0d008ca9c48
DIST qgis-2.18.4.tar.bz2 85419060 SHA256 737827fd4c63c859a0ea7badd36ebcba970ca7c0a8feda4b10c0de0ed52546e8 SHA512 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7 WHIRLPOOL 4dfb9a304c193de3f276871cafe3f0683764d5e7fdc5015e8f3d76c9f46072c01758e87097e0db69657b38da3f5908b41293319d909b5c69b5d23f98ba473b54
+DIST qgis-2.18.6.tar.bz2 84951747 SHA256 8cce11c255f82b29ddf64a84895f7411159de0fe69e85bb6b0767a0c675b8648 SHA512 0046a7b4b573e3ecef0ad006c8cf3d22cf3f6032b7a57c445d416f903d6aa063bd9f5459b22375fb99f5f7a027cda98b861300cb1399448aa2fd3567093ada76 WHIRLPOOL f20c948e44f57f5060319d6b2e46f6b568d5ddccfa6ec18e82c21720893fb2914dd3fb45601f75c791118fa3ffe9cd138e44155e80d0169d2dd09cc47afa9b40
DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch b/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch
new file mode 100644
index 00000000000..0d4c99de9de
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.6-featuresummary.patch
@@ -0,0 +1,31 @@
+From 70505aa1569c541dd252115848f46f91811955c0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 9 Apr 2017 20:21:28 +0200
+Subject: [PATCH 1/2] Use FeatureSummary
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed0a84013a..26f4659f61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ SET(CMAKE_COLOR_MAKEFILE ON)
+ # set path to additional CMake modules
+ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+
++include(FeatureSummary)
++
+ # in generated makefiles use relative paths so the project dir is moveable
+ # Note commented out since it cause problems but it would be nice to resolve these and enable
+ #
+@@ -908,3 +910,5 @@ ENDIF(WIN32 AND NOT UNIX)
+ SET(CPACK_PACKAGE_EXECUTABLES "qgis" "QGIS")
+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
+ INCLUDE(CPack)
++
++FEATURE_SUMMARY(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.12.2
+
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index fc606b878cf..e3b55abad7c 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -14,8 +14,9 @@
tracks from your GPS.
</longdescription>
<use>
+ <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
<flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
<flag name="mapserver">Determines whether mapserver should be built</flag>
- <flag name="georeferencer">Determines whether georeferencer plugin should be built</flag>
+ <flag name="touch">Enable support for touch input devices</flag>
</use>
</pkgmetadata>
diff --git a/sci-geosciences/qgis/qgis-2.18.6.ebuild b/sci-geosciences/qgis/qgis-2.18.6.ebuild
new file mode 100644
index 00000000000..42c6a19e4aa
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.6.ebuild
@@ -0,0 +1,223 @@
+# 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"
+
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+ KEYWORDS="~amd64 ~x86"
+else
+ GIT_ECLASS="git-r3"
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils fdo-mime ${GIT_ECLASS} gnome2-utils python-single-r1
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="examples georeferencer grass mapserver oracle postgres python touch webkit"
+
+REQUIRED_USE="
+ grass? ( python )
+ mapserver? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5,ssl]
+ >=dev-db/spatialite-4.1.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ sci-libs/gdal:=[geos,python?,${PYTHON_USEDEP}]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ sci-libs/proj
+ x11-libs/qscintilla:=[qt5]
+ >=x11-libs/qwt-6.1.2:6=[qt5,svg]
+ >=x11-libs/qwtpolar-1.1.1-r1[qt5]
+ 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/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/qscintilla-python[qt5,${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ )
+ webkit? ( dev-qt/qtwebkit:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/qttest:5
+ 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=( "${FILESDIR}/${P}-featuresummary.patch" )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ 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-qt5.so
+ -DWITH_INTERNAL_QWTPOLAR=OFF
+ -DPEDANTIC=OFF
+ -DWITH_APIDOC=OFF
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DENABLE_QT5=ON
+ -DWITH_GRASS=$(usex grass)
+ -DWITH_SERVER=$(usex mapserver)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_TOUCH="$(usex touch)"
+ -DWITH_QTWEBKIT=$(usex webkit)
+ )
+
+ if has_version '>=x11-misc/qscintilla-2.10'; then
+ mycmakeargs+=(
+ -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2-qt5.so
+ )
+ else
+ mycmakeargs+=(
+ -DQSCINTILLA_LIBRARY=/usr/$(get_libdir)/libqscintilla2.so
+ )
+ fi
+
+ if use grass; then
+ mycmakeargs+=(
+ -DWITH_GRASS7=ON
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ -DENABLE_PYTHON3=OFF
+ -DWITH_PYSPATIALITE=ON
+ -DWITH_INTERNAL_DATEUTIL=OFF
+ -DWITH_INTERNAL_FUTURE=OFF
+ -DWITH_INTERNAL_HTTPLIB2=OFF
+ -DWITH_INTERNAL_JINJA2=OFF
+ -DWITH_INTERNAL_MARKUPSAFE=OFF
+ -DWITH_INTERNAL_PYGMENTS=OFF
+ -DWITH_INTERNAL_PYTZ=OFF
+ -DWITH_INTERNAL_SIX=OFF
+ -DWITH_INTERNAL_YAML=OFF
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ domenu debian/qgis.desktop
+
+ local size type
+ for size in 16 22 24 32 48 64 96 128 256; do
+ newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+ newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+ for type in qgs qml qlr qpt; do
+ newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+ done
+ done
+ newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use python; then
+ python_optimize "${ED%/}"/usr/share/qgis/python
+
+ if use grass; then
+ python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+ fi
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-02-19 22:01 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-02-19 22:01 UTC (permalink / raw
To: gentoo-commits
commit: f048632b4a4ddc7a8b83f3bd5c918bbf5bfd854a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 21:53:54 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 21:54:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f048632b
sci-geosciences/qgis: Fix build with sip-4.19
Package-Manager: portage-2.3.3
.../qgis/files/qgis-2.18.3-sip-4.19.patch | 237 +++++++++++++++++++++
sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 3 +-
2 files changed, 239 insertions(+), 1 deletion(-)
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
new file mode 100644
index 0000000000..f72e0e4fd1
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.patch
@@ -0,0 +1,237 @@
+commit 718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb
+Author: Juergen E. Fischer <jef@norbit.de>
+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<TYPE>
+
+ // QMap<qint64, TYPE> is implemented as a Python dictionary.
+ template<TYPE>
+-%MappedType QMap<qint64, TYPE> /DocType="dict-of-qint64-TYPE"/
++%MappedType QMap<qint64, TYPE>
+ {
+ %TypeHeaderCode
+ #include <qmap.h>
+@@ -1873,7 +1873,7 @@ template <TYPE>
+ };
+
+ // QList<QgsField> is implemented as a Python list of QgsField.
+-%MappedType QList<QgsField> /DocType="list-of-qgsfield"/
++%MappedType QList<QgsField>
+ {
+ %TypeHeaderCode
+ #include <qgsfield.h>
+@@ -1978,7 +1978,7 @@ template <TYPE>
+
+ %If (QVECTORINT_CONVERSION)
+ // QVector<int> is implemented as a Python list of integers.
+-%MappedType QVector<int> /DocType="list-of-int"/
++%MappedType QVector<int>
+ {
+ %TypeHeaderCode
+ #include <qvector.h>
+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 <qgscoordinatetransform.h>
+ %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<int, QVariant> QgsAttributeMap;
+ typedef QVector<QVariant> QgsAttributes;
+
+ // QgsAttributes is implemented as a Python list of Python objects.
+-%MappedType QgsAttributes /DocType="list-of-attributes"/
++%MappedType QgsAttributes
+ {
+ %TypeHeaderCode
+ #include <qgsfeature.h>
+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<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> is implemented as a Python dictionary.
+-%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined*"/
++%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*>
+ {
+ %TypeHeaderCode
+ #include <qmap.h>
+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/qgis-2.18.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
index 974963537f..b1ca1df025 100644
--- a/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
@@ -61,7 +61,7 @@ COMMON_DEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
- <dev-python/sip-4.19:=[${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
)
@@ -81,6 +81,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${P}-app-icon.patch
"${FILESDIR}"/${P}-webkit.patch
+ "${FILESDIR}"/${P}-sip-4.19.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-02-19 14:55 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-02-19 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 46729cd305c67a09c77066c6bf0caa12e39ca522
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 12:21:05 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 14:45:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46729cd3
sci-geosciences/qgis: Fix QtWebKit automagic
Cleanup DEPENDs and src_configure.
Gentoo-bug: 609148
Reported-by: Luis Ressel <aranea <AT> aixah.de>
Package-Manager: portage-2.3.3
.../qgis/files/qgis-2.18.3-webkit.patch | 112 ++++++++++++
sci-geosciences/qgis/qgis-2.18.3-r1.ebuild | 190 +++++++++++++++++++++
2 files changed, 302 insertions(+)
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch b/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch
new file mode 100644
index 0000000000..971ffde83a
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-2.18.3-webkit.patch
@@ -0,0 +1,112 @@
+commit 222ae663e6ee6f718e45faafd63758c319fec135
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+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.3-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
new file mode 100644
index 0000000000..974963537f
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-2.18.3-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit cmake-utils eutils fdo-mime gnome2-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="
+ http://qgis.org/downloads/qgis-${PV}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
+
+REQUIRED_USE="
+ grass? ( python )
+ 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,oracle?,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:= )
+ 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,webkit?,${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-4.19:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ )
+ webkit? ( dev-qt/qtwebkit:4 )
+"
+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=(
+ "${FILESDIR}"/${P}-app-icon.patch
+ "${FILESDIR}"/${P}-webkit.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ 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_DATEUTIL=OFF
+ -DWITH_INTERNAL_FUTURE=OFF
+ -DWITH_INTERNAL_HTTPLIB2=OFF
+ -DWITH_INTERNAL_JINJA2=OFF
+ -DWITH_INTERNAL_MARKUPSAFE=OFF
+ -DWITH_INTERNAL_PYGMENTS=OFF
+ -DWITH_INTERNAL_PYTZ=OFF
+ -DWITH_INTERNAL_QWTPOLAR=OFF
+ -DWITH_INTERNAL_SIX=OFF
+ -DWITH_INTERNAL_YAML=OFF
+ -DPEDANTIC=OFF
+ -DWITH_APIDOC=OFF
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DWITH_BINDINGS="$(usex python)"
+ -DWITH_GRASS7="$(usex grass)"
+ -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+ -DWITH_ORACLE="$(usex oracle)"
+ -DWITH_POSTGRESQL="$(usex postgres)"
+ -DWITH_PYSPATIALITE="$(usex python)"
+ -DWITH_SERVER="$(usex mapserver)"
+ -DWITH_QTWEBKIT="$(usex webkit)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ domenu debian/qgis.desktop
+
+ local size type
+ for size in 16 22 24 32 48 64 96 128 256; do
+ newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
+ newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+ for type in qgs qml qlr qpt; do
+ newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+ done
+ done
+ newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use python; then
+ python_optimize "${ED%/}"/usr/share/qgis/python
+
+ if use grass; then
+ python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
+ fi
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
^ permalink raw reply related [flat|nested] 21+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/
@ 2017-02-19 14:55 Andreas Sturmlechner
0 siblings, 0 replies; 21+ messages in thread
From: Andreas Sturmlechner @ 2017-02-19 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 9cafc514db126ff0c9cfdd044e6eccaa8088292e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 12:23:45 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 14:45:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cafc514
sci-geosciences/qgis: Drop old
Package-Manager: portage-2.3.3
.../qgis/files/qgis-2.12.0-no-pyqtconfig.patch | 23 ---
sci-geosciences/qgis/qgis-2.18.2-r1.ebuild | 178 -------------------
sci-geosciences/qgis/qgis-2.18.2-r2.ebuild | 181 -------------------
sci-geosciences/qgis/qgis-2.18.3.ebuild | 197 ---------------------
4 files changed, 579 deletions(-)
diff --git a/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch
deleted file mode 100644
index 24fe7bff6c..0000000000
--- a/sci-geosciences/qgis/files/qgis-2.12.0-no-pyqtconfig.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur qgis-2.12.0.orig/python/console/console.py qgis-2.12.0/python/console/console.py
---- qgis-2.12.0.orig/python/console/console.py
-+++ qgis-2.12.0/python/console/console.py
-@@ -25,7 +25,6 @@
- QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, \
- QDesktopServices
- from PyQt4.QtGui import QVBoxLayout
--from PyQt4 import pyqtconfig
- from qgis.utils import iface
- from console_sci import ShellScintilla
- from console_output import ShellOutputScintilla
-@@ -482,10 +481,7 @@
- self.lineEditFind = QgsFilterLineEdit()
- placeHolderTxt = QCoreApplication.translate("PythonConsole", "Enter text to find...")
-
-- if pyqtconfig.Configuration().qt_version >= 0x40700:
-- self.lineEditFind.setPlaceholderText(placeHolderTxt)
-- else:
-- self.lineEditFind.setToolTip(placeHolderTxt)
-+ self.lineEditFind.setPlaceholderText(placeHolderTxt)
- self.findNextButton = QToolButton()
- self.findNextButton.setEnabled(False)
- toolTipfindNext = QCoreApplication.translate("PythonConsole", "Find Next")
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
deleted file mode 100644
index 1add6e5a97..0000000000
--- a/sci-geosciences/qgis/qgis-2.18.2-r1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
- http://qgis.org/downloads/qgis-${PV}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- mapserver? ( python )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/expat
- sci-geosciences/gpsbabel
- >=sci-libs/gdal-1.6.1:=[geos,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- 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
- dev-qt/qtwebkit:4
- x11-libs/qscintilla:=[qt4(-)]
- || (
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
- ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
- )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
- mapserver? ( dev-libs/fcgi )
- oracle? ( dev-db/oracle-instantclient:= )
- postgres? ( dev-db/postgresql:= )
- python? (
- dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ${PYTHON_DEPS}
- )
- dev-db/sqlite:3
- >=dev-db/spatialite-4.1.0
- app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-DOCS=( BUGS ChangeLog NEWS )
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- 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
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_HTTPLIB2=OFF
- -DWITH_INTERNAL_JINJA2=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYGMENTS=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_BINDINGS="$(usex python)"
- -DWITH_GRASS7="$(usex grass)"
- $(usex grass "-DGRASS_PREFIX=/usr/" "")
- -DWITH_ORACLE="$(usex oracle)"
- -DWITH_POSTGRESQL="$(usex postgres)"
- -DWITH_PYSPATIALITE="$(usex python)"
- -DWITH_SERVER="$(usex mapserver)"
- )
-
- if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
- elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
- if has_version '>=x11-libs/qwt-6.1.2' ; then
- mycmakeargs+=(
- "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
- "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
- )
- else
- mycmakeargs+=(
- "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
- "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
- )
- fi
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon -s 128 images/icons/qgis-icon.png qgis.png
- make_desktop_entry qgis "QGIS" qgis
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${WORKDIR}"/qgis_sample_data/*
- fi
-
- python_optimize "${D}"/usr/share/qgis/python \
- "${D}"/$(python_get_sitedir)/qgis \
- "${D}"/$(python_get_sitedir)/pyspatialite
-
- if use grass; then
- python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
- python_optimize "${D}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild b/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
deleted file mode 100644
index f85044f398..0000000000
--- a/sci-geosciences/qgis/qgis-2.18.2-r2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils gnome2-utils cmake-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
- http://qgis.org/downloads/qgis-${PV}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- mapserver? ( python )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/expat
- sci-geosciences/gpsbabel
- >=sci-libs/gdal-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- 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
- dev-qt/qtwebkit:4
- x11-libs/qscintilla:=[qt4(-)]
- || (
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
- ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
- )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( || ( >=sci-geosciences/grass-7.0.0:= ) )
- mapserver? ( dev-libs/fcgi )
- oracle? ( dev-db/oracle-instantclient:= )
- postgres? ( dev-db/postgresql:= )
- python? (
- dev-python/PyQt4[X,sql,svg,webkit,${PYTHON_USEDEP}]
- <dev-python/sip-4.19:=[${PYTHON_USEDEP}]
- dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/httplib2[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markupsafe[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- ${PYTHON_DEPS}
- )
- dev-db/sqlite:3
- >=dev-db/spatialite-4.1.0
- app-crypt/qca:2[qt4,ssl]
-"
-
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex"
-
-DOCS=( BUGS ChangeLog NEWS )
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- 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
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_HTTPLIB2=OFF
- -DWITH_INTERNAL_JINJA2=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYGMENTS=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_BINDINGS="$(usex python)"
- -DWITH_GRASS7="$(usex grass)"
- $(usex grass "-DGRASS_PREFIX=/usr/" "")
- -DWITH_ORACLE="$(usex oracle)"
- -DWITH_POSTGRESQL="$(usex postgres)"
- -DWITH_PYSPATIALITE="$(usex python)"
- -DWITH_SERVER="$(usex mapserver)"
- )
-
- if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
- elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
- if has_version '>=x11-libs/qwt-6.1.2' ; then
- mycmakeargs+=(
- "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
- "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so"
- )
- else
- mycmakeargs+=(
- "-DQWT_INCLUDE_DIR=/usr/include/qwt6"
- "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so"
- )
- fi
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon -s 16 images/icons/qgis-icon-16x16.png qgis.png
- newicon -s 512 images/icons/qgis-icon.png qgis.png
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
- make_desktop_entry qgis "QGIS" qgis
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins -r "${WORKDIR}"/qgis_sample_data/*
- fi
-
- python_optimize "${D}"/usr/share/qgis/python \
- "${D}"/$(python_get_sitedir)/qgis \
- "${D}"/$(python_get_sitedir)/pyspatialite
-
- if use grass; then
- python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
- python_optimize "${D}"/usr/share/qgis/grass/scripts
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/qgis/qgis-2.18.3.ebuild b/sci-geosciences/qgis/qgis-2.18.3.ebuild
deleted file mode 100644
index 051afe8115..0000000000
--- a/sci-geosciences/qgis/qgis-2.18.3.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit cmake-utils eutils fdo-mime gnome2-utils python-single-r1
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="http://www.qgis.org/"
-SRC_URI="
- http://qgis.org/downloads/qgis-${PV}.tar.bz2
- examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples georeferencer grass mapserver oracle postgres python webkit"
-
-REQUIRED_USE="
- grass? ( python )
- 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-1.6.1:=[geos,oracle?,python?,${PYTHON_USEDEP}]
- sci-libs/geos
- sci-libs/libspatialindex:=
- sci-libs/proj
- x11-libs/qscintilla:=[qt4(-)]
- || (
- ( || ( <x11-libs/qwt-6.1.2:6[svg] >=x11-libs/qwt-6.1.2:6[svg,qt4] ) >=x11-libs/qwtpolar-1[qt4(+)] )
- ( x11-libs/qwt:5[svg] <x11-libs/qwtpolar-1 )
- )
- georeferencer? ( sci-libs/gsl:= )
- grass? ( >=sci-geosciences/grass-7.0.0:= )
- mapserver? ( dev-libs/fcgi )
- oracle? ( dev-db/oracle-instantclient:= )
- 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,webkit?,${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-4.19:=[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- )
- webkit? ( dev-qt/qtwebkit:4 )
-"
-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=( "${FILESDIR}"/${P}-app-icon.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- 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
- -DWITH_INTERNAL_DATEUTIL=OFF
- -DWITH_INTERNAL_FUTURE=OFF
- -DWITH_INTERNAL_HTTPLIB2=OFF
- -DWITH_INTERNAL_JINJA2=OFF
- -DWITH_INTERNAL_MARKUPSAFE=OFF
- -DWITH_INTERNAL_PYGMENTS=OFF
- -DWITH_INTERNAL_PYTZ=OFF
- -DWITH_INTERNAL_QWTPOLAR=OFF
- -DWITH_INTERNAL_SIX=OFF
- -DWITH_INTERNAL_YAML=OFF
- -DPEDANTIC=OFF
- -DWITH_APIDOC=OFF
- -DWITH_QSPATIALITE=ON
- -DENABLE_TESTS=OFF
- -DWITH_BINDINGS="$(usex python)"
- -DWITH_GRASS7="$(usex grass)"
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
- -DWITH_ORACLE="$(usex oracle)"
- -DWITH_POSTGRESQL="$(usex postgres)"
- -DWITH_PYSPATIALITE="$(usex python)"
- -DWITH_SERVER="$(usex mapserver)"
- -DWITH_QTWEBKIT="$(usex webkit)"
- )
-
- if has_version '>=x11-libs/qwtpolar-1' && has_version 'x11-libs/qwt:5' ; then
- elog "Both >=x11-libs/qwtpolar-1 and x11-libs/qwt:5 installed. Force build with qwt6"
- mycmakeargs+=( "-DQWT_INCLUDE_DIR=/usr/include/qwt6" )
- if has_version '>=x11-libs/qwt-6.1.2' ; then
- mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt4.so" )
- else
- mycmakeargs+=( "-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6.so" )
- fi
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu debian/qgis.desktop
-
- local size type
- for size in 16 22 24 32 48 64 96 128 256; do
- newicon -s ${size} debian/${PN}-icon${size}x${size}.png ${PN}.png
- newicon -c mimetypes -s ${size} debian/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
- for type in qgs qml qlr qpt; do
- newicon -c mimetypes -s ${size} debian/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
- done
- done
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
- insinto /usr/share/mime/packages
- doins debian/qgis.xml
-
- if use examples; then
- docinto examples
- dodoc -r "${WORKDIR}"/qgis_sample_data/.
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- if use python; then
- python_optimize "${ED%/}"/usr/share/qgis/python
-
- if use grass; then
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts
- fi
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- if use postgres; then
- elog "If you don't intend to use an external PostGIS server"
- elog "you should install:"
- elog " dev-db/postgis"
- elif use python; then
- elog "Support of PostgreSQL is disabled."
- elog "But some installed python-plugins import the psycopg2 module."
- elog "If you do not need these plugins just disable them"
- elog "in the Plugins menu, else you need to set USE=\"postgres\""
- fi
-
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- fdo-mime_mime_database_update
- fdo-mime_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2024-11-08 13:31 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-26 19:19 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/, sci-geosciences/qgis/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 13:31 Andreas Sturmlechner
2023-08-23 7:55 Andreas Sturmlechner
2020-12-22 22:54 Andreas Sturmlechner
2020-11-23 22:10 Andreas Sturmlechner
2020-11-20 20:40 Andreas Sturmlechner
2020-10-23 23:27 Andreas Sturmlechner
2020-02-09 17:41 Andreas Sturmlechner
2019-11-20 17:46 Andreas Sturmlechner
2019-04-28 15:27 Andreas Sturmlechner
2018-06-24 13:18 Andreas Sturmlechner
[not found] <1523569335.91435c00d97ec375328fdc6b56d03fb98e0b4adc.asturm@gentoo>
2018-04-12 21:42 ` Andreas Sturmlechner
2018-03-28 21:46 Andreas Sturmlechner
2018-03-05 6:06 Andreas Sturmlechner
2017-12-21 2:38 Andreas Sturmlechner
2017-07-01 15:56 Andreas Sturmlechner
2017-06-04 10:25 Andreas Sturmlechner
2017-04-09 20:42 Andreas Sturmlechner
2017-02-19 22:01 Andreas Sturmlechner
2017-02-19 14:55 Andreas Sturmlechner
2017-02-19 14:55 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox