| 1 |
tampakrap 11/11/28 20:48:25 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qt-core-4.7.4-r1.ebuild |
| 5 |
Log: |
| 6 |
Backport patch from Qt 4.8 to fix crash in LibreOffice, as pointed out by scarabeus. FreeDesktop bug 40298 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.146 x11-libs/qt-core/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.146&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?rev=1.146&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/ChangeLog?r1=1.145&r2=1.146 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v |
| 20 |
retrieving revision 1.145 |
| 21 |
retrieving revision 1.146 |
| 22 |
diff -u -r1.145 -r1.146 |
| 23 |
--- ChangeLog 26 Nov 2011 19:59:35 -0000 1.145 |
| 24 |
+++ ChangeLog 28 Nov 2011 20:48:24 -0000 1.146 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for x11-libs/qt-core |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.145 2011/11/26 19:59:35 robbat2 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.146 2011/11/28 20:48:24 tampakrap Exp $ |
| 30 |
+ |
| 31 |
+*qt-core-4.7.4-r1 (28 Nov 2011) |
| 32 |
+ |
| 33 |
+ 28 Nov 2011; Theo Chatzimichos <tampakrap@g.o> |
| 34 |
+ +qt-core-4.7.4-r1.ebuild, +files/qt-core-4.7.4-fix-libreoffice-crash.patch: |
| 35 |
+ Backport patch from Qt 4.8 to fix crash in LibreOffice, as pointed out by |
| 36 |
+ scarabeus. FreeDesktop bug 40298 |
| 37 |
|
| 38 |
26 Nov 2011; Robin H. Johnson <robbat2@g.o> Manifest: |
| 39 |
Bug 385719: upstream altered qt-everywhere-opensource-src-4.7.4.tar.gz, mass |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 x11-libs/qt-core/qt-core-4.7.4-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.4-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-core/qt-core-4.7.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: qt-core-4.7.4-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.7.4-r1.ebuild,v 1.1 2011/11/28 20:48:24 tampakrap Exp $ |
| 53 |
|
| 54 |
EAPI="3" |
| 55 |
inherit qt4-build |
| 56 |
|
| 57 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" |
| 58 |
SLOT="4" |
| 59 |
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" |
| 60 |
IUSE="+glib iconv +jit optimized-qmake private-headers qt3support ssl" |
| 61 |
|
| 62 |
DEPEND="sys-libs/zlib |
| 63 |
glib? ( dev-libs/glib ) |
| 64 |
ssl? ( dev-libs/openssl ) |
| 65 |
!<x11-libs/qt-4.4.0:4" |
| 66 |
RDEPEND="${DEPEND}" |
| 67 |
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support] )" |
| 68 |
|
| 69 |
PATCHES=( |
| 70 |
# bug #382171 |
| 71 |
"${FILESDIR}/blacklist-diginotar-certs.diff" |
| 72 |
"${FILESDIR}/${P}-fix-libreoffice-crash.patch" |
| 73 |
) |
| 74 |
|
| 75 |
pkg_setup() { |
| 76 |
QT4_TARGET_DIRECTORIES=" |
| 77 |
src/tools/bootstrap |
| 78 |
src/tools/moc |
| 79 |
src/tools/rcc |
| 80 |
src/tools/uic |
| 81 |
src/corelib |
| 82 |
src/xml |
| 83 |
src/network |
| 84 |
src/plugins/codecs |
| 85 |
tools/linguist/lconvert |
| 86 |
tools/linguist/lrelease |
| 87 |
tools/linguist/lupdate" |
| 88 |
|
| 89 |
QT4_EXTRACT_DIRECTORIES=" |
| 90 |
include/Qt |
| 91 |
include/QtCore |
| 92 |
include/QtDeclarative |
| 93 |
include/QtGui |
| 94 |
include/QtNetwork |
| 95 |
include/QtScript |
| 96 |
include/QtXml |
| 97 |
src/plugins/plugins.pro |
| 98 |
src/plugins/qpluginbase.pri |
| 99 |
src/src.pro |
| 100 |
src/3rdparty/des |
| 101 |
src/3rdparty/harfbuzz |
| 102 |
src/3rdparty/md4 |
| 103 |
src/3rdparty/md5 |
| 104 |
src/3rdparty/sha1 |
| 105 |
src/3rdparty/easing |
| 106 |
src/3rdparty/zlib_dependency.pri |
| 107 |
src/declarative |
| 108 |
src/gui |
| 109 |
src/script |
| 110 |
tools/shared |
| 111 |
tools/linguist/shared |
| 112 |
translations" |
| 113 |
qt4-build_pkg_setup |
| 114 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} |
| 115 |
${QT4_EXTRACT_DIRECTORIES}" |
| 116 |
} |
| 117 |
|
| 118 |
src_prepare() { |
| 119 |
# Don't pre-strip, bug 235026 |
| 120 |
for i in kr jp cn tw ; do |
| 121 |
echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro |
| 122 |
done |
| 123 |
|
| 124 |
qt4-build_src_prepare |
| 125 |
|
| 126 |
# bug 172219 |
| 127 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \ |
| 128 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed" |
| 129 |
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
| 130 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed" |
| 131 |
} |
| 132 |
|
| 133 |
src_configure() { |
| 134 |
unset QMAKESPEC |
| 135 |
|
| 136 |
myconf="${myconf} |
| 137 |
$(qt_use glib) |
| 138 |
$(qt_use iconv) |
| 139 |
$(qt_use optimized-qmake) |
| 140 |
$(qt_use ssl openssl) |
| 141 |
$(qt_use qt3support) |
| 142 |
$(qt_use jit javascript-jit)" |
| 143 |
|
| 144 |
myconf="${myconf} -no-xkb -no-fontconfig -no-xrender -no-xrandr |
| 145 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
| 146 |
-no-nas-sound -no-dbus -no-cups -no-gif -no-libpng |
| 147 |
-no-libmng -no-libjpeg -system-zlib -no-webkit -no-phonon -no-xmlpatterns |
| 148 |
-no-freetype -no-libtiff -no-accessibility -no-fontconfig -no-opengl |
| 149 |
-no-svg -no-gtkstyle -no-phonon-backend -no-script -no-scripttools |
| 150 |
-no-cups -no-xsync -no-xinput -no-multimedia" |
| 151 |
qt4-build_src_configure |
| 152 |
} |
| 153 |
|
| 154 |
src_compile() { |
| 155 |
# bug 259736 |
| 156 |
unset QMAKESPEC |
| 157 |
qt4-build_src_compile |
| 158 |
} |
| 159 |
|
| 160 |
src_install() { |
| 161 |
dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die "dobin failed" |
| 162 |
|
| 163 |
install_directories src/{corelib,xml,network,plugins/codecs} |
| 164 |
|
| 165 |
emake INSTALL_ROOT="${D}" install_mkspecs || die "emake install_mkspecs failed" |
| 166 |
|
| 167 |
#install private headers |
| 168 |
if use private-headers; then |
| 169 |
insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private |
| 170 |
find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \; |
| 171 |
fi |
| 172 |
# use freshly built libraries |
| 173 |
local DYLD_FPATH= |
| 174 |
[[ -d "${S}"/lib/QtCore.framework ]] \ |
| 175 |
&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done) |
| 176 |
DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \ |
| 177 |
LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts \ |
| 178 |
|| die "generating translations faied" |
| 179 |
insinto "${QTTRANSDIR#${EPREFIX}}" |
| 180 |
doins translations/*.qm || die "doins translations failed" |
| 181 |
|
| 182 |
setqtenv |
| 183 |
fix_library_files |
| 184 |
|
| 185 |
# List all the multilib libdirs |
| 186 |
local libdirs= |
| 187 |
for libdir in $(get_all_libdirs); do |
| 188 |
libdirs+=":${EPREFIX}/usr/${libdir}/qt4" |
| 189 |
done |
| 190 |
|
| 191 |
cat <<-EOF > "${T}/44qt4" |
| 192 |
LDPATH="${libdirs:1}" |
| 193 |
EOF |
| 194 |
doenvd "${T}/44qt4" |
| 195 |
|
| 196 |
dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo || die "dodir failed" |
| 197 |
mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \ |
| 198 |
|| die "Failed to move qconfig.pri" |
| 199 |
|
| 200 |
# Framework hacking |
| 201 |
if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]] ; then |
| 202 |
#TODO do this better |
| 203 |
sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \ |
| 204 |
"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \ |
| 205 |
|| die "sed for qconfig.h failed." |
| 206 |
dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo || |
| 207 |
die "dosym failed" |
| 208 |
else |
| 209 |
sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \ |
| 210 |
"${D}${QTHEADERDIR}"/QtCore/qconfig.h \ |
| 211 |
"${D}${QTHEADERDIR}"/Qt/qconfig.h \ |
| 212 |
|| die "sed for qconfig.h failed" |
| 213 |
fi |
| 214 |
|
| 215 |
if use glib; then |
| 216 |
QCONFIG_DEFINE="$(use glib && echo QT_GLIB) |
| 217 |
$(use ssl && echo QT_OPENSSL)" |
| 218 |
install_qconfigs |
| 219 |
fi |
| 220 |
# remove .la files |
| 221 |
find "${D}${QTLIBDIR}" -name "*.la" -print0 | xargs -0 rm |
| 222 |
|
| 223 |
# remove some unnecessary headers |
| 224 |
rm -f "${D}${QTHEADERDIR}"/{Qt,QtCore}/{\ |
| 225 |
qatomic_windows.h,\ |
| 226 |
qatomic_windowsce.h,\ |
| 227 |
qt_windows.h} |
| 228 |
|
| 229 |
keepdir "${QTSYSCONFDIR#${EPREFIX}}" |
| 230 |
|
| 231 |
# Framework magic |
| 232 |
fix_includes |
| 233 |
} |
Archives