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 9140E138A1A for ; Mon, 26 Jan 2015 02:58:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E8923E0802; Mon, 26 Jan 2015 02:58:49 +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 66AA7E07F4 for ; Mon, 26 Jan 2015 02:58:49 +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 3B89F3406A1 for ; Mon, 26 Jan 2015 02:58:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E83F51061F for ; Mon, 26 Jan 2015 02:58:46 +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: <1422240911.789292b21b56c2492279595820abdd67b6c69a57.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.5-fix-compat.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: 789292b21b56c2492279595820abdd67b6c69a57 X-VCS-Branch: master Date: Mon, 26 Jan 2015 02:58:46 +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: 520c9e73-230f-4212-925b-6e9addf07ec9 X-Archives-Hash: 82e6c166b26a8ba1f124307a1c395dfb commit: 789292b21b56c2492279595820abdd67b6c69a57 Author: Davide Pesavento gentoo org> AuthorDate: Mon Jan 26 02:55:11 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Jan 26 02:55:11 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=789292b2 [dev-qt/qthelp:4] Sync. Package-Manager: portage-2.2.15 --- dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch | 21 ------------ dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch | 40 +++++++++++++++++++++++ dev-qt/qthelp/qthelp-4.8.9999.ebuild | 4 +-- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch deleted file mode 100644 index cc76219..0000000 --- a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- tools/assistant/compat/compat.pro 2010-10-08 16:54:09.804000000 +0300 -+++ tools/assistant/compat/compat.pro 2010-10-08 16:54:37.884000000 +0300 -@@ -14,6 +14,8 @@ - - PROJECTNAME = Assistant - -+DESTDIR = ../../../bin -+ - FORMS += helpdialog.ui \ - mainwindow.ui \ - tabbedbrowser.ui \ -@@ -59,6 +61,9 @@ - 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/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch new file mode 100644 index 0000000..bdebfd5 --- /dev/null +++ b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch @@ -0,0 +1,40 @@ + 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 55ad8ad..edb13ad 100644 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -58,7 +58,7 @@ src_unpack() { } src_prepare() { - use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch") + use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch") qt4-build-multilib_src_prepare