1 |
caleb 08/02/25 14:24:45 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: qt-4.3.4.ebuild |
5 |
Log: |
6 |
4.3.4 version bump |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.514 x11-libs/qt/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.514&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.514&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?r1=1.513&r2=1.514 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v |
19 |
retrieving revision 1.513 |
20 |
retrieving revision 1.514 |
21 |
diff -u -r1.513 -r1.514 |
22 |
--- ChangeLog 23 Feb 2008 15:42:39 -0000 1.513 |
23 |
+++ ChangeLog 25 Feb 2008 14:24:44 -0000 1.514 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-libs/qt |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.513 2008/02/23 15:42:39 ingmar Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.514 2008/02/25 14:24:44 caleb Exp $ |
29 |
+ |
30 |
+*qt-4.3.4 (25 Feb 2008) |
31 |
+ |
32 |
+ 25 Feb 2008; Caleb Tennis <caleb@g.o> +qt-4.3.4.ebuild: |
33 |
+ 4.3.4 version bump |
34 |
|
35 |
23 Feb 2008; Ingmar Vanhassel <ingmar@g.o> qt-3.3.4-r8.ebuild, |
36 |
qt-3.3.8-r4.ebuild: |
37 |
|
38 |
|
39 |
|
40 |
1.1 x11-libs/qt/qt-4.3.4.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: qt-4.3.4.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2008 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.3.4.ebuild,v 1.1 2008/02/25 14:24:44 caleb Exp $ |
50 |
|
51 |
inherit eutils flag-o-matic toolchain-funcs multilib |
52 |
|
53 |
SRCTYPE="opensource-src" |
54 |
DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." |
55 |
HOMEPAGE="http://www.trolltech.com/" |
56 |
|
57 |
SRC_URI="ftp://ftp.trolltech.com/pub/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz" |
58 |
S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} |
59 |
|
60 |
LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )" |
61 |
SLOT="4" |
62 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
63 |
|
64 |
IUSE_INPUT_DEVICES="input_devices_wacom" |
65 |
|
66 |
IUSE="accessibility cups dbus debug doc examples firebird gif glib jpeg mng mysql nas nis odbc opengl pch png postgres qt3support sqlite sqlite3 ssl tiff xinerama zlib ${IUSE_INPUT_DEVICES}" |
67 |
|
68 |
RDEPEND="x11-libs/libXrandr |
69 |
x11-libs/libXcursor |
70 |
x11-libs/libXfont |
71 |
x11-libs/libSM |
72 |
xinerama? ( x11-libs/libXinerama ) |
73 |
media-libs/fontconfig |
74 |
>=media-libs/freetype-2 |
75 |
png? ( media-libs/libpng ) |
76 |
jpeg? ( media-libs/jpeg ) |
77 |
mng? ( >=media-libs/libmng-1.0.9 ) |
78 |
tiff? ( media-libs/tiff ) |
79 |
nas? ( >=media-libs/nas-1.5 ) |
80 |
odbc? ( dev-db/unixODBC ) |
81 |
mysql? ( virtual/mysql ) |
82 |
firebird? ( dev-db/firebird ) |
83 |
sqlite3? ( =dev-db/sqlite-3* ) |
84 |
sqlite? ( =dev-db/sqlite-2* ) |
85 |
opengl? ( virtual/opengl virtual/glu ) |
86 |
postgres? ( dev-db/libpq ) |
87 |
cups? ( net-print/cups ) |
88 |
zlib? ( sys-libs/zlib ) |
89 |
glib? ( dev-libs/glib ) |
90 |
dbus? ( >=sys-apps/dbus-1.0.2 ) |
91 |
ssl? ( dev-libs/openssl ) |
92 |
input_devices_wacom? ( x11-libs/libXi x11-drivers/linuxwacom )" |
93 |
|
94 |
DEPEND="${RDEPEND} |
95 |
xinerama? ( x11-proto/xineramaproto ) |
96 |
x11-proto/xextproto |
97 |
x11-proto/inputproto |
98 |
dev-util/pkgconfig" |
99 |
|
100 |
pkg_setup() { |
101 |
QTBASEDIR=/usr/$(get_libdir)/qt4 |
102 |
QTPREFIXDIR=/usr |
103 |
QTBINDIR=/usr/bin |
104 |
QTLIBDIR=/usr/$(get_libdir)/qt4 |
105 |
QTPCDIR=/usr/$(get_libdir)/pkgconfig |
106 |
QTDATADIR=/usr/share/qt4 |
107 |
QTDOCDIR=/usr/share/doc/${P} |
108 |
QTHEADERDIR=/usr/include/qt4 |
109 |
QTPLUGINDIR=${QTLIBDIR}/plugins |
110 |
QTSYSCONFDIR=/etc/qt4 |
111 |
QTTRANSDIR=${QTDATADIR}/translations |
112 |
QTEXAMPLESDIR=${QTDATADIR}/examples |
113 |
QTDEMOSDIR=${QTDATADIR}/demos |
114 |
|
115 |
PLATFORM=$(qt_mkspecs_dir) |
116 |
|
117 |
} |
118 |
|
119 |
qt_use() { |
120 |
local flag="$1" |
121 |
local feature="$1" |
122 |
local enableval= |
123 |
|
124 |
[[ -n $2 ]] && feature=$2 |
125 |
[[ -n $3 ]] && enableval="-$3" |
126 |
|
127 |
useq $flag && echo "${enableval}-${feature}" || echo "-no-${feature}" |
128 |
return 0 |
129 |
} |
130 |
|
131 |
qt_mkspecs_dir() { |
132 |
# Allows us to define which mkspecs dir we want to use. |
133 |
local spec |
134 |
|
135 |
case ${CHOST} in |
136 |
*-freebsd*|*-dragonfly*) |
137 |
spec="freebsd" ;; |
138 |
*-openbsd*) |
139 |
spec="openbsd" ;; |
140 |
*-netbsd*) |
141 |
spec="netbsd" ;; |
142 |
*-darwin*) |
143 |
spec="darwin" ;; |
144 |
*-linux-*|*-linux) |
145 |
spec="linux" ;; |
146 |
*) |
147 |
die "Unknown CHOST, no platform choosed." |
148 |
esac |
149 |
|
150 |
CXX=$(tc-getCXX) |
151 |
if [[ ${CXX/g++/} != ${CXX} ]]; then |
152 |
spec="${spec}-g++" |
153 |
elif [[ ${CXX/icpc/} != ${CXX} ]]; then |
154 |
spec="${spec}-icc" |
155 |
else |
156 |
die "Unknown compiler ${CXX}." |
157 |
fi |
158 |
|
159 |
echo "${spec}" |
160 |
} |
161 |
|
162 |
src_unpack() { |
163 |
|
164 |
unpack ${A} |
165 |
cd "${S}" |
166 |
epatch "${FILESDIR}"/qt-4.2.3-hppa-ldcw-fix.patch |
167 |
|
168 |
cd "${S}"/mkspecs/$(qt_mkspecs_dir) |
169 |
# set c/xxflags and ldflags |
170 |
|
171 |
# Don't let the user go too overboard with flags. If you really want to, uncomment |
172 |
# out the line below and give 'er a whirl. |
173 |
strip-flags |
174 |
replace-flags -O3 -O2 |
175 |
|
176 |
if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then |
177 |
ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
178 |
append-flags -fno-stack-protector |
179 |
fi |
180 |
|
181 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
182 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
183 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
184 |
-e "/CONFIG/s:$: nostrip:" \ |
185 |
qmake.conf |
186 |
|
187 |
# Do not link with -rpath. See bug #75181. |
188 |
sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" qmake.conf |
189 |
|
190 |
# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib |
191 |
sed -i -e "s:X11R6/::" qmake.conf |
192 |
|
193 |
# The trolls moved the definitions of the above stuff for g++, so we need to edit those files |
194 |
# separately as well. |
195 |
cd "${S}"/mkspecs/common |
196 |
|
197 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
198 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
199 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
200 |
g++.conf |
201 |
|
202 |
# Do not link with -rpath. See bug #75181. |
203 |
sed -i -e "s:QMAKE_RPATH.*=.*:QMAKE_RPATH=:" g++.conf |
204 |
|
205 |
# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib |
206 |
sed -i -e "s:X11R6/::" linux.conf |
207 |
|
208 |
cd "${S}"/qmake |
209 |
|
210 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ |
211 |
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" Makefile.unix |
212 |
|
213 |
cd "${S}" |
214 |
|
215 |
} |
216 |
|
217 |
src_compile() { |
218 |
export PATH="${S}/bin:${PATH}" |
219 |
export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" |
220 |
|
221 |
[ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" |
222 |
|
223 |
# Disable visibility explicitly if gcc version isn't 4 |
224 |
if [[ "$(gcc-major-version)" != "4" ]]; then |
225 |
myconf="${myconf} -no-reduce-exports" |
226 |
fi |
227 |
|
228 |
# Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other |
229 |
# cases. From bug #178535 |
230 |
myconf="${myconf} -reduce-relocations" |
231 |
|
232 |
myconf="${myconf} $(qt_use accessibility) $(qt_use cups) $(qt_use xinerama)" |
233 |
myconf="${myconf} $(qt_use opengl) $(qt_use nis)" |
234 |
|
235 |
use nas && myconf="${myconf} -system-nas-sound" |
236 |
|
237 |
myconf="${myconf} $(qt_use gif gif qt) $(qt_use png libpng system)" |
238 |
myconf="${myconf} $(qt_use jpeg libjpeg system) $(qt_use tiff libtiff system)" |
239 |
myconf="${myconf} $(qt_use zlib zlib system) $(qt_use mng libmng system)" |
240 |
|
241 |
use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info" |
242 |
|
243 |
use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql" |
244 |
use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/pgsql" || myconf="${myconf} -no-sql-psql" |
245 |
use firebird && myconf="${myconf} -plugin-sql-ibase -I/opt/firebird/include" || myconf="${myconf} -no-sql-ibase" |
246 |
use sqlite3 && myconf="${myconf} -plugin-sql-sqlite -system-sqlite" || myconf="${myconf} -no-sql-sqlite" |
247 |
use sqlite && myconf="${myconf} -plugin-sql-sqlite2" || myconf="${myconf} -no-sql-sqlite2" |
248 |
use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc" |
249 |
|
250 |
use dbus && myconf="${myconf} -qdbus" || myconf="${myconf} -no-qdbus" |
251 |
use glib && myconf="${myconf} -glib" || myconf="${myconf} -no-glib" |
252 |
use qt3support && myconf="${myconf} -qt3support" || myconf="${myconf} -no-qt3support" |
253 |
use ssl && myconf="${myconf} -openssl" || myconf="${myconf} -no-openssl" |
254 |
|
255 |
use pch && myconf="${myconf} -pch" || myconf="${myconf} -no-pch" |
256 |
|
257 |
use input_devices_wacom && myconf="${myconf} -tablet" || myconf="${myconf} -no-tablet" |
258 |
|
259 |
myconf="${myconf} -xrender -xrandr -xkb -xshape -sm" |
260 |
|
261 |
if ! use examples; then |
262 |
myconf="${myconf} -nomake examples" |
263 |
fi |
264 |
|
265 |
myconf="-stl -verbose -largefile -confirm-license \ |
266 |
-platform ${PLATFORM} -xplatform ${PLATFORM} -no-rpath \ |
267 |
-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \ |
268 |
-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \ |
269 |
-sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \ |
270 |
-examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}" |
271 |
|
272 |
echo ./configure ${myconf} |
273 |
./configure ${myconf} || die |
274 |
|
275 |
emake all || die |
276 |
} |
277 |
|
278 |
src_install() { |
279 |
export PATH="${S}/bin:${PATH}" |
280 |
export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" |
281 |
|
282 |
emake INSTALL_ROOT="${D}" install_subtargets || die |
283 |
emake INSTALL_ROOT="${D}" install_qmake || die |
284 |
emake INSTALL_ROOT="${D}" install_mkspecs || die |
285 |
|
286 |
if use doc; then |
287 |
emake INSTALL_ROOT="${D}" install_htmldocs || die |
288 |
fi |
289 |
|
290 |
# Install the translations. This may get use flagged later somehow |
291 |
emake INSTALL_ROOT="${D}" install_translations || die |
292 |
|
293 |
keepdir "${QTSYSCONFDIR}" |
294 |
|
295 |
sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la |
296 |
sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl |
297 |
sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc |
298 |
|
299 |
# pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: |
300 |
sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc |
301 |
|
302 |
# Move .pc files into the pkgconfig directory |
303 |
dodir ${QTPCDIR} |
304 |
mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR} |
305 |
|
306 |
# Install .desktop files, from bug #174033 |
307 |
insinto /usr/share/applications |
308 |
doins "${FILESDIR}"/qt4/*.desktop |
309 |
|
310 |
# List all the multilib libdirs |
311 |
local libdirs |
312 |
for libdir in $(get_all_libdirs); do |
313 |
libdirs="${libdirs}:/usr/${libdir}/qt4" |
314 |
done |
315 |
|
316 |
cat > "${T}/44qt4" << EOF |
317 |
LDPATH=${libdirs:1} |
318 |
EOF |
319 |
doenvd "${T}/44qt4" |
320 |
} |
321 |
|
322 |
|
323 |
|
324 |
-- |
325 |
gentoo-commits@l.g.o mailing list |