| 1 |
pesa 14/05/28 01:12:25 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qtgui-4.8.5-r2.ebuild |
| 5 |
Log: |
| 6 |
Apply patch for security bug #508984. Add missing deps. |
| 7 |
|
| 8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.23 dev-qt/qtgui/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?rev=1.23&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?rev=1.23&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/ChangeLog?r1=1.22&r2=1.23 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v |
| 20 |
retrieving revision 1.22 |
| 21 |
retrieving revision 1.23 |
| 22 |
diff -u -r1.22 -r1.23 |
| 23 |
--- ChangeLog 23 Apr 2014 11:38:19 -0000 1.22 |
| 24 |
+++ ChangeLog 28 May 2014 01:12:25 -0000 1.23 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for dev-qt/qtgui |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.22 2014/04/23 11:38:19 zlogene Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.23 2014/05/28 01:12:25 pesa Exp $ |
| 30 |
+ |
| 31 |
+*qtgui-4.8.5-r2 (28 May 2014) |
| 32 |
+ |
| 33 |
+ 28 May 2014; Davide Pesavento <pesa@g.o> |
| 34 |
+ +files/qtgui-4.8.5-dont-crash-on-broken-GIF-images.patch, |
| 35 |
+ +qtgui-4.8.5-r2.ebuild: |
| 36 |
+ Apply patch for security bug #508984. Add missing deps. |
| 37 |
|
| 38 |
23 Apr 2014; Mikle Kolyada <zlogene@g.o> metadata.xml: |
| 39 |
Revert metadata. |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 dev-qt/qtgui/qtgui-4.8.5-r2.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r2.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r2.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: qtgui-4.8.5-r2.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2014 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r2.ebuild,v 1.1 2014/05/28 01:12:25 pesa Exp $ |
| 53 |
|
| 54 |
EAPI=5 |
| 55 |
|
| 56 |
inherit eutils qt4-build |
| 57 |
|
| 58 |
DESCRIPTION="The GUI module for the Qt toolkit" |
| 59 |
SLOT="4" |
| 60 |
if [[ ${QT4_BUILD_TYPE} == live ]]; then |
| 61 |
KEYWORDS="" |
| 62 |
else |
| 63 |
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" |
| 64 |
fi |
| 65 |
|
| 66 |
IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv" |
| 67 |
|
| 68 |
REQUIRED_USE=" |
| 69 |
gtkstyle? ( glib ) |
| 70 |
" |
| 71 |
|
| 72 |
# cairo[-qt4] is needed because of bug 454066 |
| 73 |
RDEPEND=" |
| 74 |
app-admin/eselect-qtgraphicssystem |
| 75 |
~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=] |
| 76 |
~dev-qt/qtscript-${PV}[aqua=,debug=] |
| 77 |
media-libs/fontconfig |
| 78 |
media-libs/freetype:2 |
| 79 |
media-libs/libpng:0= |
| 80 |
sys-libs/zlib |
| 81 |
virtual/jpeg:0 |
| 82 |
!aqua? ( |
| 83 |
x11-libs/libICE |
| 84 |
x11-libs/libSM |
| 85 |
x11-libs/libX11 |
| 86 |
x11-libs/libXcursor |
| 87 |
x11-libs/libXext |
| 88 |
x11-libs/libXfixes |
| 89 |
x11-libs/libXi |
| 90 |
x11-libs/libXrandr |
| 91 |
x11-libs/libXrender |
| 92 |
xinerama? ( x11-libs/libXinerama ) |
| 93 |
xv? ( x11-libs/libXv ) |
| 94 |
) |
| 95 |
cups? ( net-print/cups ) |
| 96 |
egl? ( media-libs/mesa[egl] ) |
| 97 |
glib? ( dev-libs/glib:2 ) |
| 98 |
gtkstyle? ( |
| 99 |
x11-libs/cairo[-qt4] |
| 100 |
x11-libs/gtk+:2[aqua=] |
| 101 |
) |
| 102 |
mng? ( >=media-libs/libmng-1.0.9:= ) |
| 103 |
nas? ( >=media-libs/nas-1.5 ) |
| 104 |
tiff? ( media-libs/tiff:0 ) |
| 105 |
!<dev-qt/qthelp-4.8.5:4 |
| 106 |
" |
| 107 |
DEPEND="${RDEPEND} |
| 108 |
!aqua? ( |
| 109 |
x11-proto/inputproto |
| 110 |
x11-proto/xextproto |
| 111 |
xinerama? ( x11-proto/xineramaproto ) |
| 112 |
xv? ( x11-proto/videoproto ) |
| 113 |
) |
| 114 |
" |
| 115 |
PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )" |
| 116 |
|
| 117 |
PATCHES=( |
| 118 |
"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257 |
| 119 |
"${FILESDIR}/${P}-dont-crash-on-broken-GIF-images.patch" # bug 508984 |
| 120 |
"${FILESDIR}/${P}-keyboard-shortcuts.patch" |
| 121 |
) |
| 122 |
|
| 123 |
pkg_setup() { |
| 124 |
QT4_TARGET_DIRECTORIES=" |
| 125 |
src/gui |
| 126 |
src/scripttools |
| 127 |
src/plugins/imageformats/gif |
| 128 |
src/plugins/imageformats/ico |
| 129 |
src/plugins/imageformats/jpeg |
| 130 |
src/plugins/imageformats/tga |
| 131 |
src/plugins/inputmethods" |
| 132 |
|
| 133 |
QT4_EXTRACT_DIRECTORIES=" |
| 134 |
include |
| 135 |
src" |
| 136 |
|
| 137 |
use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets" |
| 138 |
use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng" |
| 139 |
use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff" |
| 140 |
use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay" |
| 141 |
|
| 142 |
# mac version does not contain qtconfig? |
| 143 |
[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig" |
| 144 |
|
| 145 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" |
| 146 |
|
| 147 |
qt4-build_pkg_setup |
| 148 |
} |
| 149 |
|
| 150 |
src_prepare() { |
| 151 |
qt4-build_src_prepare |
| 152 |
|
| 153 |
# Add -xvideo to the list of accepted configure options |
| 154 |
sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die |
| 155 |
} |
| 156 |
|
| 157 |
src_configure() { |
| 158 |
myconf="$(qt_use accessibility) |
| 159 |
$(qt_use cups) |
| 160 |
$(qt_use glib) |
| 161 |
$(qt_use mng libmng system) |
| 162 |
$(qt_use nas nas-sound system) |
| 163 |
$(qt_use nis) |
| 164 |
$(qt_use tiff libtiff system) |
| 165 |
$(qt_use egl) |
| 166 |
$(qt_use qt3support) |
| 167 |
$(qt_use gtkstyle) |
| 168 |
$(qt_use xinerama) |
| 169 |
$(qt_use xv xvideo)" |
| 170 |
|
| 171 |
myconf+=" |
| 172 |
-system-libpng -system-libjpeg -system-zlib |
| 173 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc |
| 174 |
-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb |
| 175 |
-fontconfig -no-svg -no-webkit -no-phonon -no-opengl" |
| 176 |
|
| 177 |
# bug 367045 |
| 178 |
[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3" |
| 179 |
|
| 180 |
qt4-build_src_configure |
| 181 |
|
| 182 |
if use gtkstyle; then |
| 183 |
sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed" |
| 184 |
fi |
| 185 |
|
| 186 |
sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed" |
| 187 |
} |
| 188 |
|
| 189 |
src_install() { |
| 190 |
QCONFIG_ADD=" |
| 191 |
mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync |
| 192 |
fontconfig system-freetype gif png system-png jpeg system-jpeg |
| 193 |
$(usev accessibility) |
| 194 |
$(usev cups) |
| 195 |
$(use mng && echo system-mng) |
| 196 |
$(usev nas) |
| 197 |
$(usev nis) |
| 198 |
$(use tiff && echo system-tiff) |
| 199 |
$(usev xinerama) |
| 200 |
$(use xv && echo xvideo)" |
| 201 |
QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui" |
| 202 |
QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) |
| 203 |
$(use cups && echo QT_CUPS) |
| 204 |
$(use egl && echo QT_EGL) |
| 205 |
QT_FONTCONFIG QT_FREETYPE |
| 206 |
$(use gtkstyle && echo QT_STYLE_GTK) |
| 207 |
QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG |
| 208 |
$(use mng && echo QT_IMAGEFORMAT_MNG) |
| 209 |
$(use nas && echo QT_NAS) |
| 210 |
$(use nis && echo QT_NIS) |
| 211 |
$(use tiff && echo QT_IMAGEFORMAT_TIFF) |
| 212 |
QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES |
| 213 |
$(use xinerama && echo QT_XINERAMA) |
| 214 |
QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC |
| 215 |
$(use xv && echo QT_XVIDEO)" |
| 216 |
|
| 217 |
qt4-build_src_install |
| 218 |
|
| 219 |
# install private headers |
| 220 |
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 221 |
insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/ |
| 222 |
else |
| 223 |
insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private |
| 224 |
fi |
| 225 |
find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} + |
| 226 |
|
| 227 |
if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then |
| 228 |
# rerun to get links to headers right |
| 229 |
fix_includes |
| 230 |
fi |
| 231 |
|
| 232 |
# touch the available graphics systems |
| 233 |
dodir /usr/share/qt4/graphicssystems |
| 234 |
echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die |
| 235 |
echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die |
| 236 |
|
| 237 |
newicon tools/qtconfig/images/appicon.png qtconfig.png |
| 238 |
make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings' |
| 239 |
|
| 240 |
# bug 388551 |
| 241 |
if use gtkstyle; then |
| 242 |
local tempfile=${T}/${PN}${SLOT}.sh |
| 243 |
cat <<-EOF > "${tempfile}" |
| 244 |
export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0 |
| 245 |
EOF |
| 246 |
insinto /etc/profile.d |
| 247 |
doins "${tempfile}" |
| 248 |
fi |
| 249 |
} |
| 250 |
|
| 251 |
pkg_postinst() { |
| 252 |
qt4-build_pkg_postinst |
| 253 |
|
| 254 |
# raster is the default graphicssystem, set it on first install |
| 255 |
eselect qtgraphicssystem set raster --use-old |
| 256 |
} |
Archives