Commits

Anonymous committed 04ce1e2

bumped to version 4.8.4
Signed-off-by: vector <veclinux@mail.com>

Comments (0)

Files changed (1)

var/vabs/qt/src/qt.SlackBuild

 # AUTHORS = 
 
 NAME="qt"            #Enter package Name!
-VERSION=${VERSION:-"4.8.3"}      #Enter package Version!
+VERSION=${VERSION:-"4.8.4"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"hata_ph"}   #Enter your Name!
 LINK=${LINK:-"http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-$VERSION.tar.gz"}  #Enter URL for package here!
 CONFIG_OPTIONS=${CONFIG_OPTIONS:-""}
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
-EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
-MAKEDEPENDS=${MAKEDEPENDS:-"sqlite mysql libiodbc libjpeg libpng fontconfig gstreamer gst-plugins-base"} #Add deps needed TO BUILD this package here.
+EXRB=${EXRB:-"mysql,libiodbc,postgresql"} #Add deps that need to be excluded from the slack-required file here
+MAKEDEPENDS=${MAKEDEPENDS:-"mysql libiodbc postgresql"} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
 # DO NOT EXECUTE if NORUN is set to 1
    exit 1
 fi
 
-NUMJOBS=${NUMJOBS:-"-j6"}
+NUMJOBS=${NUMJOBS:--j7}
 
 #CFLAGS SETUP
 #--------------------------------------------
 if [[ "$ARCH" = i?86 ]]; then
   ARCH=i586
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  CONFIGURE_TRIPLET="i586-vector-linux"
+  CONFIGURE_TRIPLET="i486-slackware-linux"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fpic"
-  CONFIGURE_TRIPLET="x86_64-vlocity-linux"
+  CONFIGURE_TRIPLET="x86_64-slackware-linux"
   LIBDIRSUFFIX="64"
 elif [ "$ARCH" = "powerpc" ]; then
   SLKCFLAGS="-O2"
 zcat $CWD/patches/qt.ld-gold.patch.gz | patch -p1 --verbose || exit 1
 
 # Stupid idea - remove it:
-#zcat $CWD/patches/qt.webkit-no_Werror.patch.gz | patch -p1 --verbose || exit 1
-
-# Fix cursor position bug within tables:
-#zcat $CWD/patches/qt.ca89c49.cursor.position.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix assistant crash:
-zcat $CWD/patches/qt.assistant.memcpy-crash.diff.gz | patch -p0 --verbose || exit 1
-
-# Fix webkit compiling with recent glib:
-#zcat $CWD/patches/qt.webkit.glib.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix JIT crashes affecting Kate, KDevelop, maybe others:
-#zcat $CWD/patches/qt.fix.jit.crash.diff.gz | patch -p1 --verbose || exit 1
-
-# Some patches from upstream:
-#zcat $CWD/patches/QElfParser-fix-type-of-sh_size.patch.gz | patch -p1 --verbose || exit 1
-#zcat $CWD/patches/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch.gz | patch -p1 --verbose || exit 1
-#zcat $CWD/patches/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch.gz | patch -p1 --verbose || exit 1
-#moc patch 
-patch -p1 <$CWD/patches/moc-workaround-boost.patch
+zcat $CWD/patches/qt.webkit-no_Werror.patch.gz | patch -p1 --verbose || exit 1
 
 #SET PERMISSIONS
 #-----------------------------------------
 find . -perm 555 -exec chmod 755 {} \;
 #-----------------------------------------
 
-#if [[ "$ARCH" = i?86 ]]; then
-#  wget http://slackware.cs.utah.edu/pub/slackware/slackware-current/slackware/ap/linuxdoc-tools-0.9.67-i486-2.txz
-#  installpkg linuxdoc-tools-0.9.67-i486-2.txz
-#  wget http://ftp.osuosl.org/pub/slackware/slackware-current/slackware/n/openssl-1.0.1c-i486-3.txz
-#  installpkg openssl-1.0.1c-i486-3.txz
-#elif [ "$ARCH" = "x86_64" ]; then
-#  wget http://slackware.cs.utah.edu/pub/slackware/slackware64-current/slackware64/ap/linuxdoc-tools-0.9.67-x86_64-2.txz
-#  installpkg linuxdoc-tools-0.9.67-x86_64-2.txz
-#  wget http://slackware.cs.utah.edu/pub/slackware/slackware64-current/slackware64/n/openssl-1.0.1c-x86_64-3.txz
-#  installpkg openssl-1.0.1c-x86_64-3.txz
-#fi
 
 
 #CONFIGURE & MAKE
 # you need mysql, libiodbc and sqlite pkgs to build the qt-sql drivers
 echo "Configuring source..."
 export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib 
-  ./configure \
+./configure \
   -confirm-license \
   -opensource \
   -prefix /usr/lib${LIBDIRSUFFIX}/qt \
-  -webkit -fast \
+  -fast \
   -system-libpng \
   -system-libjpeg \
   -system-zlib \
   -system-sqlite \
   -plugin-sql-sqlite \
+  -plugin-sql-mysql \
   -plugin-sql-odbc \
+  -plugin-sql-psql \
   -dbus \
+  -webkit \
   -no-phonon \
   -nomake examples \
   -nomake demos \
-  -nomake docs \
-  -optimized-qmake \
   -no-separate-debug-info \
-  -no-pch \
-  -plugin-sql-mysql  || exit 1
+  -no-pch
   # No-precompiled-headers is ccache-friendly.
 
 # Sometimes a failure happens when parallelizing make.  Try again if make fails,
 Version: $VERSION
 EOF
 
-# libjscore is used internally.  Prevent a false dependency on this in the .la files:
+# libjscore is used internally.  Prevent a false dependency on this in the .la and .pc files:
 sed -i "s,-ljscore,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
 sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc
 
+# libwebcore is used internally.  Prevent a false dependency on this in the .la and .pc files:
+sed -i "s#-L/usr/lib${LIBDIRSUFFIX}/qt/lib -L../../WebCore/release -L../../JavaScriptCore/release -L/usr/X11R6/lib$LIBDIRSUFFIX  -lwebcore##g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/libQtWebKit.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/QtWebKit.pc
+
 # Link the shared libraries into /usr/lib:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
   for file in qt/lib/*.so* ; do
   done
 )
 
-if [ $ARCH = "i586" ]; then
-  # Put this back as shipped:
-   zcat $CWD/patches/qt.x86.cflags.diff.gz | patch -p1 -R
-fi
-
 # Add profile scripts
 mkdir -p $PKG/etc/profile.d
 sed -e "s#usr/lib/#usr/lib${LIBDIRSUFFIX}/#g" $CWD/profile.d/qt4.sh \
   done
 )
 
+# Install Qt's private headers - at least Gentoo and Fedora are adding these
+# and some software has (inevitably) started depending on them:
+# We're using `rsync -R` as easy way to preserve relative path names:
+rsync -aR \
+  include/Qt{Core,Declarative,Gui,Script}/private \
+  src/{corelib,declarative,gui,script}/*/*_p.h \
+  ${PKG}/usr/lib${LIBDIRSUFFIX}/qt/
+
 # Add menu entries for all those hidden but great Qt applications:
 # Qt logo:
 convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png  -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png
 Categories=Qt;Settings;
 EOF
 
-# remove doc dir to save space
+# remove doc dir to save space - over 100MB
+# comment below if you want to enable the doc dir
 rm -r $PKG/usr/lib${LIBDIRSUFFIX}/qt/doc
 
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a *GPL_EXCEPTION* FAQ* INSTALL KNOWN* LICENSE* README* changes-* \
+cp -a *GPL_EXCEPTION* INSTALL LICENSE* README* changes-* \
   $PKG/usr/doc/$NAME-$VERSION
-( cd $PKG/usr/doc/$NAME-$VERSION
-  ln -sf /usr/lib${LIBDIRSUFFIX}/qt/doc/html .
-)
-
+# uncomment below if you enable the doc dir
+#( cd $PKG/usr/doc/$NAME-$VERSION
+#  ln -sf /usr/lib${LIBDIRSUFFIX}/qt/doc/html .
+#)
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 #----------------------------------------------------------------------