| 1 |
wired 10/11/06 09:19:59 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: qt-gui-4.7.0-r1.ebuild |
| 5 |
Log: |
| 6 |
added fix for qtreeview regression |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.122 x11-libs/qt-gui/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.122&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?rev=1.122&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/ChangeLog?r1=1.121&r2=1.122 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v |
| 20 |
retrieving revision 1.121 |
| 21 |
retrieving revision 1.122 |
| 22 |
diff -u -r1.121 -r1.122 |
| 23 |
--- ChangeLog 5 Nov 2010 18:16:37 -0000 1.121 |
| 24 |
+++ ChangeLog 6 Nov 2010 09:19:59 -0000 1.122 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for x11-libs/qt-gui |
| 27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.121 2010/11/05 18:16:37 jer Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.122 2010/11/06 09:19:59 wired Exp $ |
| 30 |
+ |
| 31 |
+*qt-gui-4.7.0-r1 (06 Nov 2010) |
| 32 |
+ |
| 33 |
+ 06 Nov 2010; Alex Alexander <wired@g.o> +qt-gui-4.7.0-r1.ebuild, |
| 34 |
+ +files/qt-gui-4.7.0-qtreeview-regression-fix.patch: |
| 35 |
+ added fix for qtreeview regression |
| 36 |
|
| 37 |
05 Nov 2010; Jeroen Roovers <jer@g.o> qt-gui-4.6.3.ebuild: |
| 38 |
Stable for HPPA (bug #341703). |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: qt-gui-4.7.0-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2010 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.7.0-r1.ebuild,v 1.1 2010/11/06 09:19:59 wired Exp $ |
| 52 |
|
| 53 |
EAPI="3" |
| 54 |
inherit confutils qt4-build |
| 55 |
|
| 56 |
DESCRIPTION="The GUI module for the Qt toolkit" |
| 57 |
SLOT="4" |
| 58 |
KEYWORDS="~alpha ~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" |
| 59 |
IUSE="+accessibility cups dbus egl +glib gtk mng nas nis private-headers qt3support +raster tiff trace xinerama" |
| 60 |
|
| 61 |
RDEPEND="media-libs/fontconfig |
| 62 |
media-libs/freetype:2 |
| 63 |
media-libs/jpeg:0 |
| 64 |
media-libs/libpng |
| 65 |
sys-libs/zlib |
| 66 |
~x11-libs/qt-core-${PV}[aqua=,debug=,glib=,qt3support=] |
| 67 |
~x11-libs/qt-script-${PV}[aqua=,debug=] |
| 68 |
!aqua? ( |
| 69 |
x11-libs/libX11 |
| 70 |
x11-libs/libXext |
| 71 |
x11-libs/libXrandr |
| 72 |
x11-libs/libXcursor |
| 73 |
x11-libs/libXfont |
| 74 |
x11-libs/libSM |
| 75 |
x11-libs/libXi |
| 76 |
) |
| 77 |
cups? ( net-print/cups ) |
| 78 |
dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] ) |
| 79 |
gtk? ( x11-libs/gtk+:2[aqua=] ) |
| 80 |
mng? ( >=media-libs/libmng-1.0.9 ) |
| 81 |
nas? ( >=media-libs/nas-1.5 ) |
| 82 |
tiff? ( media-libs/tiff ) |
| 83 |
xinerama? ( x11-libs/libXinerama )" |
| 84 |
DEPEND="${RDEPEND} |
| 85 |
!aqua? ( |
| 86 |
x11-proto/xextproto |
| 87 |
x11-proto/inputproto |
| 88 |
) |
| 89 |
gtk? ( || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) ) |
| 90 |
xinerama? ( x11-proto/xineramaproto )" |
| 91 |
PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,debug=] )" |
| 92 |
|
| 93 |
pkg_setup() { |
| 94 |
if ! use qt3support; then |
| 95 |
ewarn "WARNING: if you need 'qtconfig', you _must_ enable qt3support." |
| 96 |
fi |
| 97 |
|
| 98 |
confutils_use_depend_all gtk glib |
| 99 |
|
| 100 |
QT4_TARGET_DIRECTORIES=" |
| 101 |
src/gui |
| 102 |
src/scripttools |
| 103 |
tools/designer |
| 104 |
tools/linguist/linguist |
| 105 |
src/plugins/imageformats/gif |
| 106 |
src/plugins/imageformats/ico |
| 107 |
src/plugins/imageformats/jpeg |
| 108 |
src/plugins/inputmethods" |
| 109 |
|
| 110 |
QT4_EXTRACT_DIRECTORIES=" |
| 111 |
include |
| 112 |
src |
| 113 |
tools/linguist/phrasebooks |
| 114 |
tools/linguist/shared |
| 115 |
tools/shared" |
| 116 |
|
| 117 |
use dbus && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} tools/qdbus/qdbusviewer" |
| 118 |
use mng && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/mng" |
| 119 |
use tiff && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/imageformats/tiff" |
| 120 |
use accessibility && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/accessible/widgets" |
| 121 |
use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src/plugins/graphicssystems/trace" |
| 122 |
|
| 123 |
QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" |
| 124 |
|
| 125 |
qt4-build_pkg_setup |
| 126 |
} |
| 127 |
|
| 128 |
src_prepare() { |
| 129 |
qt4-build_src_prepare |
| 130 |
|
| 131 |
# Don't build plugins this go around, because they depend on qt3support lib |
| 132 |
sed -i -e "s:CONFIG(shared:# &:g" "${S}"/tools/designer/src/src.pro |
| 133 |
|
| 134 |
# http://bugreports.qt.nokia.com/browse/QTBUG-13567 |
| 135 |
epatch "${FILESDIR}"/"${P}"-qtreeview-regression-fix.patch |
| 136 |
} |
| 137 |
|
| 138 |
src_configure() { |
| 139 |
export PATH="${S}/bin:${PATH}" |
| 140 |
export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" |
| 141 |
|
| 142 |
myconf="$(qt_use accessibility) |
| 143 |
$(qt_use cups) |
| 144 |
$(qt_use glib) |
| 145 |
$(qt_use mng libmng system) |
| 146 |
$(qt_use nis) |
| 147 |
$(qt_use tiff libtiff system) |
| 148 |
$(qt_use dbus qdbus) |
| 149 |
$(qt_use dbus) |
| 150 |
$(qt_use egl) |
| 151 |
$(qt_use qt3support) |
| 152 |
$(qt_use gtk gtkstyle) |
| 153 |
$(qt_use xinerama)" |
| 154 |
|
| 155 |
use nas && myconf="${myconf} -system-nas-sound" |
| 156 |
use raster && myconf="${myconf} -graphicssystem raster" |
| 157 |
|
| 158 |
myconf="${myconf} -qt-gif -system-libpng -system-libjpeg |
| 159 |
-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 |
| 160 |
-no-sql-odbc -xrender -xrandr -xkb -xshape -sm -no-svg -no-webkit |
| 161 |
-no-phonon -no-opengl" |
| 162 |
|
| 163 |
qt4-build_src_configure |
| 164 |
} |
| 165 |
|
| 166 |
src_install() { |
| 167 |
QCONFIG_ADD="x11sm xshape xcursor xfixes xrandr xrender xkb fontconfig |
| 168 |
$(usev accessibility) $(usev xinerama) $(usev cups) $(usev nas) |
| 169 |
gif png system-png system-jpeg |
| 170 |
$(use mng && echo system-mng) |
| 171 |
$(use tiff && echo system-tiff)" |
| 172 |
QCONFIG_REMOVE="no-gif no-png" |
| 173 |
QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY) |
| 174 |
$(use cups && echo QT_CUPS) QT_FONTCONFIG QT_IMAGEFORMAT_JPEG |
| 175 |
$(use mng && echo QT_IMAGEFORMAT_MNG) |
| 176 |
$(use nas && echo QT_NAS) |
| 177 |
$(use nis && echo QT_NIS) QT_IMAGEFORMAT_PNG QT_SESSIONMANAGER QT_SHAPE |
| 178 |
$(use tiff && echo QT_IMAGEFORMAT_TIFF) QT_XCURSOR |
| 179 |
$(use xinerama && echo QT_XINERAMA) QT_XFIXES QT_XKB QT_XRANDR QT_XRENDER" |
| 180 |
|
| 181 |
qt4-build_src_install |
| 182 |
|
| 183 |
# remove some unnecessary headers |
| 184 |
rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \ |
| 185 |
"${D}${QTHEADERDIR}"/QtGui/QMacStyle |
| 186 |
|
| 187 |
# qt-creator |
| 188 |
# some qt-creator headers are located |
| 189 |
# under /usr/include/qt4/QtDesigner/private. |
| 190 |
# those headers are just includes of the headers |
| 191 |
# which are located under tools/designer/src/lib/* |
| 192 |
# So instead of installing both, we create the private folder |
| 193 |
# and drop tools/designer/src/lib/* headers in it. |
| 194 |
dodir /usr/include/qt4/QtDesigner/private/ || die |
| 195 |
insinto /usr/include/qt4/QtDesigner/private/ |
| 196 |
doins "${S}"/tools/designer/src/lib/shared/* || die |
| 197 |
doins "${S}"/tools/designer/src/lib/sdk/* || die |
| 198 |
#install private headers |
| 199 |
if use private-headers; then |
| 200 |
insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private |
| 201 |
find "${S}"/src/gui -type f -name "*_p.h" -exec doins {} \; |
| 202 |
fi |
| 203 |
|
| 204 |
# install correct designer and linguist icons, bug 241208 |
| 205 |
doicon tools/linguist/linguist/images/icons/linguist-128-32.png \ |
| 206 |
tools/designer/src/designer/images/designer.png \ |
| 207 |
|| die "doicon failed" |
| 208 |
# Note: absolute image path required here! |
| 209 |
make_desktop_entry "${EPREFIX}"/usr/bin/linguist Linguist \ |
| 210 |
"${EPREFIX}"/usr/share/pixmaps/linguist-128-32.png \ |
| 211 |
'Qt;Development;GUIDesigner' \ |
| 212 |
|| die "linguist make_desktop_entry failed" |
| 213 |
make_desktop_entry "${EPREFIX}"/usr/bin/designer Designer \ |
| 214 |
"${EPREFIX}"/usr/share/pixmaps/designer.png \ |
| 215 |
'Qt;Development;GUIDesigner' \ |
| 216 |
|| die "designer make_desktop_entry failed" |
| 217 |
} |
Archives