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