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 6143E138CD1 for ; Sat, 9 May 2015 19:20:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF222E0838; Sat, 9 May 2015 19:20:56 +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 52101E0838 for ; Sat, 9 May 2015 19:20:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DA7F34106C for ; Sat, 9 May 2015 19:20:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0F549CD for ; Sat, 9 May 2015 19:20:53 +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: <1431199235.9ba8da74f6f226a0898ae8b64be9c89267b63f46.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/files/, dev-qt/qthelp/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch dev-qt/qthelp/qthelp-4.8.9999.ebuild X-VCS-Directories: dev-qt/qthelp/files/ dev-qt/qthelp/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 9ba8da74f6f226a0898ae8b64be9c89267b63f46 X-VCS-Branch: master Date: Sat, 9 May 2015 19:20:53 +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: c724c429-39e4-4999-8d43-278950ffd6db X-Archives-Hash: d4e85903b658a7f72a0403ae3c1e84c8 commit: 9ba8da74f6f226a0898ae8b64be9c89267b63f46 Author: Davide Pesavento gentoo org> AuthorDate: Sat May 9 19:20:35 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat May 9 19:20:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=9ba8da74 [dev-qt/qthelp:4] Sync. Package-Manager: portage-2.2.18 .../qthelp/files/qthelp-4.8.6-compat-install.patch | 35 +++++++++++++++++++ .../qthelp/files/qthelp-4.8.6-compat-syncqt.patch | 25 ++++++++++++++ dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch | 40 ---------------------- dev-qt/qthelp/qthelp-4.8.9999.ebuild | 15 ++++---- 4 files changed, 67 insertions(+), 48 deletions(-) diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch new file mode 100644 index 0000000..e157381 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch @@ -0,0 +1,35 @@ +From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Wed, 6 May 2015 23:21:54 +0200 +Subject: [PATCH] Install assistant_adp binary. + +--- + tools/assistant/compat/compat.pro | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro +index 171106a..a14e3f8 100755 +--- a/tools/assistant/compat/compat.pro ++++ b/tools/assistant/compat/compat.pro +@@ -14,6 +14,8 @@ QT += xml network + + PROJECTNAME = Assistant + ++DESTDIR = ../../../bin ++ + FORMS += helpdialog.ui \ + mainwindow.ui \ + tabbedbrowser.ui \ +@@ -59,6 +61,9 @@ mac { + TARGET = Assistant_adp + } + ++target.path = $$[QT_INSTALL_BINS] ++INSTALLS += target ++ + TRANSLATIONS = translations/assistant_adp_de.ts \ + translations/assistant_adp_ja.ts \ + translations/assistant_adp_pl.ts \ +-- +2.4.0 + diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch new file mode 100644 index 0000000..4ba6b6f --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch @@ -0,0 +1,25 @@ +From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001 +From: Davide Pesavento +Date: Wed, 6 May 2015 22:44:57 +0200 +Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers. + +See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47 +--- + bin/syncqt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bin/syncqt b/bin/syncqt +index dd94d4d..cc5a7bf 100755 +--- a/bin/syncqt ++++ b/bin/syncqt +@@ -81,6 +81,7 @@ my %modules = ( # path to module name map + "ActiveQt" => "$basedir/src/activeqt", + "QtTest" => "$basedir/src/testlib", + "QtHelp" => "$basedir/tools/assistant/lib", ++ "QtAssistant" => "$basedir/tools/assistant/compat/lib", + "QtDesigner" => "$basedir/tools/designer/src/lib", + "QtUiTools" => "$basedir/tools/designer/src/uitools", + "QtDBus" => "$basedir/src/dbus", +-- +2.4.0 + diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch deleted file mode 100644 index bdebfd5..0000000 --- a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch +++ /dev/null @@ -1,40 +0,0 @@ - tools/assistant/compat/compat.pro | 5 +++++ - tools/assistant/compat/lib/lib.pro | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro -index 171106a..51b8d5b 100755 ---- a/tools/assistant/compat/compat.pro -+++ b/tools/assistant/compat/compat.pro -@@ -14,6 +14,8 @@ QT += xml network - - PROJECTNAME = Assistant - -+DESTDIR = ../../../bin -+ - FORMS += helpdialog.ui \ - mainwindow.ui \ - tabbedbrowser.ui \ -@@ -59,6 +61,9 @@ mac { - TARGET = Assistant_adp - } - -+target.path=$$[QT_INSTALL_BINS] -+INSTALLS += target -+ - TRANSLATIONS = translations/assistant_adp_de.ts \ - translations/assistant_adp_ja.ts \ - translations/assistant_adp_pl.ts \ -diff --git a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro -index e50d470..8973d43 100755 ---- a/tools/assistant/compat/lib/lib.pro -+++ b/tools/assistant/compat/lib/lib.pro -@@ -31,7 +31,7 @@ contains(CONFIG, static) { - - #load up the headers info - CONFIG += qt_install_headers --HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri -+HEADERS_PRI = $$QT_SOURCE_TREE/include/QtAssistant/headers.pri - include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) - - #mac frameworks diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild index edb13ad..3132c7f 100644 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild @@ -9,7 +9,7 @@ inherit qt4-build-multilib DESCRIPTION="The Help module for the Qt toolkit" SRC_URI+=" compat? ( - ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz + http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )" @@ -50,15 +50,19 @@ src_unpack() { qt4-build-multilib_src_unpack # compat version - # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ + # http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ if use compat; then mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die mv "${WORKDIR}"/QtAssistant "${S}"/include || die + find "${S}"/tools/assistant/compat -type f -execdir chmod a-x '{}' + || die fi } src_prepare() { - use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch") + use compat && PATCHES+=( + "${FILESDIR}/${PN}-4.8.6-compat-install.patch" + "${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch" + ) qt4-build-multilib_src_prepare @@ -75,11 +79,6 @@ multilib_src_configure() { -no-nas-sound -no-cups -no-nis -fontconfig ) qt4_multilib_src_configure - - if use compat; then - # syncqt knows nothing about these headers (bug 529398) - cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die - fi } multilib_src_compile() {