diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2020-05-09 10:18:51 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-05-09 10:18:51 +0200 |
commit | afd35d48cef2832a1e5db5169d3d0d84d1345a62 (patch) | |
tree | e4e8b2bbc796f97a60c8a21b947c14dcc072755d /dev-qt/qtprintsupport | |
parent | net-misc/httpie: x86 stable wrt bug #721524 (diff) | |
download | gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.gz gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.tar.bz2 gentoo-afd35d48cef2832a1e5db5169d3d0d84d1345a62.zip |
dev-qt: Drop Qt 5.13.2
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtprintsupport')
-rw-r--r-- | dev-qt/qtprintsupport/Manifest | 1 | ||||
-rw-r--r-- | dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch | 49 | ||||
-rw-r--r-- | dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild | 44 |
3 files changed, 0 insertions, 94 deletions
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest index a037cabd5640..62cc41e4432c 100644 --- a/dev-qt/qtprintsupport/Manifest +++ b/dev-qt/qtprintsupport/Manifest @@ -1,3 +1,2 @@ -DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9 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 deleted file mode 100644 index fe19baf4096b..000000000000 --- a/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch +++ /dev/null @@ -1,49 +0,0 @@ -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-r2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild deleted file mode 100644 index 5c0100d98132..000000000000 --- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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="arm" -fi - -IUSE="cups gles2-only" - -RDEPEND=" - ~dev-qt/qtcore-${PV} - ~dev-qt/qtgui-${PV}[gles2-only=] - ~dev-qt/qtwidgets-${PV}[gles2-only=] - 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-only es2 desktop) - ) - qt5-build_src_configure -} |