| 1 |
tampakrap 11/11/28 21:01:19 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qt-gui-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.155 x11-libs/qt-gui/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.155&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.155&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.154&r2=1.155 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v |
| 20 |
retrieving revision 1.154 |
| 21 |
retrieving revision 1.155 |
| 22 |
diff -u -r1.154 -r1.155 |
| 23 |
--- ChangeLog 26 Nov 2011 20:01:20 -0000 1.154 |
| 24 |
+++ ChangeLog 28 Nov 2011 21:01:19 -0000 1.155 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for x11-libs/qt-gui |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.154 2011/11/26 20:01:20 robbat2 Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.155 2011/11/28 21:01:19 tampakrap Exp $ |
| 30 |
+ |
| 31 |
+*qt-gui-4.7.4-r1 (28 Nov 2011) |
| 32 |
+ |
| 33 |
+ 28 Nov 2011; Theo Chatzimichos <tampakrap@g.o> |
| 34 |
+ +qt-gui-4.7.4-r1.ebuild, +files/qt-gui-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-gui/qt-gui-4.7.4-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: qt-gui-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-gui/qt-gui-4.7.4-r1.ebuild,v 1.1 2011/11/28 21:01:19 tampakrap Exp $ |
| 53 |
|
| 54 |
EAPI="3" |
| 55 |
inherit confutils qt4-build |
| 56 |
|
| 57 |
DESCRIPTION="The GUI module for the Qt toolkit" |
| 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="+accessibility cups dbus egl +glib gtkstyle mng nas nis private-headers qt3support raster tiff trace xinerama" |
| 61 |
|
| 62 |
RDEPEND="media-libs/fontconfig |
| 63 |
media-libs/freetype:2 |
| 64 |
media-libs/libpng:0 |
| 65 |
sys-libs/zlib |
| 66 |
virtual/jpeg |
| 67 |
~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] |
| 68 |
~x11-libs/qt-script-${PV}[aqua=,debug=] |
| 69 |
!aqua? ( |
| 70 |
x11-libs/libX11 |
| 71 |
x11-libs/libXext |
| 72 |
x11-libs/libXrandr |
| 73 |
x11-libs/libXcursor |
| 74 |
x11-libs/libXfont |
| 75 |
x11-libs/libSM |
| 76 |
x11-libs/libXi |
| 77 |
) |
| 78 |
cups? ( net-print/cups ) |
| 79 |
dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) |
| 80 |
gtkstyle? ( x11-libs/gtk+:2[aqua=] ) |
| 81 |
mng? ( >=media-libs/libmng-1.0.9 ) |
| 82 |
nas? ( >=media-libs/nas-1.5 ) |
| 83 |
tiff? ( media-libs/tiff:0 ) |
| 84 |
xinerama? ( x11-libs/libXinerama )" |
| 85 |
DEPEND="${RDEPEND} |
| 86 |
!aqua? ( |
| 87 |
x11-proto/xextproto |
| 88 |
x11-proto/inputproto |
| 89 |
) |
| 90 |
xinerama? ( x11-proto/xineramaproto )" |
| 91 |
RDEPEND="${RDEPEND} |
| 92 |
!~x11-themes/qgtkstyle-4.7.2" |
| 93 |
PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )" |
| 94 |
|
| 95 |
PATCHES=( |
| 96 |
"${FILESDIR}/${PN}-4.7.3-cups.patch" |
| 97 |
"${FILESDIR}/${P}-fix-libreoffice-crash.patch" |
| 98 |
) |
| 99 |
|
| 100 |
pkg_setup() { |
| 101 |
if ! use qt3support; then |
| 102 |
ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support." |
| 103 |
fi |
| 104 |
|
| 105 |
confutils_use_depend_all gtkstyle glib |
| 106 |
|
| 107 |
QT4_TARGET_DIRECTORIES=" |
| 108 |
src/gui |
| 109 |
src/scripttools |
| 110 |
tools/designer |
| 111 |
tools/linguist/linguist |
| 112 |
src/plugins/imageformats/gif |
| 113 |
src/plugins/imageformats/ico |
| 114 |
src/plugins/imageformats/jpeg |
| 115 |
src/plugins/inputmethods" |
| 116 |
|
| 117 |
QT4_EXTRACT_DIRECTORIES=" |
| 118 |
include |
| 119 |
src |
| 120 |
tools/linguist/phrasebooks |
| 121 |
tools/linguist/shared |
| 122 |
tools/shared" |
| 123 |
|
| 124 |
use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" |
| 125 |
use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" |
| 126 |
use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff" |
| 127 |
use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" |
| 128 |
use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace" |
| 129 |
|
| 130 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" |
| 131 |
|
| 132 |
qt4-build_pkg_setup |
| 133 |
} |
| 134 |
|
| 135 |
src_prepare() { |
| 136 |
qt4-build_src_prepare |
| 137 |
|
| 138 |
# Don't build plugins this go around, because they depend on qt3support lib |
| 139 |
sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro |
| 140 |
} |
| 141 |
|
| 142 |
src_configure() { |
| 143 |
export PATH="${S}/bin:${PATH}" |
| 144 |
export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" |
| 145 |
|
| 146 |
myconf="$(qt_use accessibility) |
| 147 |
$(qt_use cups) |
| 148 |
$(qt_use glib) |
| 149 |
$(qt_use mng libmng system) |
| 150 |
$(qt_use nis) |
| 151 |
$(qt_use tiff libtiff system) |
| 152 |
$(qt_use dbus qdbus) |
| 153 |
$(qt_use dbus) |
| 154 |
$(qt_use egl) |
| 155 |
$(qt_use qt3support) |
| 156 |
$(qt_use gtkstyle) |
| 157 |
$(qt_use xinerama)" |
| 158 |
|
| 159 |
use nas && myconf="${myconf} -system-nas-sound" |
| 160 |
use raster && myconf="${myconf} -graphicssystem raster" |
| 161 |
|
| 162 |
myconf="${myconf} -qt-gif -system-libpng -system-libjpeg |
| 163 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 |
| 164 |
-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit |
| 165 |
-no-phonon -no-opengl" |
| 166 |
|
| 167 |
qt4-build_src_configure |
| 168 |
|
| 169 |
if use gtkstyle; then |
| 170 |
einfo "patching the Makefile to fix qgtkstyle compilation" |
| 171 |
sed "s:-I/usr/include/qt4 ::" -i src/gui/Makefile || |
| 172 |
die "sed failed" |
| 173 |
fi |
| 174 |
einfo "patching the Makefile to fix bug #361277" |
| 175 |
sed "s:-I/usr/include/qt4/QtGui ::" -i src/gui/Makefile || |
| 176 |
die "sed failed" |
| 177 |
} |
| 178 |
|
| 179 |
src_install() { |
| 180 |
QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig |
| 181 |
$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas) |
| 182 |
gif png system-png system-jpeg |
| 183 |
$(use mng && echo system-mng) |
| 184 |
$(use tiff && echo system-tiff)" |
| 185 |
QCONFIG_REMOVE="no-gif no-png" |
| 186 |
QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) |
| 187 |
$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG |
| 188 |
$(use mng && echo QT_IMAGEFORMAT_MNG) |
| 189 |
$(use nas && echo QT_NAS) |
| 190 |
$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE |
| 191 |
$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR |
| 192 |
$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER" |
| 193 |
|
| 194 |
qt4-build_src_install |
| 195 |
|
| 196 |
# remove unnecessary Windows headers |
| 197 |
rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/qwindowdefs_win.h |
| 198 |
# remove Mac OS X headers |
| 199 |
use aqua || rm -f \ |
| 200 |
"${D}${QTHEADERDIR}"/{Qt,QtGui}/qmacstyle_mac.h \ |
| 201 |
"${D}${QTHEADERDIR}"/QtGui/QMacStyle |
| 202 |
|
| 203 |
# qt-creator |
| 204 |
# some qt-creator headers are located |
| 205 |
# under /usr/include/qt4/QtDesigner/private. |
| 206 |
# those headers are just includes of the headers |
| 207 |
# which are located under tools/designer/src/lib/* |
| 208 |
# So instead of installing both, we create the private folder |
| 209 |
# and drop tools/designer/src/lib/* headers in it. |
| 210 |
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
| 211 |
insinto "${QTLIBDIR#${EPREFIX}}"/QtDesigner.framework/Headers/private/ |
| 212 |
else |
| 213 |
insinto "${QTHEADERDIR#${EPREFIX}}"/QtDesigner/private/ |
| 214 |
fi |
| 215 |
doins "${S}"/tools/designer/src/lib/shared/* || die |
| 216 |
doins "${S}"/tools/designer/src/lib/sdk/* || die |
| 217 |
#install private headers |
| 218 |
if use private-headers; then |
| 219 |
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
| 220 |
insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ |
| 221 |
else |
| 222 |
insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private |
| 223 |
fi |
| 224 |
find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \; |
| 225 |
fi |
| 226 |
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then |
| 227 |
# rerun to get links to headers right |
| 228 |
fix_includes |
| 229 |
fi |
| 230 |
|
| 231 |
# install correct designer and linguist icons, bug 241208 |
| 232 |
doicon tools/linguist/linguist/images/icons/linguist-128-32.png \ |
| 233 |
tools/designer/src/designer/images/designer.png \ |
| 234 |
|| die "doicon failed" |
| 235 |
# Note: absolute image path required here! |
| 236 |
make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \ |
| 237 |
"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \ |
| 238 |
'Qt;Development;GUIDesigner' \ |
| 239 |
|| die "linguist make_desktop_entry failed" |
| 240 |
make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \ |
| 241 |
"${EPREFIX}"/usr/share/pixmaps/designer.png \ |
| 242 |
'Qt;Development;GUIDesigner' \ |
| 243 |
|| die "designer make_desktop_entry failed" |
| 244 |
} |
Archives