diff options
| -rw-r--r-- | libraries/qt5/README | 4 | ||||
| -rw-r--r-- | libraries/qt5/patches/qt5.pulseaudio.diff | 12 | ||||
| -rw-r--r-- | libraries/qt5/qt5.SlackBuild | 22 | ||||
| -rw-r--r-- | libraries/qt5/qt5.info | 6 |
4 files changed, 27 insertions, 17 deletions
diff --git a/libraries/qt5/README b/libraries/qt5/README index e1376a9998..ac0c8c5623 100644 --- a/libraries/qt5/README +++ b/libraries/qt5/README @@ -4,8 +4,8 @@ is its rich set of widgets that provide standard GUI functionality. Optional dependencies: unixodbc, libxkbcommon, freetds, pulseaudio, OpenAL, libwebp and postgresql -Optional dependencies: wayland, openvg and firebird (not available at -slackbuilds.org) +Optional dependencies: wayland, openvg, libinput and firebird (not available +at slackbuilds.org) Note: To build Qt5 with Pulseadio then pass USEPULSE=yes to the slackbuild. diff --git a/libraries/qt5/patches/qt5.pulseaudio.diff b/libraries/qt5/patches/qt5.pulseaudio.diff new file mode 100644 index 0000000000..8d8f616d5b --- /dev/null +++ b/libraries/qt5/patches/qt5.pulseaudio.diff @@ -0,0 +1,12 @@ +--- qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp.orig 2014-12-05 17:26:44.000000000 +0100 ++++ qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp 2014-12-12 10:27:20.393735405 +0100 +@@ -29,7 +29,7 @@ + ['use_cras==1', { + 'use_pulseaudio%': 0, + }, { +- 'use_pulseaudio%': 1, ++ 'use_pulseaudio%': 0, + }], + ], + }, { + diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 4896c2c8ec..3d49762b89 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.4.2} +VERSION=${VERSION:-5.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -91,11 +91,6 @@ cd $TMP rm -rf ${PRGNAM/5/}-everywhere-opensource-src-$VERSION tar xvf $CWD/${PRGNAM/5/}-everywhere-opensource-src-$VERSION.tar.xz cd ${PRGNAM/5/}-everywhere-opensource-src-$VERSION -# Fix dangling symlinks. -rm -f qtwebengine/src/3rdparty/chromium/third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api -rm -f qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf -ln -s ../../../../../tools/perf\ - qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -118,9 +113,7 @@ else RELOCATIONS="" fi -if echo "$ARCH" | grep -q "i.86" 2>/dev/null; then - sed -i "/^QMAKE_CFLAGS_RELEASE/ s|+=.*|+= $SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf -fi +sed -i "s|-O2|$SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf # Use Pulseaudio. Default is not to use Pulseaudio. Pulseaudio is a # required dependency for the new qtwebengine. @@ -129,7 +122,7 @@ if [ "${USEPULSE:-no}" == "yes" ]; then PULSE="-pulseaudio" else PULSE="-no-pulseaudio" - sed -i '/qtwebengine/d' qt.pro + patch -p1 < $CWD/patches/qt5.pulseaudio.diff fi # Build examples. Default is no. @@ -141,7 +134,6 @@ fi export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" ./configure -v \ -confirm-license \ -opensource \ @@ -239,7 +231,7 @@ Description: Qt5 Configuration Version: $VERSION EOF -# Fix internal linking for Qt5WebKit.pc. +# Fix internal linking for Qt5WebKit.pc and Qt5WebEngineCore.pc. sed -i \ -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \ -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \ @@ -250,6 +242,8 @@ sed -i \ -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc +sed -i 's|-Wl,--whole-archive.*-Wl,--no-whole-archive||' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc + # While we are at it, there isn't any reason to keep references to $PKG in the *.prl files. for PRL in $(find $PKG -name "*\.prl"); do sed -i '/^QMAKE_PRL_BUILD_DIR/d' $PRL @@ -266,6 +260,10 @@ sed -i "s|@LIBDIR@|$LIBDIRSUFFIX|" $PKG/usr/share/applications/* # Currently not working for qt version 5.4.0. Extra layer added to *.ico file # freaks out ImageMagick and fails image conversion. +# Eg. +# $ convert assistant.ico -resize 96x96! assistant.png +# convert: file format version mismatch `assistant.ico' @ error/xwd.c/ReadXWDImage/241. +# convert: no images defined `assistant.png' @ error/convert.c/ConvertImageCommand/3127. #for i in $(find . -name "assistant.ico" -o -name "designer.ico" \ # -o -name "linguist.ico" -o -name "qdbusviewer.ico"); do # for j in 16 24 32 48 64 96 128; do diff --git a/libraries/qt5/qt5.info b/libraries/qt5/qt5.info index 09e30d0979..ba66b798b3 100644 --- a/libraries/qt5/qt5.info +++ b/libraries/qt5/qt5.info @@ -1,8 +1,8 @@ PRGNAM="qt5" -VERSION="5.4.2" +VERSION="5.5.0" HOMEPAGE="http://qt-project.org/" -DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.4/5.4.2/single/qt-everywhere-opensource-src-5.4.2.tar.xz" -MD5SUM="c23bd0f14d66e7901d24906a1edce9b0" +DOWNLOAD="http://download.qt-project.org/official_releases/qt/5.5/5.5.0/single/qt-everywhere-opensource-src-5.5.0.tar.xz" +MD5SUM="65d5282f3dee0336da9ed1f77148952f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |