daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

qt3: update to 3.3.5

Browse Source
This commit is contained in:
Juergen Daubert 2006-02-10 15:01:43 +00:00
parent 399b997a3d
commit 970762d39c
5 changed files with 38 additions and 2049 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qt3/.footprint
View File

@ -420,10 +420,10 @@ drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libqassistantclient.prl
-rw-r--r-- root/root usr/lib/libqt-mt.la
-rw-r--r-- root/root usr/lib/libqt-mt.prl
lrwxrwxrwx root/root usr/lib/libqt-mt.so -> libqt-mt.so.3.3.4
lrwxrwxrwx root/root usr/lib/libqt-mt.so.3 -> libqt-mt.so.3.3.4
lrwxrwxrwx root/root usr/lib/libqt-mt.so.3.3 -> libqt-mt.so.3.3.4
-rwxr-xr-x root/root usr/lib/libqt-mt.so.3.3.4
lrwxrwxrwx root/root usr/lib/libqt-mt.so -> libqt-mt.so.3.3.5
lrwxrwxrwx root/root usr/lib/libqt-mt.so.3 -> libqt-mt.so.3.3.5
lrwxrwxrwx root/root usr/lib/libqt-mt.so.3.3 -> libqt-mt.so.3.3.5
-rwxr-xr-x root/root usr/lib/libqt-mt.so.3.3.5
-rw-r--r-- root/root usr/lib/libqui.prl
lrwxrwxrwx root/root usr/lib/libqui.so -> libqui.so.1.0.0
lrwxrwxrwx root/root usr/lib/libqui.so.1 -> libqui.so.1.0.0

5
qt3/.md5sum
View File

@ -1,2 +1,3 @@
027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2
92e80671a8c1a435b44682ca1fe93f54 qt3-3.3.4-1.patch
05d04688c0c0230ed54e89102d689ca4 qt-x11-free-3.3.5.tar.bz2
a0420bc8ef951b0299b6055043988211 qt3-3.3.5-2-patches.tar.bz2
7d8d3356a17201832e361df69c63e9a4 qt3-3.3.5-gcc4.patch

29
qt3/Pkgfile
View File

@ -1,22 +1,25 @@
# Description: Qt Free Edition
# URL: http://www.trolltech.com
# Maintainer: Simone Rota, sip at varlock dot com
# Packager: Daniel Mueller, daniel at danm dot de
# Maintainer: Daniel Mueller, daniel at danm dot de
# Depends on: x11, freetype, libjpeg, libmng, libpng, fontconfig, expat
name=qt3
version=3.3.4
version=3.3.5
release=1
source=(http://sunsite.rediris.es/mirror/Qt/source/qt-x11-free-$version.tar.bz2 \
$name-$version-$release.patch)
source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-$version.tar.bz2 \
http://crux.danm.de/files/dist/$name/$version/$name-$version-2-patches.tar.bz2 \
$name-$version-gcc4.patch)
build () {
cd qt-x11-free-$version
patch -p1 < $SRC/$name-$version-$release.patch
# fix qmake installation
sed -i -e 's/-cp -P -f/-cp -L -f/' qmake/Makefile.unix
# KDE patches (http://websvn.kde.org/branches/qt/3.3/qt-copy/patches/?rev=507267)
for i in ../$name-patches/*.*; do
patch -p2 < $i
done
# gcc4 + 64bit issue
patch -p1 < $SRC/$name-$version-gcc4.patch
local SQL
if [ "`pkginfo -i | grep mysql`" ];then
@ -28,12 +31,14 @@ build () {
export CXXFLAGS="$CXXFLAGS -I/usr/include/nvidia"
fi
# don't link against our currently installed libraries
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/lib"
rm -rf {doc/html,examples,tutorial}
# we don't want docs, sample code; please use our optimizations flags
sed -i "s|sub-tutorial sub-examples| |" Makefile
sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
sed -i "s|read acceptance|acceptance=yes|" configure
./configure -prefix /usr/share/qt \
-bindir /usr/bin \
@ -48,6 +53,8 @@ build () {
$SQL
make src-moc sub-src
# Makefile magic, don't link against our currently installed libs
find . -name Makefile -exec sed -i "s|,/usr/lib|,`pwd`/lib|" {} \;
make sub-tools
make INSTALL_ROOT=$PKG install
@ -71,6 +78,8 @@ build () {
ln -s ../../lib/qt $PKG/usr/share/qt/plugins
ln -s linux-g++ $PKG/usr/share/qt/mkspecs/default
# correct qmake's PRL files (the libraries were placed into /usr/lib*/ and
# not in our temporary build directory ./work/src/..)
sed -i "s|-L$SRC/qt-x11-free-$version/lib ||g" $PKG/usr/lib/*.prl
chmod -R u+w,g-sw $PKG

2033
qt3/qt3-3.3.4-1.patch
View File

File diff suppressed because it is too large Load Diff

12
qt3/qt3-3.3.5-gcc4.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nru qt-x11-free-3.3.4-orig/tools/qvfb/qvfbview.cpp qt-x11-free-3.3.4/tools/qvfb/qvfbview.cpp
--- qt-x11-free-3.3.4-orig/tools/qvfb/qvfbview.cpp 2005-10-31 21:49:58.000000000 +0000
+++ qt-x11-free-3.3.4/tools/qvfb/qvfbview.cpp 2005-10-31 21:51:52.000000000 +0000
@@ -115,7 +115,7 @@
data = (unsigned char *)shmat( shmId, 0, 0 );
}
- if ( (int)data == -1 )
+ if ( (long)data == -1 )
qFatal( "Cannot attach to shared memory" );
hdr = (QVFbHeader *)data;