* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-dbus: qt-dbus-4.4.0_rc1.ebuild
@ 2007-12-20 13:32 Caleb Tennis (caleb)
0 siblings, 0 replies; 5+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-20 13:32 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/20 13:32:01
Modified: qt-dbus-4.4.0_rc1.ebuild
Log:
Add a patch that foregoes building qmake and just uses the one from the system
(Portage version: 2.1.3.16)
Revision Changes Path
1.2 x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?r1=1.1&r2=1.2
Index: qt-dbus-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-dbus-4.4.0_rc1.ebuild 20 Dec 2007 13:16:56 -0000 1.1
+++ qt-dbus-4.4.0_rc1.ebuild 20 Dec 2007 13:32:00 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.1 2007/12/20 13:16:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.2 2007/12/20 13:32:00 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -54,6 +54,10 @@
ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
append-flags -fno-stack-protector
fi
+
+ # Override the creation of qmake and copy over the one from the system. This speeds up compilation time a lot.
+ epatch "${FILESDIR}"/configure.patch
+ cp ${QTBINDIR}/qmake "${S}"/bin/qmake
}
src_compile() {
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-dbus: qt-dbus-4.4.0_rc1.ebuild
@ 2007-12-20 16:05 Caleb Tennis (caleb)
0 siblings, 0 replies; 5+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-20 16:05 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/20 16:05:53
Modified: qt-dbus-4.4.0_rc1.ebuild
Log:
Be sure to add qdbus to qconfig.pri
(Portage version: 2.1.3.16)
Revision Changes Path
1.3 x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?r1=1.2&r2=1.3
Index: qt-dbus-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-dbus-4.4.0_rc1.ebuild 20 Dec 2007 13:32:00 -0000 1.2
+++ qt-dbus-4.4.0_rc1.ebuild 20 Dec 2007 16:05:52 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.2 2007/12/20 13:32:00 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.3 2007/12/20 16:05:52 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -121,3 +121,16 @@
dodir ${QTPCDIR}
mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
}
+
+pkg_postinst()
+{
+ # Need to add qdbus to QT_CONFIG line
+ sed -i -e "s:qdbus ::g" ${QTDATADIR}/mkspecs/qconfig.pri
+ sed -i -e "s:QT_CONFIG += :QT_CONFIG += qdbus :g" ${QTDATADIR}/mkspecs/qconfig.pri
+}
+
+pkg_postrm()
+{
+ # Need to add qdbus to QT_CONFIG line
+ sed -i -e "s:qdbus::g" ${QTDATADIR}/mkspecs/qconfig.pri
+}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-dbus: qt-dbus-4.4.0_rc1.ebuild
@ 2007-12-21 19:07 Caleb Tennis (caleb)
0 siblings, 0 replies; 5+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 19:07 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 19:07:27
Modified: qt-dbus-4.4.0_rc1.ebuild
Log:
Redo for new structure
(Portage version: 2.1.3.16)
Revision Changes Path
1.4 x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?r1=1.3&r2=1.4
Index: qt-dbus-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-dbus-4.4.0_rc1.ebuild 20 Dec 2007 16:05:52 -0000 1.3
+++ qt-dbus-4.4.0_rc1.ebuild 21 Dec 2007 19:07:27 -0000 1.4
@@ -1,11 +1,11 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.3 2007/12/20 16:05:52 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.4 2007/12/21 19:07:27 caleb Exp $
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit qt4-build
SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+DESCRIPTION="The DBus module for the Qt toolkit."
HOMEPAGE="http://www.trolltech.com/"
MY_PV=${PV/_rc/-tp}
@@ -17,120 +17,45 @@
SLOT="4"
KEYWORDS="~x86"
-IUSE="debug"
+# depend on gui instead of core. There's a GUI based viewer that's built, and since it's a desktop
+# protocol I don't know if there's value trying to derive it out into a core build
+# The library itself, however, only depends on core and xml
-RDEPEND="=x11-libs/qt-4.4.0_rc1
- dbus? ( >=sys-apps/dbus-1.0.2 )"
+RDEPEND="~x11-libs/qt-core-4.4.0_rc1
+ >=sys-apps/dbus-1.0.2"
DEPEND="${RDEPEND}"
-pkg_setup() {
- QTBASEDIR=/usr/$(get_libdir)/qt4
- QTPREFIXDIR=/usr
- QTBINDIR=/usr/bin
- QTLIBDIR=/usr/$(get_libdir)/qt4
- QTPCDIR=/usr/$(get_libdir)/pkgconfig
- QTDATADIR=/usr/share/qt4
- QTDOCDIR=/usr/share/doc/${PF}
- QTHEADERDIR=/usr/include/qt4
- QTPLUGINDIR=${QTLIBDIR}/plugins
- QTSYSCONFDIR=/etc/qt4
- QTTRANSDIR=${QTDATADIR}/translations
- QTEXAMPLESDIR=${QTDATADIR}/examples
- QTDEMOSDIR=${QTDATADIR}/demos
-}
-
src_unpack() {
+ qt4-build_src_unpack
- unpack ${A}
- cd "${S}"
-
- # Don't let the user go too overboard with flags. If you really want to, uncomment
- # out the line below and give 'er a whirl.
- strip-flags
- replace-flags -O3 -O2
-
- if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
- ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
- append-flags -fno-stack-protector
- fi
-
- # Override the creation of qmake and copy over the one from the system. This speeds up compilation time a lot.
- epatch "${FILESDIR}"/configure.patch
- cp ${QTBINDIR}/qmake "${S}"/bin/qmake
+ skip_qmake_build_patch
+ skip_project_generation_patch
+ install_binaries_to_buildtree
}
src_compile() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
+ local myconf=$(standard_configure_options)
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
-
- # Disable visibility explicitly if gcc version isn't 4
- if [[ "$(gcc-major-version)" != "4" ]]; then
- myconf="${myconf} -no-reduce-exports"
- fi
-
- # Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other
- # cases. From bug #178535
- myconf="${myconf} -fast -reduce-relocations -qdbus"
- use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
- myconf="${myconf} -nomake examples -nomake demos"
-
- myconf="-stl -verbose -largefile -confirm-license \
- -no-rpath \
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
- -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
- -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
- -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
+ myconf="${myconf} -qdbus"
echo ./configure ${myconf}
./configure ${myconf} || die
- # Edit the .qmake.cache file
- sed -i -e "s:QMAKE_MOC:\#QMAKE_MOC:g" "${S}"/.qmake.cache
- sed -i -e "s:QMAKE_UIC:\#QMAKE_UIC:g" "${S}"/.qmake.cache
- sed -i -e "s:QMAKE_RCC:\#QMAKE_RCC:g" "${S}"/.qmake.cache
-
- cd "${S}"/src/qdbus
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die
-
- cd "${S}"/tools/qdbus
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die
+ build_directories src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp
}
src_install() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- cd "${S}"/src/qdbus
- emake INSTALL_ROOT="${D}" install || die
-
- cd "${S}"/tools/qdbus
- emake INSTALL_ROOT="${D}" install || die
-
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
- sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
- # Move .pc files into the pkgconfig directory
- dodir ${QTPCDIR}
- mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
+ install_directories src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp
+ fix_library_files
}
pkg_postinst()
{
- # Need to add qdbus to QT_CONFIG line
- sed -i -e "s:qdbus ::g" ${QTDATADIR}/mkspecs/qconfig.pri
- sed -i -e "s:QT_CONFIG += :QT_CONFIG += qdbus :g" ${QTDATADIR}/mkspecs/qconfig.pri
+ qconfig_add_option qdbus
}
pkg_postrm()
{
- # Need to add qdbus to QT_CONFIG line
- sed -i -e "s:qdbus::g" ${QTDATADIR}/mkspecs/qconfig.pri
+ qconfig_remove_option qdbus
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-dbus: qt-dbus-4.4.0_rc1.ebuild
@ 2007-12-22 16:38 Caleb Tennis (caleb)
0 siblings, 0 replies; 5+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-22 16:38 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/22 16:38:48
Modified: qt-dbus-4.4.0_rc1.ebuild
Log:
New ebuild structure
(Portage version: 2.1.3.16)
Revision Changes Path
1.5 x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?r1=1.4&r2=1.5
Index: qt-dbus-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-dbus-4.4.0_rc1.ebuild 21 Dec 2007 19:07:27 -0000 1.4
+++ qt-dbus-4.4.0_rc1.ebuild 22 Dec 2007 16:38:47 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.4 2007/12/21 19:07:27 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.5 2007/12/22 16:38:47 caleb Exp $
inherit qt4-build
@@ -26,6 +26,8 @@
DEPEND="${RDEPEND}"
+QT4_TARGET_DIRECTORIES="src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp"
+
src_unpack() {
qt4-build_src_unpack
@@ -42,12 +44,7 @@
echo ./configure ${myconf}
./configure ${myconf} || die
- build_directories src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp
-}
-
-src_install() {
- install_directories src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp
- fix_library_files
+ build_target_directories
}
pkg_postinst()
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-dbus: qt-dbus-4.4.0_rc1.ebuild
@ 2007-12-23 20:08 Caleb Tennis (caleb)
0 siblings, 0 replies; 5+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-23 20:08 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/23 20:08:29
Modified: qt-dbus-4.4.0_rc1.ebuild
Log:
Also commit qdbus utility
(Portage version: 2.1.3.16)
Revision Changes Path
1.6 x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild?r1=1.5&r2=1.6
Index: qt-dbus-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt-dbus-4.4.0_rc1.ebuild 22 Dec 2007 16:38:47 -0000 1.5
+++ qt-dbus-4.4.0_rc1.ebuild 23 Dec 2007 20:08:29 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.5 2007/12/22 16:38:47 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/qt-dbus-4.4.0_rc1.ebuild,v 1.6 2007/12/23 20:08:29 caleb Exp $
inherit qt4-build
@@ -26,7 +26,7 @@
DEPEND="${RDEPEND}"
-QT4_TARGET_DIRECTORIES="src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp"
+QT4_TARGET_DIRECTORIES="src/qdbus tools/qdbus/qdbuscpp2xml tools/qdbus/qdbusxml2cpp tools/qdbus/qdbus"
src_unpack() {
qt4-build_src_unpack
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-12-23 20:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-20 13:32 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-dbus: qt-dbus-4.4.0_rc1.ebuild Caleb Tennis (caleb)
-- strict thread matches above, loose matches on Subject: below --
2007-12-20 16:05 Caleb Tennis (caleb)
2007-12-21 19:07 Caleb Tennis (caleb)
2007-12-22 16:38 Caleb Tennis (caleb)
2007-12-23 20:08 Caleb Tennis (caleb)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox