* [gentoo-commits] gentoo-x86 commit in dev-qt/qthelp: qthelp-4.8.6-r1.ebuild ChangeLog
@ 2014-11-15 2:36 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-15 2:36 UTC (permalink / raw
To: gentoo-commits
pesa 14/11/15 02:36:55
Modified: ChangeLog
Added: qthelp-4.8.6-r1.ebuild
Log:
Version bump (bug 510042). Add multilib support (bug 498010).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path
1.23 dev-qt/qthelp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?r1=1.22&r2=1.23
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog 16 Sep 2014 14:45:48 -0000 1.22
+++ ChangeLog 15 Nov 2014 02:36:55 -0000 1.23
@@ -1,6 +1,11 @@
# ChangeLog for dev-qt/qthelp
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.22 2014/09/16 14:45:48 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.23 2014/11/15 02:36:55 pesa Exp $
+
+*qthelp-4.8.6-r1 (15 Nov 2014)
+
+ 15 Nov 2014; Davide Pesavento <pesa@gentoo.org> +qthelp-4.8.6-r1.ebuild:
+ Version bump (bug 510042). Add multilib support (bug 498010).
*qthelp-5.3.2 (16 Sep 2014)
1.1 dev-qt/qthelp/qthelp-4.8.6-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.1&content-type=text/plain
Index: qthelp-4.8.6-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:36:55 pesa Exp $
EAPI=5
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://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
)"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
IUSE="compat doc"
DEPEND="
~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
compat? (
~dev-qt/qtdbus-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
)
"
RDEPEND="${DEPEND}"
QT4_TARGET_DIRECTORIES="
tools/assistant/lib/fulltextsearch
tools/assistant/lib
tools/assistant/tools/qhelpgenerator
tools/assistant/tools/qcollectiongenerator
tools/assistant/tools/qhelpconverter
tools/qdoc3"
pkg_setup() {
use compat && QT4_TARGET_DIRECTORIES+="
tools/assistant/compat
tools/assistant/compat/lib"
}
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/
if use compat; then
unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
qt-assistant-compat-headers-4.7.tar.gz
mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
"${S}"/tools/assistant/compat || die
mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
fi
}
src_prepare() {
use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.5-fix-compat.patch")
qt4-build-multilib_src_prepare
# prevent rebuild of QtCore and QtXml (bug 348034)
sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
}
multilib_src_configure() {
local myconf=(
-system-libpng -system-libjpeg -system-zlib
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-no-multimedia -no-opengl -no-phonon -no-qt3support -no-svg -no-webkit -no-xmlpatterns
-no-nas-sound -no-cups -no-nis -fontconfig
)
qt4_multilib_src_configure
}
multilib_src_compile() {
qt4_multilib_src_compile
# release tarballs are shipped with prebuilt docs
if [[ ${QT4_BUILD_TYPE} == live ]] && multilib_is_native_abi; then
# qhelpgenerator needs libQtHelp.so.4
export LD_LIBRARY_PATH=${BUILD_DIR}/lib
export DYLD_LIBRARY_PATH=${BUILD_DIR}/lib:${BUILD_DIR}/lib/QtHelp.framework
emake docs
fi
}
multilib_src_install() {
qt4_multilib_src_install
if use compat; then
insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
doins tools/assistant/compat/features/assistant.prf
fi
if multilib_is_native_abi; then
emake INSTALL_ROOT="${D}" install_qchdocs
use doc && emake INSTALL_ROOT="${D}" install_htmldocs
# do not compress .qch files
docompress -x "${QT4_DOCDIR}"/qch
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-qt/qthelp: qthelp-4.8.6-r1.ebuild ChangeLog
@ 2014-11-16 4:06 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-16 4:06 UTC (permalink / raw
To: gentoo-commits
pesa 14/11/16 04:06:13
Modified: qthelp-4.8.6-r1.ebuild ChangeLog
Log:
Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf installation. Fix docompress on prefix.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path
1.2 dev-qt/qthelp/qthelp-4.8.6-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?r1=1.1&r2=1.2
Index: qthelp-4.8.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qthelp-4.8.6-r1.ebuild 15 Nov 2014 02:36:55 -0000 1.1
+++ qthelp-4.8.6-r1.ebuild 16 Nov 2014 04:06:13 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:36:55 pesa Exp $
+# $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 $
EAPI=5
@@ -52,11 +52,8 @@
# compat version
# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
if use compat; then
- unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
- qt-assistant-compat-headers-4.7.tar.gz
mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
"${S}"/tools/assistant/compat || die
- mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
fi
}
@@ -78,6 +75,11 @@
-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 "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die
+ fi
}
multilib_src_compile() {
@@ -95,16 +97,20 @@
multilib_src_install() {
qt4_multilib_src_install
- if use compat; then
- insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
- doins tools/assistant/compat/features/assistant.prf
- fi
-
if multilib_is_native_abi; then
emake INSTALL_ROOT="${D}" install_qchdocs
use doc && emake INSTALL_ROOT="${D}" install_htmldocs
# do not compress .qch files
- docompress -x "${QT4_DOCDIR}"/qch
+ docompress -x "${QT4_DOCDIR#${EPREFIX}}"/qch
+ fi
+}
+
+multilib_src_install_all() {
+ qt4_multilib_src_install_all
+
+ if use compat; then
+ insinto "${QT4_DATADIR#${EPREFIX}}"/mkspecs/features
+ doins tools/assistant/compat/features/assistant.prf
fi
}
1.24 dev-qt/qthelp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?r1=1.23&r2=1.24
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog 15 Nov 2014 02:36:55 -0000 1.23
+++ ChangeLog 16 Nov 2014 04:06:13 -0000 1.24
@@ -1,6 +1,10 @@
# ChangeLog for dev-qt/qthelp
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.23 2014/11/15 02:36:55 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.24 2014/11/16 04:06:13 pesa Exp $
+
+ 16 Nov 2014; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.6-r1.ebuild:
+ Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf
+ installation. Fix docompress on prefix.
*qthelp-4.8.6-r1 (15 Nov 2014)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-qt/qthelp: qthelp-4.8.6-r1.ebuild ChangeLog
@ 2014-11-26 18:26 Davide Pesavento (pesa)
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento (pesa) @ 2014-11-26 18:26 UTC (permalink / raw
To: gentoo-commits
pesa 14/11/26 18:26:53
Modified: qthelp-4.8.6-r1.ebuild ChangeLog
Log:
Restore mv of compat headers in src_unpack, accidentally deleted in the previous commit (bug 529398 comment #6).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path
1.3 dev-qt/qthelp/qthelp-4.8.6-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.3&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?r1=1.2&r2=1.3
Index: qthelp-4.8.6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qthelp-4.8.6-r1.ebuild 16 Nov 2014 04:06:13 -0000 1.2
+++ qthelp-4.8.6-r1.ebuild 26 Nov 2014 18:26:53 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -52,8 +52,8 @@
# compat version
# http://blog.qt.digia.com/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}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
+ mv "${WORKDIR}"/QtAssistant "${S}"/include || die
fi
}
@@ -78,7 +78,7 @@
if use compat; then
# syncqt knows nothing about these headers (bug 529398)
- cp -pr "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die
+ cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die
fi
}
1.25 dev-qt/qthelp/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?r1=1.24&r2=1.25
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog 16 Nov 2014 04:06:13 -0000 1.24
+++ ChangeLog 26 Nov 2014 18:26:53 -0000 1.25
@@ -1,6 +1,10 @@
# ChangeLog for dev-qt/qthelp
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.24 2014/11/16 04:06:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.25 2014/11/26 18:26:53 pesa Exp $
+
+ 26 Nov 2014; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.6-r1.ebuild:
+ Restore mv of compat headers in src_unpack, accidentally deleted in the
+ previous commit (bug 529398 comment #6).
16 Nov 2014; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.6-r1.ebuild:
Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-26 18:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-15 2:36 [gentoo-commits] gentoo-x86 commit in dev-qt/qthelp: qthelp-4.8.6-r1.ebuild ChangeLog Davide Pesavento (pesa)
-- strict thread matches above, loose matches on Subject: below --
2014-11-16 4:06 Davide Pesavento (pesa)
2014-11-26 18:26 Davide Pesavento (pesa)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox