summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja@gmail.com>2014-09-25 16:33:50 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-09-25 17:01:50 +0700
commit86b2faedafab10256155c078b327dab0c7ee1139 (patch)
treed5e8db9730cc5deaf4192ecf46d04ebe810eec57
parent89ee04cd4b07539f496a8683159cae084ff24415 (diff)
downloadslackbuilds-86b2faedafab10256155c078b327dab0c7ee1139.tar.gz
libraries/qt5: Updated for version 5.3.2.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/qt5/qt5.SlackBuild31
-rw-r--r--libraries/qt5/qt5.info6
2 files changed, 11 insertions, 26 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild
index 2bdc504424..80bf7e49f5 100644
--- a/libraries/qt5/qt5.SlackBuild
+++ b/libraries/qt5/qt5.SlackBuild
@@ -46,7 +46,7 @@
# tailored to Qt 5. Modified by Larry Hajali.
PRGNAM=qt5
-VERSION=${VERSION:-5.3.1}
+VERSION=${VERSION:-5.3.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -125,6 +125,8 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
-opensource \
-prefix "/usr/lib${LIBDIRSUFFIX}/$PRGNAM" \
-sysconfdir "/etc/xdg" \
+ -headerdir "/usr/include/$PRGNAM" \
+ -libdir "/usr/lib${LIBDIRSUFFIX}" \
-docdir "/usr/doc/$PRGNAM-$VERSION" \
-system-libpng \
-system-libjpeg \
@@ -171,11 +173,6 @@ for BIN in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/bin/*; do
esac
done
-for LIBS in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/*so*; do
- TMP_FILE=$(echo $LIBS | sed -e "s|$PKG||")
- ln -s $TMP_FILE $PKG/usr/lib${LIBDIRSUFFIX}/$(basename $LIBS)
-done
-
# Create Environment variables
mkdir -p $PKG/etc/profile.d
sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.sh \
@@ -184,17 +181,17 @@ sed -e "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" $CWD/profile.d/$PRGNAM.csh \
> $PKG/etc/profile.d/$PRGNAM.csh
chmod 0755 $PKG/etc/profile.d/*
-cat > $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/pkgconfig/Qt5.pc << EOF
+cat > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5.pc << EOF
prefix=/usr/lib${LIBDIRSUFFIX}/$PRGNAM
bindir=\${prefix}/bin
datadir=\${prefix}
docdir=/usr/doc/$PRGNAM-$VERSION
archdatadir=\${prefix}
examplesdir=\${prefix}/examples
-headerdir=\${prefix}/include
+headerdir=/usr/include/$PRGNAM
importdir=\${prefix}/imports
qmldir=\${prefix}/qml
-libdir=\${prefix}/lib
+libdir=/usr/lib${LIBDIRSUFFIX}
libexec=\${prefix}/libexec
moc=\${bindir}/moc
plugindir=\${prefix}/plugins
@@ -216,10 +213,10 @@ sed -i \
-e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
-e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
-e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
- $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/pkgconfig/Qt5WebKit.pc
+ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
# While we are at it, there isn't any reason to keep references to $PKG in the *.prl files.
-for PRL in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/*.prl; do
+for PRL in $PKG/usr/lib${LIBDIRSUFFIX}/*.prl; do
sed -i '/^QMAKE_PRL_BUILD_DIR/d' $PRL
done
@@ -227,18 +224,6 @@ done
sed -i "s|$PWD/qtbase|/usr/lib${LIBDIRSUFFIX}/$PRGNAM|" \
$PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/mkspecs/modules/qt_lib_bootstrap_private.pri
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-for PKGCONFIG in $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/pkgconfig/*.pc; do
- TMP_FILE=$(echo $PKGCONFIG | sed -e "s|$PKG||")
- ln -s $TMP_FILE $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/$(basename $PKGCONFIG)
-done
-
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/cmake
-for CMAKE in $(find $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/cmake -maxdepth 1); do
- TMP_FILE=$(echo $CMAKE | sed -e "s|$PKG||")
- ln -s $TMP_FILE $PKG/usr/lib${LIBDIRSUFFIX}/cmake/$(basename $CMAKE)
-done
-
for i in $CWD/desktop/*.desktop; do
install -D -m 0644 $i $PKG/usr/share/applications/$(basename $i)
done
diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info
index 5548558c80..4d2e812810 100644
--- a/libraries/qt5/qt5.info
+++ b/libraries/qt5/qt5.info
@@ -1,8 +1,8 @@
PRGNAM="qt5"
-VERSION="5.3.1"
+VERSION="5.3.2"
HOMEPAGE="http://qt-project.org/"
-DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.3/5.3.1/single/qt-everywhere-opensource-src-5.3.1.tar.xz"
-MD5SUM="f9a24a0d5645efa0715b6ff0fa13d60f"
+DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.xz"
+MD5SUM="c4e893678e3d8388ab04d059523d1d78"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""