From: "Michael Palimaka (kensington)" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: qt-core-4.8.4-r1.ebuild ChangeLog
Date: Thu, 3 Jan 2013 15:30:58 +0000 (UTC) [thread overview]
Message-ID: <20130103153058.84BAD2171D@flycatcher.gentoo.org> (raw)
kensington 13/01/03 15:30:58
Modified: ChangeLog
Added: qt-core-4.8.4-r1.ebuild
Log:
Revision bump making use of subslots for dev-libs/icu, to solve linkage issues like in bug #449250.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Revision Changes Path
1.203 x11-libs/qt-core/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.203&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.203&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.202&r2=1.203
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- ChangeLog 31 Dec 2012 05:50:06 -0000 1.202
+++ ChangeLog 3 Jan 2013 15:30:58 -0000 1.203
@@ -1,6 +1,13 @@
# ChangeLog for x11-libs/qt-core
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.202 2012/12/31 05:50:06 pesa Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.203 2013/01/03 15:30:58 kensington Exp $
+
+*qt-core-4.8.4-r1 (03 Jan 2013)
+
+ 03 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+ +qt-core-4.8.4-r1.ebuild:
+ Revision bump making use of subslots for dev-libs/icu, to solve linkage issues
+ like in bug #449250.
31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
Cleanup metadata.
1.1 x11-libs/qt-core/qt-core-4.8.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.8.4-r1.ebuild?rev=1.1&content-type=text/plain
Index: qt-core-4.8.4-r1.ebuild
===================================================================
# Copyright 1999-2013 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.8.4-r1.ebuild,v 1.1 2013/01/03 15:30:58 kensington Exp $
EAPI=5
inherit qt4-build
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
SLOT="4"
if [[ ${QT4_BUILD_TYPE} == live ]]; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
IUSE="+glib iconv icu qt3support ssl"
DEPEND="
sys-libs/zlib
glib? ( dev-libs/glib:2 )
icu? ( >=dev-libs/icu-49:= )
ssl? ( dev-libs/openssl )
!<x11-libs/cairo-1.10.2-r2
!x11-libs/qt:4
"
RDEPEND="${DEPEND}"
PDEPEND="
qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support] )
"
PATCHES=(
"${FILESDIR}/moc-workaround-for-boost-1.48.patch"
)
pkg_setup() {
QT4_TARGET_DIRECTORIES="
src/tools/bootstrap
src/tools/moc
src/tools/rcc
src/tools/uic
src/corelib
src/xml
src/network
src/plugins/codecs
tools/linguist/lconvert
tools/linguist/lrelease
tools/linguist/lupdate"
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
include/Qt
include/QtCore
include/QtDeclarative
include/QtGui
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/3rdparty/easing
src/3rdparty/zlib_dependency.pri
src/declarative
src/gui
src/script
tools/shared
tools/linguist/shared
translations"
qt4-build_pkg_setup
}
src_prepare() {
# 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
qt4-build_src_prepare
# bug 172219
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
# bug 427782
sed -i -e "/^CPPFLAGS/s/-g//" \
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
-e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
"${S}/configure" || die "sed configure setBootstrapVariable failed"
}
src_configure() {
myconf+="
-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
$(qt_use glib)
$(qt_use iconv)
$(qt_use icu)
$(use ssl && echo -openssl-linked || echo -no-openssl)
$(qt_use qt3support)"
qt4-build_src_configure
}
src_install() {
dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
install_directories src/{corelib,xml,network,plugins/codecs}
emake INSTALL_ROOT="${D}" install_mkspecs
# install private headers
insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
# use freshly built libraries
local DYLD_FPATH=
[[ -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 "generating translations failed"
insinto "${QTTRANSDIR#${EPREFIX}}"
doins translations/*.qm
setqtenv
fix_library_files
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do
libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
done
cat <<-EOF > "${T}"/44qt4
LDPATH="${libdirs:1}"
EOF
doenvd "${T}"/44qt4
dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
|| 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
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
QCONFIG_DEFINE="QT_ZLIB"
install_qconfigs
# remove .la files
prune_libtool_files
keepdir "${QTSYSCONFDIR#${EPREFIX}}"
# Framework magic
fix_includes
}
next reply other threads:[~2013-01-03 15:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-03 15:30 Michael Palimaka (kensington) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-26 9:01 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: qt-core-4.8.4-r1.ebuild ChangeLog Davide Pesavento (pesa)
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=20130103153058.84BAD2171D@flycatcher.gentoo.org \
--to=kensington@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