| 1 |
commit: 801f33f738161895b64a04d2c28fc5223d59e526 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 4 00:29:29 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 4 00:29:29 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=801f33f7 |
| 7 |
|
| 8 |
[dev-qt/qtgui:4] Sync with portage. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.10 |
| 11 |
|
| 12 |
--- |
| 13 |
dev-qt/qtgui/Manifest | 1 + |
| 14 |
....8.5-cleanlooks-floating-point-exception.patch} | 0 |
| 15 |
...h => qtgui-4.8.5-disable-gtk-theme-check.patch} | 0 |
| 16 |
.../qtgui/files/qtgui-4.8.5-qclipboard-delay.patch | 33 ++++++++++++++++++++++ |
| 17 |
dev-qt/qtgui/qtgui-4.8.6.ebuild | 7 +++-- |
| 18 |
dev-qt/qtgui/qtgui-4.8.9999.ebuild | 4 ++- |
| 19 |
6 files changed, 42 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest |
| 22 |
index 471b49c..cf2b674 100644 |
| 23 |
--- a/dev-qt/qtgui/Manifest |
| 24 |
+++ b/dev-qt/qtgui/Manifest |
| 25 |
@@ -1,2 +1,3 @@ |
| 26 |
DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 |
| 27 |
DIST qtbase-opensource-src-5.3.1.tar.xz 46679724 SHA256 7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569 SHA512 b867d8c2f37007770d8105fea1820f8a2b1c2006474c28fbdc29fb7f7dcf9eee0960752805c833639eb7b0fd92c670f552bbc4a7064d0daf5bbac875d081500a WHIRLPOOL 997415bdae97c854916c055e2b5b8af47bc406a546aae24afa3e0fabcc53a3999efcfae7e17cf12dc1b87a79f29af5ae7069250fe6be6d9308f7e2df6001da27 |
| 28 |
+DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58 |
| 29 |
|
| 30 |
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch b/dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch |
| 31 |
similarity index 100% |
| 32 |
rename from dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch |
| 33 |
rename to dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch |
| 34 |
|
| 35 |
diff --git a/dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch b/dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch |
| 36 |
similarity index 100% |
| 37 |
rename from dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch |
| 38 |
rename to dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch |
| 39 |
|
| 40 |
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 |
| 41 |
new file mode 100644 |
| 42 |
index 0000000..d46f8c5 |
| 43 |
--- /dev/null |
| 44 |
+++ b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch |
| 45 |
@@ -0,0 +1,33 @@ |
| 46 |
+From a83ddc5212736f89a0b94667c495494fe6861d63 Mon Sep 17 00:00:00 2001 |
| 47 |
+From: Michael Palimaka <kensington@g.o> |
| 48 |
+Date: Mon, 16 Jun 2014 23:52:24 +1000 |
| 49 |
+Subject: Fix delay with QClipboard and useEventLoop. |
| 50 |
+ |
| 51 |
+This manifests when using LibreOffice with KDE integration. When KFileDialog is |
| 52 |
+open, the clipboard is repeatedly polled causing a visible delay since using |
| 53 |
+QClipboard in "useEventLoop" mode adds 50ms delay to every single clipboard |
| 54 |
+fetch. |
| 55 |
+ |
| 56 |
+Change-Id: Id30cda7b983ae7c949fa270d04f772fa44fc21cd |
| 57 |
+Task-number: QTBUG-38585 |
| 58 |
+--- |
| 59 |
+ src/gui/kernel/qclipboard_x11.cpp | 3 ++- |
| 60 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 61 |
+ |
| 62 |
+diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp |
| 63 |
+index 14bf088..5f442b9 100644 |
| 64 |
+--- a/src/gui/kernel/qclipboard_x11.cpp |
| 65 |
++++ b/src/gui/kernel/qclipboard_x11.cpp |
| 66 |
+@@ -548,7 +548,8 @@ bool QX11Data::clipboardWaitForEvent(Window win, int type, XEvent *event, int ti |
| 67 |
+ return false; |
| 68 |
+ |
| 69 |
+ XSync(X11->display, false); |
| 70 |
+- usleep(50000); |
| 71 |
++ if (!XPending(X11->display)) |
| 72 |
++ usleep(5000); |
| 73 |
+ |
| 74 |
+ now.start(); |
| 75 |
+ |
| 76 |
+-- |
| 77 |
+2.0.0 |
| 78 |
+ |
| 79 |
|
| 80 |
diff --git a/dev-qt/qtgui/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 81 |
index 432fe08..2adb6dc 100644 |
| 82 |
--- a/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 83 |
+++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild |
| 84 |
@@ -7,6 +7,7 @@ EAPI=5 |
| 85 |
inherit eutils qt4-build-multilib |
| 86 |
|
| 87 |
DESCRIPTION="The GUI module for the Qt toolkit" |
| 88 |
+SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" |
| 89 |
|
| 90 |
if [[ ${QT4_BUILD_TYPE} == live ]]; then |
| 91 |
KEYWORDS="" |
| 92 |
@@ -68,10 +69,12 @@ PDEPEND=" |
| 93 |
" |
| 94 |
|
| 95 |
PATCHES=( |
| 96 |
+ "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 |
| 97 |
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 |
| 98 |
+ "${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124 |
| 99 |
+ "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 |
| 100 |
"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984 |
| 101 |
- "${FILESDIR}/${PN}-4.8.6-cleanlooks-floating-point-exception.patch" # bug 507124 |
| 102 |
- "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226 |
| 103 |
+ "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 |
| 104 |
) |
| 105 |
|
| 106 |
QT4_TARGET_DIRECTORIES=" |
| 107 |
|
| 108 |
diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 109 |
index a97b855..6a3641e 100644 |
| 110 |
--- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 111 |
+++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild |
| 112 |
@@ -7,6 +7,7 @@ EAPI=5 |
| 113 |
inherit eutils qt4-build-multilib |
| 114 |
|
| 115 |
DESCRIPTION="The GUI module for the Qt toolkit" |
| 116 |
+SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" |
| 117 |
|
| 118 |
if [[ ${QT4_BUILD_TYPE} == live ]]; then |
| 119 |
KEYWORDS="" |
| 120 |
@@ -68,8 +69,9 @@ PDEPEND=" |
| 121 |
" |
| 122 |
|
| 123 |
PATCHES=( |
| 124 |
+ "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 |
| 125 |
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 |
| 126 |
- "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226 |
| 127 |
+ "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 |
| 128 |
) |
| 129 |
|
| 130 |
QT4_TARGET_DIRECTORIES=" |
Archives