* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: ChangeLog qt-core-4.7.0.ebuild
@ 2010-09-23 21:33 Alex Alexander (wired)
0 siblings, 0 replies; 4+ messages in thread
From: Alex Alexander (wired) @ 2010-09-23 21:33 UTC (permalink / raw
To: gentoo-commits
wired 10/09/23 21:33:48
Modified: ChangeLog qt-core-4.7.0.ebuild
Log:
EAPI 3, prefix, other improvements
(Portage version: 2.2_rc85/cvs/Linux x86_64)
Revision Changes Path
1.105 x11-libs/qt-core/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.104&r2=1.105
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog 21 Sep 2010 14:41:15 -0000 1.104
+++ ChangeLog 23 Sep 2010 21:33:48 -0000 1.105
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.104 2010/09/21 14:41:15 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.105 2010/09/23 21:33:48 wired Exp $
+
+ 23 Sep 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
+ EAPI 3, prefix, other improvements
*qt-core-4.7.0 (21 Sep 2010)
1.2 x11-libs/qt-core/qt-core-4.7.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?r1=1.1&r2=1.2
Index: qt-core-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-core-4.7.0.ebuild 21 Sep 2010 14:41:15 -0000 1.1
+++ qt-core-4.7.0.ebuild 23 Sep 2010 21:33:48 -0000 1.2
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.1 2010/09/21 14:41:15 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.2 2010/09/23 21:33:48 wired Exp $
-EAPI="2"
+EAPI="3"
inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
@@ -16,7 +16,7 @@
!<x11-libs/qt-4.4.0:4"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
-PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[glib=,qt3support] )"
+PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )"
pkg_setup() {
QT4_TARGET_DIRECTORIES="
@@ -53,9 +53,8 @@
src/declarative
src/gui
src/script
+ tools/shared
tools/linguist/shared
- tools/shared/symbian
- tools/shared/windows
translations"
qt4-build_pkg_setup
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
@@ -104,11 +103,11 @@
}
src_install() {
- dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die
+ dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed"
install_directories src/{corelib,xml,network,plugins/codecs}
- emake INSTALL_ROOT="${D}" install_mkspecs || die
+ emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
#install private headers
if use private-headers; then
@@ -120,9 +119,10 @@
[[ -d "${S}"/lib/QtCore.framework ]] \
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
- LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts || die
- insinto ${QTTRANSDIR}
- doins translations/*.qm || die
+ LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \
+ || die "generating translations faied"
+ insinto ${QTTRANSDIR#${EPREFIX}}
+ doins translations/*.qm || die "doins translations failed"
setqtenv
fix_library_files
@@ -130,24 +130,35 @@
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do
- libdirs="${libdirs}:/usr/${libdir}/qt4"
+ libdirs+=:${EPREFIX}/usr/${libdir}/qt4
done
cat <<-EOF > "${T}/44qt4"
- LDPATH=${libdirs:1}
+ LDPATH="${libdirs:1}"
EOF
doenvd "${T}/44qt4"
- dodir /${QTDATADIR}/mkspecs/gentoo
+ dodir ${QTDATADIR#${EPREFIX}}/mkspecs/gentoo || die "dodir failed"
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
- || die
+ || die "Failed to move qconfig.pri"
+
+ # Framework hacking
+ if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then
+ #TODO do this better
+ sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+ || die "sed for qconfig.h failed."
+ dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo ||
+ die "dosym failed"
+ else
+ sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+ "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+ "${D}${QTHEADERDIR}"/Qt/qconfig.h \
+ || die "sed for qconfig.h failed"
+ fi
- sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
- "${D}${QTHEADERDIR}"/QtCore/qconfig.h \
- "${D}${QTHEADERDIR}"/Qt/qconfig.h \
- || die
if use glib; then
- QCONFIG_DEFINE=" $(use glib && echo QT_GLIB)
+ QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
$(use ssl && echo QT_OPENSSL)"
install_qconfigs
fi
@@ -155,10 +166,12 @@
find "${D}"${QTLIBDIR} -name "*.la" -print0 | xargs -0 rm
# remove some unnecessary headers
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\
-qatomic_macosx.h,\
qatomic_windows.h,\
qatomic_windowsce.h,\
qt_windows.h}
- keepdir "${QTSYSCONFDIR}"
+ keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+ # Framework magic
+ fix_includes
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: ChangeLog qt-core-4.7.0.ebuild
@ 2010-09-24 6:59 Alex Alexander (wired)
0 siblings, 0 replies; 4+ messages in thread
From: Alex Alexander (wired) @ 2010-09-24 6:59 UTC (permalink / raw
To: gentoo-commits
wired 10/09/24 06:59:51
Modified: ChangeLog qt-core-4.7.0.ebuild
Log:
prefix fix, thanks to heiko_
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Revision Changes Path
1.106 x11-libs/qt-core/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.105&r2=1.106
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ChangeLog 23 Sep 2010 21:33:48 -0000 1.105
+++ ChangeLog 24 Sep 2010 06:59:51 -0000 1.106
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.105 2010/09/23 21:33:48 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.106 2010/09/24 06:59:51 wired Exp $
+
+ 24 Sep 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
+ prefix fix, thanks to heiko_
23 Sep 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
EAPI 3, prefix, other improvements
1.3 x11-libs/qt-core/qt-core-4.7.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?r1=1.2&r2=1.3
Index: qt-core-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-core-4.7.0.ebuild 23 Sep 2010 21:33:48 -0000 1.2
+++ qt-core-4.7.0.ebuild 24 Sep 2010 06:59:51 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.2 2010/09/23 21:33:48 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.3 2010/09/24 06:59:51 wired Exp $
EAPI="3"
inherit qt4-build
@@ -111,7 +111,7 @@
#install private headers
if use private-headers; then
- insinto ${QTHEADERDIR}/QtCore/private
+ insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
fi
# use freshly built libraries
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: ChangeLog qt-core-4.7.0.ebuild
@ 2010-10-10 11:48 Raul Porcel (armin76)
0 siblings, 0 replies; 4+ messages in thread
From: Raul Porcel (armin76) @ 2010-10-10 11:48 UTC (permalink / raw
To: gentoo-commits
armin76 10/10/10 11:48:45
Modified: ChangeLog qt-core-4.7.0.ebuild
Log:
Mark -sparc because it sigbuses
(Portage version: 2.1.8.3/cvs/Linux ia64)
Revision Changes Path
1.107 x11-libs/qt-core/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.106&r2=1.107
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- ChangeLog 24 Sep 2010 06:59:51 -0000 1.106
+++ ChangeLog 10 Oct 2010 11:48:44 -0000 1.107
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.106 2010/09/24 06:59:51 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.107 2010/10/10 11:48:44 armin76 Exp $
+
+ 10 Oct 2010; Raúl Porcel <armin76@gentoo.org> qt-core-4.7.0.ebuild:
+ Mark -sparc because it sigbuses
24 Sep 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
prefix fix, thanks to heiko_
1.4 x11-libs/qt-core/qt-core-4.7.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?r1=1.3&r2=1.4
Index: qt-core-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-core-4.7.0.ebuild 24 Sep 2010 06:59:51 -0000 1.3
+++ qt-core-4.7.0.ebuild 10 Oct 2010 11:48:44 -0000 1.4
@@ -1,13 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.3 2010/09/24 06:59:51 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.4 2010/10/10 11:48:44 armin76 Exp $
EAPI="3"
inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="+glib iconv optimized-qmake private-headers qt3support ssl"
RDEPEND="sys-libs/zlib
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: ChangeLog qt-core-4.7.0.ebuild
@ 2010-11-06 9:34 Alex Alexander (wired)
0 siblings, 0 replies; 4+ messages in thread
From: Alex Alexander (wired) @ 2010-11-06 9:34 UTC (permalink / raw
To: gentoo-commits
wired 10/11/06 09:34:31
Modified: ChangeLog qt-core-4.7.0.ebuild
Log:
removed alpha keyword from qt-4.7, bug #338289
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
Revision Changes Path
1.113 x11-libs/qt-core/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.112&r2=1.113
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog 5 Nov 2010 18:18:30 -0000 1.112
+++ ChangeLog 6 Nov 2010 09:34:31 -0000 1.113
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.112 2010/11/05 18:18:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.113 2010/11/06 09:34:31 wired Exp $
+
+ 06 Nov 2010; Alex Alexander <wired@gentoo.org> qt-core-4.7.0.ebuild:
+ removed alpha keyword from qt-4.7, bug #338289
05 Nov 2010; Jeroen Roovers <jer@gentoo.org> qt-core-4.6.3.ebuild:
Stable for HPPA (bug #341703).
1.5 x11-libs/qt-core/qt-core-4.7.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild?r1=1.4&r2=1.5
Index: qt-core-4.7.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-core-4.7.0.ebuild 10 Oct 2010 11:48:44 -0000 1.4
+++ qt-core-4.7.0.ebuild 6 Nov 2010 09:34:31 -0000 1.5
@@ -1,13 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.4 2010/10/10 11:48:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.0.ebuild,v 1.5 2010/11/06 09:34:31 wired Exp $
EAPI="3"
inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="+glib iconv optimized-qmake private-headers qt3support ssl"
RDEPEND="sys-libs/zlib
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-11-06 9:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-23 21:33 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: ChangeLog qt-core-4.7.0.ebuild Alex Alexander (wired)
-- strict thread matches above, loose matches on Subject: below --
2010-09-24 6:59 Alex Alexander (wired)
2010-10-10 11:48 Raul Porcel (armin76)
2010-11-06 9:34 Alex Alexander (wired)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox