From: "Markos Chandras (hwoarang)" <hwoarang@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: qt-core-4.4.2-r2.ebuild ChangeLog
Date: Sat, 14 Feb 2009 15:09:31 +0000 [thread overview]
Message-ID: <E1LYM95-0005Md-KJ@stork.gentoo.org> (raw)
hwoarang 09/02/14 15:09:31
Modified: ChangeLog
Added: qt-core-4.4.2-r2.ebuild
Log:
revbump with a couple of patches from qt-copy
(Portage version: 2.1.6.7/cvs/Linux i686)
Revision Changes Path
1.29 x11-libs/qt-core/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.28&r2=1.29
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog 14 Feb 2009 00:04:03 -0000 1.28
+++ ChangeLog 14 Feb 2009 15:09:31 -0000 1.29
@@ -1,6 +1,14 @@
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.28 2009/02/14 00:04:03 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.29 2009/02/14 15:09:31 hwoarang Exp $
+
+*qt-core-4.4.2-r2 (14 Feb 2009)
+
+ 14 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
+ +files/0167-fix-group-reading.diff,
+ +files/0253-qmake_correct_path_separators.diff,
+ +files/0257-qurl-validate-speedup.diff, +qt-core-4.4.2-r2.ebuild:
+ revbump with a couple of patches from qt-copy
14 Feb 2009; Ben de Groot <yngwin@gentoo.org> qt-core-4.5.0_rc1:
Correct <qt-4.4.0 blocker
1.1 x11-libs/qt-core/qt-core-4.4.2-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.2-r2.ebuild?rev=1.1&content-type=text/plain
Index: qt-core-4.4.2-r2.ebuild
===================================================================
# Copyright 1999-2009 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.4.2-r2.ebuild,v 1.1 2009/02/14 15:09:31 hwoarang Exp $
EAPI="1"
inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
HOMEPAGE="http://www.trolltech.com/"
LICENSE="|| ( GPL-3 GPL-2 )"
SLOT="4"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="doc +glib +qt3support +ssl"
RDEPEND="sys-libs/zlib
glib? ( dev-libs/glib )
ssl? ( dev-libs/openssl )
!<=x11-libs/qt-4.4.0_alpha:${SLOT}"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV} )"
QT4_TARGET_DIRECTORIES="
src/tools/moc/
src/tools/rcc/
src/tools/uic/
src/corelib/
src/xml/
src/network/
src/plugins/codecs/"
QT4_EXTRACT_DIRECTORIES="
include/Qt/
include/QtCore/
include/QtNetwork/
include/QtScript/
include/QtXml/
src/plugins/plugins.pro
src/plugins/qpluginbase.pri
src/src.pro
src/3rdparty/des/
src/3rdparty/harfbuzz/
src/3rdparty/md4/
src/3rdparty/md5/
src/3rdparty/sha1/
src/script/
translations/"
pkg_setup() {
qt4-build_pkg_setup
if has_version x11-libs/qt-core; then
# Check to see if they've changed the glib flag since the last time installing this package.
if use glib && ! built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
elif ! use glib && built_with_use x11-libs/qt-core glib && has_version x11-libs/qt-gui; then
ewarn "You have changed the \"glib\" use flag since the last time you have emerged this package."
ewarn "You should also re-emerge x11-libs/qt-gui in order for it to pick up this change."
fi
# Check to see if they've changed the qt3support flag since the last time installing this package.
# If so, give a list of packages they need to uninstall first.
if use qt3support && ! built_with_use x11-libs/qt-core qt3support; then
local need_to_remove
ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
for x in sql opengl gui qt3support; do
local pkg="x11-libs/qt-${x}"
if has_version $pkg; then
need_to_remove="${need_to_remove} ${pkg}"
fi
done
if [[ -n ${need_to_remove} ]]; then
die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
fi
elif ! use qt3support && built_with_use x11-libs/qt-core qt3support; then
local need_to_remove
ewarn "You have changed the \"qt3support\" use flag since the last time you have emerged this package."
for x in sql opengl gui qt3support; do
local pkg="x11-libs/qt-${x}"
if has_version $pkg; then
need_to_remove="${need_to_remove} ${pkg}"
fi
done
if [[ -n ${need_to_remove} ]]; then
die "You must first uninstall these packages before continuing: \n\t\t${need_to_remove}"
fi
fi
fi
}
src_unpack() {
use doc && QT4_EXTRACT_DIRECTORIES="${QT4_EXTRACT_DIRECTORIES}
doc/
tools/qdoc3/"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
${QT4_EXTRACT_DIRECTORIES}"
qt4-build_src_unpack
# Make patches apply...
cd "${S}"
# Apply bugfix patches from qt-copy (KDE)
epatch "${FILESDIR}"/0167-fix-group-reading.diff
epatch "${FILESDIR}"/0253-qmake_correct_path_separators.diff
epatch "${FILESDIR}"/0257-qurl-validate-speedup.diff
# Don't pre-strip, bug 235026
for i in kr jp cn tw ; do
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
done
}
src_compile() {
unset QMAKESPEC
local myconf
myconf="${myconf}
$(qt_use glib)
$(qt_use ssl openssl)
$(qt_use qt3support)"
myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl
-no-svg"
if ! use doc; then
myconf="${myconf} -nomake docs"
fi
qt4-build_src_compile
}
src_install() {
dobin "${S}"/bin/{qmake,moc,rcc,uic} || die "dobin failed."
install_directories src/{corelib,xml,network,plugins/codecs}
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed"
if use doc; then
emake INSTALL_ROOT="${D}" install_htmldocs || die "emake install_htmldocs failed."
fi
emake INSTALL_ROOT="${D}" install_translations || die "emake install_translations failed"
fix_library_files
# List all the multilib libdirs
local libdirs
for libdir in $(get_all_libdirs); do
libdirs="${libdirs}:/usr/${libdir}/qt4"
done
cat <<-EOF > "${T}/44qt4"
LDPATH=${libdirs:1}
EOF
doenvd "${T}/44qt4"
dodir /${QTDATADIR}/mkspecs/gentoo
mv "${D}"/${QTDATADIR}/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo || \
die "Failed to move qconfig.pri"
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."
if use glib; then
QCONFIG_DEFINE="$(use glib && echo QT_GLIB)
$(use ssl && echo QT_OPENSSL)"
install_qconfigs
fi
keepdir "${QTSYSCONFDIR}"
}
next reply other threads:[~2009-02-14 15:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-14 15:09 Markos Chandras (hwoarang) [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-04-05 14:17 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: qt-core-4.4.2-r2.ebuild ChangeLog Markus Meier (maekke)
2009-04-05 16:47 Tobias Klausmann (klausman)
2009-04-09 15:24 Raul Porcel (armin76)
2009-04-11 17:13 Gysbert Wassenaar (nixnut)
2009-04-15 12:16 Brent Baude (ranger)
2009-04-28 15:32 Jeroen Roovers (jer)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1LYM95-0005Md-KJ@stork.gentoo.org \
--to=hwoarang@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox