From f625b9919a60a30f1bd860f7d1b2eac183ced593 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 8 Aug 2018 20:11:47 +0100 Subject: gentoo resync : 08.08.2018 --- dev-qt/qtgui/Manifest | 8 +- dev-qt/qtgui/files/qtgui-4.7.3-cups.patch | 84 ----------- .../qtgui-4.8.5-disable-gtk-theme-check.patch | 22 --- .../qtgui/files/qtgui-4.8.5-qclipboard-delay.patch | 33 ----- dev-qt/qtgui/metadata.xml | 9 -- dev-qt/qtgui/qtgui-4.8.7.ebuild | 162 --------------------- 6 files changed, 1 insertion(+), 317 deletions(-) delete mode 100644 dev-qt/qtgui/files/qtgui-4.7.3-cups.patch delete mode 100644 dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch delete mode 100644 dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch delete mode 100644 dev-qt/qtgui/qtgui-4.8.7.ebuild (limited to 'dev-qt/qtgui') diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 7b501186e9f9..f4f63c3a81f7 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,16 +1,10 @@ -AUX qtgui-4.7.3-cups.patch 3297 BLAKE2B 45c8668ffca24a7cfe9e02ec3fb3839f436470d55fb6f03a6a5890c7598bd3ec62c0bc62ecfd87ec530c210ef1c8e4d684c72109897ffe82456aa4225ce2b6ed SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee -AUX qtgui-4.8.5-disable-gtk-theme-check.patch 1166 BLAKE2B 638fa282166a5ede48ff2b91532decab28969b392ae75c49860329e30018283f5206a367216027880e914e9a7ff4e16275fd364e8e99e52bacf460ecf6a637bb SHA512 c0f8b0c5bfb83552edc92af94669b15c85171aef72418dfa37a237f34b49e3999c939afed8b6c90391104c9ea305152ea85b0b0ad0e2400f5c64d6301a2c8d14 -AUX qtgui-4.8.5-qclipboard-delay.patch 1135 BLAKE2B 5972ab258ba5c60346f83a0c402edd39ea3c1fa777c59c6691e793d300956f1d966f37f6f35c187c95074872f8ccfb4b4cac8b255da462ddd3744cc67bc21108 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517 AUX qtgui-5.9.4-libinput-pixeldelta.patch 3597 BLAKE2B 88f54e4c832f132472aea296e8bcc4cf318456af48db3e260eed30b620acf98af0cfa2abd6d396a1396be678e133f5721cccbc79877d4f8934606aba6a0d6d39 SHA512 47aa0fb3971cd956d08fac4ace0b98b4034178d00c89db3fe31060d548acb8a075621dc2fb43ef0357dee79a927f82a7626e6cdf784b009028ae1435f68176d4 AUX qtgui-5.9.4-opengl.patch 3586 BLAKE2B 56e5192b0455c8d6ccd307466fe9583c7ac8f3a6114bc3bfed62dad36aa7f72eb505452da4fd2af1ea3b2bb24241ac1716332064e5a97d0c97951ea92ddd55a6 SHA512 d77fbd4e44d32f70b9047f7ae4531684e7d142b659be03ead0bce0252635a6bd35eaa8cd5d0cbcca59a19ee740f809ca6ad950dd199805fa6a379e41fbb68582 AUX qtgui-5.9.4-qsimpledrag.patch 6887 BLAKE2B 9da87acfe69c1cb8b1dd92b05a7b919d01227d0aa1316adfe97261bd59a7e0eb3b1e6d9b0896cc2f6a6a64eac3f31f72039a3acc2767998a668656acc8d8ffc2 SHA512 8229b87a40287c3c6e74d5aec9bfc346a1e0f7002687ba661573566ff5f700c99819850fc97f07d3a36d63ba83348f2ab315f835e44abce22242b4d1f29e7c7b -DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb -DIST qtgui-systemtrayicon-plugin-system.patch 51377 BLAKE2B 2b57d485c9ceb2b7e23cd6f8aa3be955e70d779ab0ca849148435e2a212a2db48948dc689c06eb8aea484513081df56d86584cb98ad4d64fb86ceb15eb802f38 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 -EBUILD qtgui-4.8.7.ebuild 5502 BLAKE2B 13e6c5954107a56b929e32402307c352d417b6a41b71d1265fd35fec5534050637ed76707e33d040d26e6d66e863337802a9b3c4b5dc82ac11f78123b561bb8a SHA512 ebb51a68680d6c89ce16aa31378c59c9c66283cac71ecd970ba3998437303a936b601bef3292dc58c24dd63e0ca6a3e1a2945175901d3757a58f05f16edfc697 EBUILD qtgui-5.11.1.ebuild 3575 BLAKE2B 1f2d3da7a365d1e07421c53bdcbc4d6d88c663ff006a159c4b919a9a169469c142c69bb9c9d6fe9493d283d4d27a8ab855332fa6f41e0de83c66497963b16c8c SHA512 50de3da979c4679dda40e83369c967db1faf0dfba8cd386d2286d13e01745cad0b0f201d487a1c3da26dad4421f54455d2ea815134eadbef3183579a37a6aa79 EBUILD qtgui-5.9.4-r3.ebuild 3725 BLAKE2B d83d8e0c8407a8d4e9c0b7ab22f9c5bea55d4ebccba03b17ea70d22d00bff15ffe9bf8bedc1c8ce860d3f80ccbe38bfbef60ba656c0524d6a4dddac95c0f7488 SHA512 9d1e09c76bc4581c54a17b635de66a478a95dbc23072c27e593f4fad0b207b4825ccd2ccac83c873f68cc4ecbd97cfe10cec40c07f784e2420c0d245656e877b EBUILD qtgui-5.9.6.ebuild 3555 BLAKE2B 87d08c435eaa541cb24cc3826c7a7e66c5adad06a4272ab01fd09969ba207e87b6c771b45858714b3888bcccaf2630cd43ea2d0897bc4183f869a4b5277690b3 SHA512 5547121278fb441a33ef6be80a16c346beaba15bbfd38a5a52b199ff94d8fd225929bb0b476d0ec1e017d5a18cae82733cff43f93be631284f260b16b8c44767 -MISC metadata.xml 1862 BLAKE2B 062b123eab07ca09b1b6d63a9ce814a921b523c1861552a4f12903ccc8f627cf78e240d322c52b3a404ff154822a9cb42f894da5bc74a924d89dd51a42576115 SHA512 cba45629873eba71f152885640e51ad324b0dbb702c45811b4a1785a0af3baa7ce39923dfd0dbf7748d604e9a053d6580defdad75ad5ae228d37424d9b54e530 +MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6 diff --git a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch b/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch deleted file mode 100644 index e0305e11b89a..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.7.3-cups.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100 -@@ -569,6 +569,32 @@ - void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups) - { - options.duplex->setEnabled(cups && cups->ppdOption("Duplex")); -+ -+ if (cups) { -+ const ppd_option_t* duplex = cups->ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ options.duplexShort->setChecked(true); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ options.duplexLong->setChecked(true); -+ else -+ options.noDuplex->setChecked(true); -+ } -+ -+ if (cups->currentPPD()) { -+ // set default color -+ if (cups->currentPPD()->color_device) -+ options.color->setChecked(true); -+ else -+ options.grayscale->setChecked(true); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups->ppdOption("Collate"); -+ if (collate) -+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0); -+ } - } - #endif - -diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp ---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100 -+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100 -@@ -627,6 +627,44 @@ - && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) { - setOutputFormat(QPrinter::PdfFormat); - } -+ -+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) -+ // fill in defaults from ppd file -+ QCUPSSupport cups; -+ -+ int printernum = -1; -+ for (int i = 0; i < cups.availablePrintersCount(); i++) { -+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name) -+ printernum = i; -+ } -+ if (printernum >= 0) { -+ cups.setCurrentPrinter(printernum); -+ -+ const ppd_option_t* duplex = cups.ppdOption("Duplex"); -+ if (duplex) { -+ // copy default ppd duplex to qt dialog -+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0) -+ setDuplex(DuplexShortSide); -+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0) -+ setDuplex(DuplexLongSide); -+ else -+ setDuplex(DuplexNone); -+ } -+ -+ if (cups.currentPPD()) { -+ // set default color -+ if (cups.currentPPD()->color_device) -+ setColorMode(Color); -+ else -+ setColorMode(GrayScale); -+ } -+ -+ // set collation -+ const ppd_option_t *collate = cups.ppdOption("Collate"); -+ if (collate) -+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0); -+ } -+#endif - } - - /*! diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch deleted file mode 100644 index 9a9f773537e4..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp ---- qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp.qgtkstyle_disable_gtk_theme_check 2013-06-09 16:28:22.938840346 -0500 -+++ qt-everywhere-opensource-src-4.8.5/src/gui/styles/qgtkstyle_p.cpp 2013-06-09 17:03:01.781125479 -0500 -@@ -503,18 +503,6 @@ void QGtkStylePrivate::initGtkWidgets() - return; - } - -- static QString themeName; -- if (!gtkWidgetMap()->contains("GtkWindow") && themeName.isEmpty()) { -- themeName = getThemeName(); -- -- if (themeName == QLS("Qt") || themeName == QLS("Qt4")) { -- // Due to namespace conflicts with Qt3 and obvious recursion with Qt4, -- // we cannot support the GTK_Qt Gtk engine -- qWarning("QGtkStyle cannot be used together with the GTK_Qt engine."); -- return; -- } -- } -- - if (QGtkStylePrivate::gtk_init) { - // Gtk will set the Qt error handler so we have to reset it afterwards - x11ErrorHandler qt_x_errhandler = XSetErrorHandler(0); diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch deleted file mode 100644 index d46f8c541872..000000000000 --- a/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Mon, 16 Jun 2014 23:52:24 +1000 -Subject: Fix delay with QClipboard and useEventLoop. - -This manifests when using LibreOffice with KDE integration. When KFileDialog is -open, the clipboard is repeatedly polled causing a visible delay since using -QClipboard in "useEventLoop" mode adds 50ms delay to every single clipboard -fetch. - -Change-Id: Id30cda7b983ae7c949fa270d04f772fa44fc21cd -Task-number: QTBUG-38585 ---- - src/gui/kernel/qclipboard_x11.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp -index 14bf088..5f442b9 100644 ---- a/src/gui/kernel/qclipboard_x11.cpp -+++ b/src/gui/kernel/qclipboard_x11.cpp -@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int ti - return false; - - XSync(X11->display, false); -- usleep(50000); -+ if (!XPending(X11->display)) -+ usleep(5000); - - now.start(); - --- -2.0.0 - diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index ef12478e668a..bb8d780f9c2d 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -9,18 +9,9 @@ Enable EGL integration Build the EGL Full Screen/Single Surface platform plugin Enable support for input devices via evdev - Add support for exceptions - like catching them - inside the event loop (recommended by upstream) Use GLES 2.0 or later instead of full OpenGL - Enable integration with the dev-libs/glib event loop - Build a widgets style that mimics the active GTK+ theme Build the IBus input method plugin Enable support for input devices via dev-libs/libinput - Enable the Qt3Support libraries for Qt4. Note that - this does not mean you can compile pure Qt3 programs with Qt4. - Build the 'trace' graphicssystem engine which allows to record - all drawing operations into a trace buffer. The trace can be replayed - later with the qttracereplay tool. Enable support for touchscreen devices via x11-libs/tslib Build plugin to receive touch events over the TUIO protocol Build the XCB platform plugin and enable X11 integration diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild deleted file mode 100644 index 79f95bf77ea1..000000000000 --- a/dev-qt/qtgui/qtgui-4.8.7.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils qt4-build-multilib - -DESCRIPTION="The GUI module for the Qt toolkit" -SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" - -if [[ ${QT4_BUILD_TYPE} == release ]]; then - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" - -REQUIRED_USE=" - gtkstyle? ( glib ) -" - -# cairo[-qt4] is needed because of bug 454066 -RDEPEND=" - app-eselect/eselect-qtgraphicssystem - ~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=,${MULTILIB_USEDEP}] - ~dev-qt/qtscript-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.2-r1[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.4.11-r1:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - virtual/jpeg:0[${MULTILIB_USEDEP}] - !aqua? ( - >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.13-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.6.2-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.0-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.2-r1[${MULTILIB_USEDEP}] ) - xv? ( >=x11-libs/libXv-1.0.7-r1[${MULTILIB_USEDEP}] ) - ) - cups? ( net-print/cups[${MULTILIB_USEDEP}] ) - egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] ) - glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) - gtkstyle? ( - >=x11-libs/cairo-1.12[-qt4(-),${MULTILIB_USEDEP}] - >=x11-libs/gtk+-2.24.23-r1:2[aqua=,${MULTILIB_USEDEP}] - ) - mng? ( >=media-libs/libmng-1.0.10-r2:=[${MULTILIB_USEDEP}] ) - nas? ( >=media-libs/nas-1.9.3-r1[${MULTILIB_USEDEP}] ) - nis? ( elibc_glibc? ( net-libs/libnsl:=[${MULTILIB_USEDEP}] ) ) - tiff? ( >=media-libs/tiff-4.0.3-r2:0[${MULTILIB_USEDEP}] ) - ! "${ED}"/usr/share/qt4/graphicssystems/raster || die - echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die - - if has tools/qtconfig ${QT4_TARGET_DIRECTORIES}; then - newicon tools/qtconfig/images/appicon.png qtconfig.png - make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' - fi -} - -pkg_postinst() { - qt4-build-multilib_pkg_postinst - - # raster is the default graphicssystem, set it on first install - eselect qtgraphicssystem set raster --use-old -} -- cgit v1.2.3