gentoo resync : 15.01.2020

5 files changed, 144 insertions, 3 deletions

diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index bcda2d168413..ead149083f29 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,7 +1,11 @@
+AUX qtprintsupport-5.13.2-no-cups.patch 2196 BLAKE2B c84c6db10bc05a349d910c3c74519b33a9e00cc616def388a2f77f62099215368a6d1715f8997ef9d9231e594c05122ec8c5ca5db0b59caff4c6d0946d01f8bd SHA512 7fb16775627a484c4c9c6cc184f3c73d898c6f3600fb5769623f311f504dc8723713815acb99be6d11026ae3a067a7587a94b282bed95e8747e47798a7efb977
 DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 BLAKE2B 779c43a75403e0f21357a90228bbcc3f216495613f4f17a2f442c7aa93f277a79cc7addf5ae44e22964069580f4932cfd14ba4773aa0ab30405d5587577a545c SHA512 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
 DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 BLAKE2B db394becd1c0c2be9f86658f58dbadb5e3b81af82edf2e8b69652a8587a2aa30f481774fa20d55ce7e8b9cc158dedd343dc3964e4ff0bcf111e8c4feceb27e0a SHA512 9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660
 DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
+DIST qtbase-everywhere-src-5.14.0.tar.xz 49713412 BLAKE2B b59a98b12ade13ef27a055010f45621606692e7c071039cedfa20a667fdbffc74e2ba7b412b93eebc7bc748a418750045810215335972190fc5ad69947d5494c SHA512 27e640643aa2a15fece96b1a83f8f6fbfbc8a83e224f6dea4d7e6a94c8069a2b18a55ddc76943b10b40ccc95168a48dcfdf46264fdfc24b3594d1c6ea160aff6
 EBUILD qtprintsupport-5.12.3.ebuild 759 BLAKE2B b6063f8c4e857d463024cb349960079f0c67e2b7fb869fc1c06a286588cd711b6d692c242700e322dae339a5eb190f865fd77d7854b7f0923707c7fc10671e45 SHA512 5c2476ac5fc7598fcfad5e4d513871157b50750f8cdef455f5948b6264b036945b6632ee4cdee9e840a4f0a771ca2d67d561d65d24d7744de2b70014ffd24d85
 EBUILD qtprintsupport-5.12.5.ebuild 762 BLAKE2B 165e431db2093f347d879aad79363cbeb96978a28e0ede739b7d9970f808c349e9fb65f2928ca30aba2d0e52231dfd60082cd3e4bb8cafc04195675e687db02d SHA512 8191ad340f26195893cb1e9978aedb3787fb81708f67d7e53755b2d5c03786ef0f9935e50605fabfc150dd96a71052a79d8d6c0700780b59528b28a139bc5ec1
-EBUILD qtprintsupport-5.13.2.ebuild 765 BLAKE2B 863f1f2292c97e0c7b678b16ca7870292d9517239c90e0f37d3c6e4f1cc79bcfbea10ba11bf0632b6f0261dfd5b9cccbf37c06987d224107446c453e2369d939 SHA512 bc8b1d68fc73b70fce390e83ad403d4ac2eaab76eb1a58ad9db0c50656d0e1079cb6c5d753ff26824d6087112ff12fbd5805554fc023fda063599925783e5af0
+EBUILD qtprintsupport-5.13.2-r1.ebuild 838 BLAKE2B cb4807c94131c985f075f0ba77de7174c6e686e9f65b9099d42c6f72e6b2b3ec86514f574eb95a1009ca6723a78ddba94be9a02441ff63ae16cff5c5635865f4 SHA512 548e0361d8ce28b334fbede0457dc80f2cc4cd63bea29e4a129fd23bf1938c3745c41d1d4b0468cfe16cd0f6bdd305ce6501e771b1712b6fb4d6ff647a32ef78
+EBUILD qtprintsupport-5.13.2.ebuild 761 BLAKE2B 6423f7e8124bd8391c9c15f5f37fd0b65fe47aecaec362dbd91d74b6d2909b8bfbeb361c66a043a866b6629af67e62cb0cb406c0f74f9de04afa8dde069ed398 SHA512 eaea2dd2bbb578971229091aadd66c27afbd1dbde99d36a15dba3a1c07109c91584bdae1ef800d1b3589d58e3bc8855b35e5bc549e5cb20a9a9c96ea0e03f5da
+EBUILD qtprintsupport-5.14.0-r1.ebuild 846 BLAKE2B dcd1bb75178ada15ea9a936b22b3a6b8b561ccc65becbfbd02e74100c8752d56e15add4187f9cf8adf2efc8b54c040efe251ad1102d45eae8a34c18fa4c42332 SHA512 b291130d54cc73d305ed97000056e72d7bc6a58755d2568faee814fa340d3ce05210cfe6e5abed0d6a19155d46e4fcd8a13431e84d9419e7414d9865d1dc5ed9
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch b/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch
new file mode 100644
index 000000000000..fe19baf4096b
--- /dev/null
+++ b/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch
@@ -0,0 +1,49 @@
+From 2ad3348031d8a622374920eac5bdd8fb9ecefcd7 Mon Sep 17 00:00:00 2001
+From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
+Date: Sat, 21 Dec 2019 19:57:45 +0100
+Subject: QPrintDialog: don't access dangling pointer when cups is disabled
+
+When no cups support is available, ui.pagesRadioButton is destroyed in
+QPrintDialogPrivate::init() but was accessed later on. Fix it by moving
+the cups check one line above.
+
+Fixes: QTBUG-80945
+Change-Id: Ieb062b39e1461f39665ef612dfea1d7757274b7e
+Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
+---
+ src/printsupport/dialogs/qprintdialog_unix.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
+index c7328d9732..7bbf137977 100644
+--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
++++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
+@@ -637,8 +637,10 @@ void QPrintDialogPrivate::init()
+     options.pageSetCombo->addItem(tr("Odd Pages"), QVariant::fromValue(QCUPSSupport::OddPages));
+     options.pageSetCombo->addItem(tr("Even Pages"), QVariant::fromValue(QCUPSSupport::EvenPages));
+ #else
+-    for (int i = options.pagesLayout->count() - 1; i >= 0; --i)
+-        delete options.pagesLayout->itemAt(i)->widget();
++    delete options.pagesRadioButton;
++    delete options.pagesLineEdit;
++    options.pagesRadioButton = nullptr;
++    options.pagesLineEdit = nullptr;
+ #endif
+ 
+     top->d->setOptionsPane(this);
+@@ -727,12 +729,12 @@ void QPrintDialogPrivate::selectPrinter(const QPrinter::OutputFormat outputForma
+         else
+             options.pageSetCombo->setEnabled(true);
+ 
++#if QT_CONFIG(cups)
+         // Disable complex page ranges widget when printing to pdf
+         // It doesn't work since it relies on cups to do the heavy lifting and cups
+         // is not used when printing to PDF
+         options.pagesRadioButton->setEnabled(outputFormat != QPrinter::PdfFormat);
+ 
+-#if QT_CONFIG(cups)
+         // Disable color options on main dialog if not printing to file, it will be handled by CUPS advanced dialog
+         options.colorMode->setVisible(outputFormat == QPrinter::PdfFormat);
+ #endif
+-- 
+cgit v1.2.1
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild
new file mode 100644
index 000000000000..7ce0cf6ddbd5
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="cups gles2"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+PATCHES=( "${FILESDIR}/${P}-no-cups.patch" ) # bug #704936, QTBUG-80945
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
index 606441d104f9..42ff7bd6b26f 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.14.0-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.0-r1.ebuild
new file mode 100644
index 000000000000..b9cb036a03bd
--- /dev/null
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.14.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+QT5_MODULE="qtbase"
+VIRTUALX_REQUIRED="test"
+inherit qt5-build
+
+DESCRIPTION="Printing support library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+IUSE="cups gles2"
+
+RDEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
+	cups? ( >=net-print/cups-1.4 )
+"
+DEPEND="${RDEPEND}
+	test? ( ~dev-qt/qtnetwork-${PV} )
+"
+
+QT5_TARGET_SUBDIRS=(
+	src/printsupport
+	src/plugins/printsupport
+)
+
+QT5_GENTOO_CONFIG=(
+	cups
+)
+
+PATCHES=( "${FILESDIR}/${PN}-5.13.2-no-cups.patch" ) # bug #704936, QTBUG-80945
+
+src_configure() {
+	local myconf=(
+		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
+	)
+	qt5-build_src_configure
+}