X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=packages%2Fx11%2Fqt%2Fqt;h=9abe2d649ea4503eb8f255a30595578764aeeaff;hb=50ac1135883405235decb4eeac5dfdbed5a648c2;hp=79aebd041c4da6386f733e9128d2ee6d19f943b3;hpb=6ae193981fcc05dcc495b4bde92cb8fd290ee4dd;p=hdw-linux%2Fhdw-linux.git

diff --git a/packages/x11/qt/qt b/packages/x11/qt/qt
index 79aebd0..9abe2d6 100644
--- a/packages/x11/qt/qt
+++ b/packages/x11/qt/qt
@@ -2,9 +2,9 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 3.3.2
+# [V] 3.3.4
 # [S] 3-4
-# [D] qt-x11-free-3.3.2.tar.bz2 ftp://ftp.trolltech.com/qt/source/
+# [D] qt-x11-free-3.3.4.tar.bz2 ftp://ftp.trolltech.com/qt/source/
 
 pre_install()	{
 	# where is qt stuff
@@ -15,13 +15,26 @@ pre_install()	{
 	# modify configure, so it is none interactive
 	sed 's/read acceptance/acceptance="yes"/' configure > configure_tmp
 	mv -vf configure_tmp configure ; chmod 755 configure
+
+	# adjust qmake.conf directories (use ' instead of " to not eval $QTDIR)
+	sed -i -e 's:$(QTDIR)/include:&/qt:' -e 's:$(QTDIR)/lib:&/qt:' \
+		mkspecs/linux*/qmake.conf
 		}
 
-confopt="-prefix $prefix -headerdir $root/usr/include/qt"
-confopt="$confopt -docdir $docdir"
-confopt="$confopt -system-zlib -thread -no-stl -no-g++-exceptions"
-confopt="$confopt -system-libpng -system-libjpeg -qt-gif"
-confopt="$confopt -plugin-imgfmt-mng"
+confopt="-prefix $prefix -headerdir $prefix/include/qt -docdir $docdir"
+confopt="$confopt -plugindir $prefix/lib/qt/plugins -datadir $prefix/share/qt"
+confopt="$confopt -translationdir $prefix/share/qt/translation"
+confopt="$confopt -sysconfdir $sysconfdir/qt"
+confopt="$confopt -thread -no-exceptions"
+confopt="$confopt -system-zlib -system-libpng -system-libjpeg -qt-gif"
+confopt="$confopt -plugin-imgfmt-mng -plugin-imgfmt-png"
+
+build_main()	{
+	./configure $confopt
+	find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g"
+	make $make_conf
+	make $install_conf install
+		}
 
 post_install()	{
 	# compatibility symlinks
@@ -30,8 +43,8 @@ post_install()	{
 	done
 	# documentation
 	mkdir -p $docdir
-	cp -r doc/man $prefix/man
-	cp -r examples $docdir
+	cp -v -r doc/man $prefix/man
+	cp -v -r examples $docdir
 	# profile
 	cat > $root/etc/profile.d/qt <<-EOP
 QTDIR=$prefix