summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2013-04-20 07:47:14 +0000
committerDavide Pesavento <pesa@gentoo.org>2013-04-20 07:47:14 +0000
commita30e96fa7d6bbc43f550c8e450072a86fec7ff37 (patch)
treecfe8d1240ca4a758d15bbcfd9369b3d8ed5a910d /dev-qt/qtcore
parentversion bump (diff)
downloadgentoo-2-a30e96fa7d6bbc43f550c8e450072a86fec7ff37.tar.gz
gentoo-2-a30e96fa7d6bbc43f550c8e450072a86fec7ff37.tar.bz2
gentoo-2-a30e96fa7d6bbc43f550c8e450072a86fec7ff37.zip
old
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)
Diffstat (limited to 'dev-qt/qtcore')
-rw-r--r--dev-qt/qtcore/ChangeLog6
-rw-r--r--dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch11
-rw-r--r--dev-qt/qtcore/qtcore-4.8.4-r2.ebuild181
3 files changed, 5 insertions, 193 deletions
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index b63730254d83..333583c41622 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-qt/qtcore
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.13 2013/04/08 15:04:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.14 2013/04/20 07:47:13 pesa Exp $
+
+ 20 Apr 2013; Davide Pesavento <pesa@gentoo.org>
+ -files/moc-workaround-for-boost-1.48.patch, -qtcore-4.8.4-r2.ebuild:
+ old
08 Apr 2013; Davide Pesavento <pesa@gentoo.org> qtcore-4.8.4-r2.ebuild,
qtcore-4.8.4-r4.ebuild, qtcore-4.8.4-r5.ebuild:
diff --git a/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch b/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch
deleted file mode 100644
index 8d92ca9c283c..000000000000
--- a/dev-qt/qtcore/files/moc-workaround-for-boost-1.48.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp
---- qt-everywhere-opensource-src-4.8.1.orig/src/tools/moc/main.cpp 2012-05-04 18:45:34.122912347 +0200
-+++ qt-everywhere-opensource-src-4.8.1/src/tools/moc/main.cpp 2012-05-04 18:51:28.267484929 +0200
-@@ -187,6 +187,7 @@
- Moc moc;
- pp.macros["Q_MOC_RUN"];
- pp.macros["__cplusplus"];
-+ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; // Gentoo bug #401551
- QByteArray filename;
- QByteArray output;
- FILE *in = 0;
diff --git a/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild
deleted file mode 100644
index afc35a7b3113..000000000000
--- a/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.4-r2.ebuild,v 1.4 2013/04/08 15:04:10 pesa Exp $
-
-EAPI=5
-
-inherit qt4-build
-
-DESCRIPTION="Cross-platform 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
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
- qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
-"
-
-PATCHES=(
- "${FILESDIR}/moc-workaround-for-boost-1.48.patch"
- "${FILESDIR}/set-pkg-config-locations-directly-to-install-dir.patch"
- "${FILESDIR}/CVE-2013-0254.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
-}