| 1 |
pesa 14/11/26 18:26:53 |
| 2 |
|
| 3 |
Modified: qthelp-4.8.6-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Restore mv of compat headers in src_unpack, accidentally deleted in the previous commit (bug 529398 comment #6). |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 dev-qt/qthelp/qthelp-4.8.6-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: qthelp-4.8.6-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- qthelp-4.8.6-r1.ebuild 16 Nov 2014 04:06:13 -0000 1.2 |
| 23 |
+++ qthelp-4.8.6-r1.ebuild 26 Nov 2014 18:26:53 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.2 2014/11/16 04:06:13 pesa Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.3 2014/11/26 18:26:53 pesa Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -52,8 +52,8 @@ |
| 33 |
# compat version |
| 34 |
# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ |
| 35 |
if use compat; then |
| 36 |
- mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \ |
| 37 |
- "${S}"/tools/assistant/compat || die |
| 38 |
+ mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die |
| 39 |
+ mv "${WORKDIR}"/QtAssistant "${S}"/include || die |
| 40 |
fi |
| 41 |
} |
| 42 |
|
| 43 |
@@ -78,7 +78,7 @@ |
| 44 |
|
| 45 |
if use compat; then |
| 46 |
# syncqt knows nothing about these headers (bug 529398) |
| 47 |
- cp -pr "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die |
| 48 |
+ cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die |
| 49 |
fi |
| 50 |
} |
| 51 |
|
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.25 dev-qt/qthelp/ChangeLog |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.25&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.25&content-type=text/plain |
| 59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?r1=1.24&r2=1.25 |
| 60 |
|
| 61 |
Index: ChangeLog |
| 62 |
=================================================================== |
| 63 |
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v |
| 64 |
retrieving revision 1.24 |
| 65 |
retrieving revision 1.25 |
| 66 |
diff -u -r1.24 -r1.25 |
| 67 |
--- ChangeLog 16 Nov 2014 04:06:13 -0000 1.24 |
| 68 |
+++ ChangeLog 26 Nov 2014 18:26:53 -0000 1.25 |
| 69 |
@@ -1,6 +1,10 @@ |
| 70 |
# ChangeLog for dev-qt/qthelp |
| 71 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 72 |
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.24 2014/11/16 04:06:13 pesa Exp $ |
| 73 |
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.25 2014/11/26 18:26:53 pesa Exp $ |
| 74 |
+ |
| 75 |
+ 26 Nov 2014; Davide Pesavento <pesa@g.o> qthelp-4.8.6-r1.ebuild: |
| 76 |
+ Restore mv of compat headers in src_unpack, accidentally deleted in the |
| 77 |
+ previous commit (bug 529398 comment #6). |
| 78 |
|
| 79 |
16 Nov 2014; Davide Pesavento <pesa@g.o> qthelp-4.8.6-r1.ebuild: |
| 80 |
Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf |
Archives