From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E18141392EF for ; Fri, 4 Jul 2014 00:30:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0909FE0804; Fri, 4 Jul 2014 00:30:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 814B7E0804 for ; Fri, 4 Jul 2014 00:30:05 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77D1733FF3A for ; Fri, 4 Jul 2014 00:30:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 918DD182D3 for ; Fri, 4 Jul 2014 00:30:02 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1404433769.801f33f738161895b64a04d2c28fc5223d59e526.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/, dev-qt/qtgui/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/Manifest dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch dev-qt/qtgui/qtgui-4.8.6.ebuild dev-qt/qtgui/qtgui-4.8.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ dev-qt/qtgui/files/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 801f33f738161895b64a04d2c28fc5223d59e526 X-VCS-Branch: master Date: Fri, 4 Jul 2014 00:30:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1a95de3-9277-467f-b686-f3aac2135263 X-Archives-Hash: 55d86d387c525fa6ffde27ad483ab408 commit: 801f33f738161895b64a04d2c28fc5223d59e526 Author: Davide Pesavento gentoo org> AuthorDate: Fri Jul 4 00:29:29 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Jul 4 00:29:29 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=801f33f7 [dev-qt/qtgui:4] Sync with portage. Package-Manager: portage-2.2.10 --- dev-qt/qtgui/Manifest | 1 + ....8.5-cleanlooks-floating-point-exception.patch} | 0 ...h => qtgui-4.8.5-disable-gtk-theme-check.patch} | 0 .../qtgui/files/qtgui-4.8.5-qclipboard-delay.patch | 33 ++++++++++++++++++++++ dev-qt/qtgui/qtgui-4.8.6.ebuild | 7 +++-- dev-qt/qtgui/qtgui-4.8.9999.ebuild | 4 ++- 6 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 471b49c..cf2b674 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1,2 +1,3 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84 DIST qtbase-opensource-src-5.3.1.tar.xz 46679724 SHA256 7b5a138d30d7c0228a51084407d5210f6d1acfbee2f95b87f189872cfcd3a569 SHA512 b867d8c2f37007770d8105fea1820f8a2b1c2006474c28fbdc29fb7f7dcf9eee0960752805c833639eb7b0fd92c670f552bbc4a7064d0daf5bbac875d081500a WHIRLPOOL 997415bdae97c854916c055e2b5b8af47bc406a546aae24afa3e0fabcc53a3999efcfae7e17cf12dc1b87a79f29af5ae7069250fe6be6d9308f7e2df6001da27 +DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58 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 similarity index 100% rename from dev-qt/qtgui/files/qtgui-4.8.6-cleanlooks-floating-point-exception.patch rename to dev-qt/qtgui/files/qtgui-4.8.5-cleanlooks-floating-point-exception.patch 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 similarity index 100% rename from dev-qt/qtgui/files/qtgui-4.8.6-disable-gtk-theme-check.patch rename to dev-qt/qtgui/files/qtgui-4.8.5-disable-gtk-theme-check.patch 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 new file mode 100644 index 0000000..d46f8c5 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-4.8.5-qclipboard-delay.patch @@ -0,0 +1,33 @@ +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/qtgui-4.8.6.ebuild b/dev-qt/qtgui/qtgui-4.8.6.ebuild index 432fe08..2adb6dc 100644 --- a/dev-qt/qtgui/qtgui-4.8.6.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.6.ebuild @@ -7,6 +7,7 @@ EAPI=5 inherit eutils qt4-build-multilib DESCRIPTION="The GUI module for the Qt toolkit" +SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" if [[ ${QT4_BUILD_TYPE} == live ]]; then KEYWORDS="" @@ -68,10 +69,12 @@ PDEPEND=" " PATCHES=( + "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 + "${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124 + "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 "${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984 - "${FILESDIR}/${PN}-4.8.6-cleanlooks-floating-point-exception.patch" # bug 507124 - "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226 + "${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968 ) QT4_TARGET_DIRECTORIES=" diff --git a/dev-qt/qtgui/qtgui-4.8.9999.ebuild b/dev-qt/qtgui/qtgui-4.8.9999.ebuild index a97b855..6a3641e 100644 --- a/dev-qt/qtgui/qtgui-4.8.9999.ebuild +++ b/dev-qt/qtgui/qtgui-4.8.9999.ebuild @@ -7,6 +7,7 @@ EAPI=5 inherit eutils qt4-build-multilib DESCRIPTION="The GUI module for the Qt toolkit" +SRC_URI+=" http://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch" if [[ ${QT4_BUILD_TYPE} == live ]]; then KEYWORDS="" @@ -68,8 +69,9 @@ PDEPEND=" " PATCHES=( + "${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880 "${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 - "${FILESDIR}/${PN}-4.8.6-disable-gtk-theme-check.patch" # bug 491226 + "${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226 ) QT4_TARGET_DIRECTORIES="