From d976aa5e1544c80dc2457ea20b27f28f3fa05899 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 12 Apr 2013 00:04:48 -0700 Subject: Fri Apr 12 00:04:48 PDT 2013 --- extra/ardour/PKGBUILD | 17 ++++++---- extra/calligra/PKGBUILD | 8 ++--- extra/libmpdclient/PKGBUILD | 13 ++++---- extra/mpc/PKGBUILD | 15 +++++---- extra/mpd/PKGBUILD | 36 +++++++------------- extra/mpd/ffmpeg.patch | 15 --------- extra/mpd/rc.d | 25 -------------- extra/opencv/PKGBUILD | 80 ++++++++++++++++----------------------------- extra/qt5/PKGBUILD | 80 ++++++++++++++++++++++++++++++++++++++++----- extra/qt5/gcc48.patch | 63 +++++++++++++++++++++++++++++++++++ extra/qt5/use-python2.patch | 11 +++++++ extra/qtchooser/3.conf | 2 ++ extra/qtchooser/4.conf | 2 ++ extra/qtchooser/5.conf | 2 ++ extra/qtchooser/PKGBUILD | 35 ++++++++++++++++++++ 15 files changed, 258 insertions(+), 146 deletions(-) delete mode 100644 extra/mpd/ffmpeg.patch delete mode 100755 extra/mpd/rc.d create mode 100644 extra/qt5/gcc48.patch create mode 100644 extra/qtchooser/3.conf create mode 100644 extra/qtchooser/4.conf create mode 100644 extra/qtchooser/5.conf create mode 100644 extra/qtchooser/PKGBUILD (limited to 'extra') diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index e1719ecc2..01a03ef63 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 180842 2013-03-26 21:39:25Z schiv $ +# $Id: PKGBUILD 182614 2013-04-11 09:00:27Z schiv $ # Maintainer: Ray Rashif # Contributor: SpepS # Contributor: see .contrib pkgname=ardour -pkgver=3.0 +_pkgname=Ardour3 +pkgver=3.1 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') @@ -16,14 +17,18 @@ makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('2759df2ac29e6075e006cc5b262bfee0' +md5sums=('6291ee6e6519a801a6c7255eb005895f' '316bd21ece5e2208a104fd09cac521af') -build() { - cd "$pkgname-$pkgver" +prepare() { + cd "$srcdir/$_pkgname-$pkgver" # python2 fix sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" python2 waf configure --prefix=/usr \ --configdir=/etc \ @@ -33,7 +38,7 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd "$srcdir/$_pkgname-$pkgver" python2 waf install --destdir="$pkgdir" diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 1a3759c0b..007b3ce5f 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180802 2013-03-26 11:49:30Z foutrelis $ +# $Id: PKGBUILD 182625 2013-04-11 16:04:29Z andrea $ # Maintainer: Ronald van Haren # Maintainer: Andrea Scarpino @@ -17,8 +17,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.6.2 -pkgrel=3 +pkgver=2.6.3 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -28,7 +28,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('1c2feb12677ee71eb2e428e589b33862') +md5sums=('90d6bb619191abbcc94094379d47e225') build() { mkdir build diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD index 91f6eb78e..f715412f1 100644 --- a/extra/libmpdclient/PKGBUILD +++ b/extra/libmpdclient/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 153242 2012-03-12 13:45:57Z bisson $ +# $Id: PKGBUILD 182606 2013-04-10 23:43:13Z bisson $ # Contributor: Andrea Scarpino # Maintainer: Gaetan Bisson pkgname=libmpdclient -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' -url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient' +url='http://www.musicpd.org/libs/libmpdclient/' license=('custom:BSD') arch=('i686' 'x86_64') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('7e23c760296fe47e9e4108a0eba6fef08cfe4db8') + options=('!libtool') -source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('f97e35525851eb192d3799f0dabe32915c56b96b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --disable-documentation make } diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD index cb4eeae22..8e7c3216e 100644 --- a/extra/mpc/PKGBUILD +++ b/extra/mpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154004 2012-03-21 10:52:38Z bisson $ +# $Id: PKGBUILD 182608 2013-04-10 23:44:08Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Andrea Scarpino @@ -6,16 +6,17 @@ # Contributor: Link Dupont pkgname=mpc -pkgver=0.22 -pkgrel=2 +pkgver=0.23 +pkgrel=1 pkgdesc='Minimalist command line interface to MPD' -url='http://mpd.wikia.com/wiki/Client:Mpc' +url='http://www.musicpd.org/clients/mpc/' license=('GPL2') arch=('i686' 'x86_64') -options=('!emptydirs') depends=('libmpdclient') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e35414c1f5b25f4e500ceae125adb5bb9063b029') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('25d217b699fd70fd9b65b8b820addf794a109a9c') + +options=('!emptydirs') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 1762049e5..f89dc5a0a 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179309 2013-03-05 11:03:53Z bisson $ +# $Id: PKGBUILD 182602 2013-04-10 23:39:58Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Angel Velasquez # Contributor: Andrea Scarpino @@ -6,32 +6,25 @@ # Contributor: Ben pkgname=mpd -pkgver=0.17.3 -pkgrel=3 +pkgver=0.17.4 +pkgrel=1 pkgdesc='Flexible, powerful, server-side application for playing music' -url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki' +url='http://www.musicpd.org/' license=('GPL') arch=('i686' 'x86_64') depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2' 'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl') makedepends=('doxygen') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" - 'ffmpeg.patch' - 'tmpfiles.d' - 'rc.d') -sha1sums=('f684d73a7517371a4461afdb2439f9533b51a49d' - '8a06d04bfdf4e0dc43479907dc9b3bd7fba6dd10' - 'f4d5922abb69abb739542d8e93f4dfd748acdad7' - '3470d489565f0ed479f1665dd2876f66acb5a585') +source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz" + 'tmpfiles.d') +sha1sums=('f60b54e368fe74fde2fd4571227b0428fe0ae3cb' + 'f4d5922abb69abb739542d8e93f4dfd748acdad7') backup=('etc/mpd.conf') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../ffmpeg.patch - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -41,25 +34,20 @@ build() { --enable-pulse \ --disable-sidplay \ --with-systemdsystemunitdir=/usr/lib/systemd/system - make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - + install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists + install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf sed \ -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ -e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \ -e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \ -e '/^#user/c user "mpd"' \ - -i doc/mpdconf.example - - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd - install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists - install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf + -i "${pkgdir}"/etc/mpd.conf } diff --git a/extra/mpd/ffmpeg.patch b/extra/mpd/ffmpeg.patch deleted file mode 100644 index 83b13d80f..000000000 --- a/extra/mpd/ffmpeg.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur old/src/decoder/ffmpeg_decoder_plugin.c new/src/decoder/ffmpeg_decoder_plugin.c ---- old/src/decoder/ffmpeg_decoder_plugin.c 2013-01-07 11:39:40.000000000 +1100 -+++ new/src/decoder/ffmpeg_decoder_plugin.c 2013-03-05 21:54:27.116585462 +1100 -@@ -395,6 +395,11 @@ - #endif - return SAMPLE_FORMAT_S32; - -+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) -+ case AV_SAMPLE_FMT_FLTP: -+ return SAMPLE_FORMAT_FLOAT; -+#endif -+ - default: - break; - } diff --git a/extra/mpd/rc.d b/extra/mpd/rc.d deleted file mode 100755 index f00e16067..000000000 --- a/extra/mpd/rc.d +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Music Player Daemon' - /usr/bin/mpd /etc/mpd.conf &> /dev/null && - { add_daemon mpd; stat_done; } || stat_fail - ;; - stop) - stat_busy 'Stopping Music Player Daemon' - /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null && - { rm_daemon mpd; stat_done; } || stat_fail - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 8490915a6..044d675db 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179299 2013-03-04 22:18:11Z schiv $ +# $Id: PKGBUILD 182637 2013-04-11 18:36:34Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski pkgbase=opencv -pkgname=('opencv' 'opencv-docs' 'opencv-samples') +pkgname=('opencv' 'opencv-samples') _realname=OpenCV -pkgver=2.4.4 +pkgver=2.4.5 pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') @@ -14,16 +14,14 @@ url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') makedepends=('cmake' 'python2-numpy' 'mesa' - 'opencl-headers' 'eigen2' - 'texlive-bin' 'python2-sphinx') # for docs -optdepends=('opencv-docs' - 'opencv-samples' + 'opencl-headers' 'eigen2') +optdepends=('opencv-samples' 'eigen2' 'python2-numpy: Python 2.x interface') -source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz" 'pkgconfig.patch' 'fsh.patch') -md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9' +md5sums=('8eac87462c7bec8b89021b723207c623' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') @@ -31,10 +29,6 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D WITH_OPENGL=ON' '-D WITH_TBB=ON' '-D WITH_XINE=ON' - '-D ENABLE_SSE=OFF' - '-D ENABLE_SSE2=OFF' - '-D ENABLE_SSE3=OFF' - '-D BUILD_DOCS=ON' '-D BUILD_PACKAGE=OFF' '-D BUILD_WITH_DEBUG_INFO=OFF' '-D BUILD_TESTS=OFF' @@ -46,8 +40,17 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D CMAKE_INSTALL_PREFIX=/usr' '-D CMAKE_SKIP_RPATH=ON') -build() { - cd "$srcdir/$_realname-$pkgver" +# SSE only available from Pentium 3 onwards (i686 is way older) +[[ "$CARCH" = 'i686' ]] && \ + _cmakeopts+=('-D ENABLE_SSE=OFF' + '-D ENABLE_SSE2=OFF' + '-D ENABLE_SSE3=OFF') + +# all x64 CPUs support SSE2 but not SSE3 +[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 @@ -58,8 +61,13 @@ build() { # see http://code.opencv.org/issues/2512 patch -Np1 -i "$srcdir/fsh.patch" - # python2 compatibility for generating docs - sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake + # no longer including docs, see https://bugs.archlinux.org/task/34185 + # python2 compatibility for generating (html) docs + #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake +} + +build() { + cd "$srcdir/$pkgname-$pkgver" cmake ${_cmakeopts[@]} . @@ -67,58 +75,28 @@ build() { } package_opencv() { - cd "$srcdir/$_realname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install # install license file - install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + install -Dm644 "$srcdir/$pkgname-$pkgver/doc/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" cd "$pkgdir/usr/share" - # separate docs package; also be -R friendly - [[ -d doc ]] && mv doc "$srcdir/opencv-doc" - - # separate samples package + # separate samples package; also be -R friendly [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" } -package_opencv-docs() { - pkgdesc+=" (documentation)" - unset depends - unset optdepends - options=('docs') - - # PDFs are not being generated for some reason as of 2.4.4 - # even after adding latex and sphinx deps - # when previously without them there were a couple of good docs installed - - cd "$srcdir" - - # doc dir now includes opencv subdir (looks like they finally listened) - cp -r opencv-doc "$pkgdir/usr/share/doc" - - # install license file - #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - package_opencv-samples() { pkgdesc+=" (samples)" depends=('bash') unset optdepends unset options - cd "$srcdir" - mkdir -p "$pkgdir/usr/share/opencv" - cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" - - # Do we really need licenses for these minor splits? - # install license file - #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - # "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" } # vim:set ts=2 sw=2 et: diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index e9cf73b33..658ae50e7 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 180690 2013-03-25 19:15:43Z bpiotrowski $ +# $Id: PKGBUILD 182619 2013-04-11 11:34:49Z andrea $ # Maintainer: Andrea Scarpino pkgbase=qt5 pkgname=('qt5-base' 'qt5-declarative' + 'qt5-doc' 'qt5-graphicaleffects' 'qt5-imageformats' 'qt5-jsbackend' @@ -15,8 +16,8 @@ pkgname=('qt5-base' 'qt5-translations' 'qt5-webkit' 'qt5-xmlpatterns') -pkgver=5.0.1 -pkgrel=10 +pkgver=5.0.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -31,12 +32,13 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgbase}/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'use-python2.patch') -md5sums=('00a577bd88e682d1b4d01d41d1d699cf' + 'use-python2.patch' 'gcc48.patch') +md5sums=('2cab3518d86fe8f0638c7faea8b46397' 'f1837a03fd0ebbd2da58975845f278e3' '480fea1ed076992b688373c8db274be0' '5595c24d5bb942c21e3a4d299e6d0bf1' - 'ec3133b093550f16a21bb91e5f0f2943') + 'd6ab43fb371be494e3bfd9b210c40bf1' + '7927028e2374321c78a76df858e723d6') build() { cd ${_pkgfqn} @@ -54,10 +56,16 @@ build() { -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') + # GCC 4.8 fixes + cd qtbase + patch -p1 -i "${srcdir}"/gcc48.patch + cd ../ + ./configure -confirm-license -opensource \ -prefix /usr \ + -bindir /usr/lib/qt/bin \ -docdir /usr/share/doc/qt \ - -headerdir /usr/include/qt5 \ + -headerdir /usr/include/qt \ -archdatadir /usr/lib/qt \ -datadir /usr/share/qt \ -sysconfdir /etc/xdg \ @@ -74,13 +82,25 @@ build() { -reduce-relocations make + + # build docs + make docs + + # build examples + for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ + qtwebkit-examples-and-demos qtxmlpatterns; do + cd ${m}/examples + ${QTDIR}/qmake + make + cd ../../ + done } package_qt5-base() { pkgdesc='A cross-platform application and UI framework' depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd' 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image' - 'hicolor-icon-theme' 'xdg-utils' 'icu') + 'hicolor-icon-theme' 'xdg-utils' 'icu' 'qtchooser') optdepends=('postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' @@ -102,6 +122,12 @@ package_qt5-base() { # Fix wrong qmake path in pri file sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \ "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done } package_qt5-declarative() { @@ -115,6 +141,32 @@ package_qt5-declarative() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done +} + +package_qt5-doc() { + pkgdesc='A cross-platform application and UI framework (Documentation and Examples)' + depends=('qt5-base') + conflicts=('qt-doc') + replaces=('qt-doc') + provides=('qt-doc') + options=('docs') + groups=() + + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install_docs + + for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ + qtwebkit-examples-and-demos qtxmlpatterns; do + cd ${m}/examples + make INSTALL_ROOT="${pkgdir}" install + cd ../../ + done } package_qt5-jsbackend() { @@ -140,6 +192,12 @@ package_qt5-xmlpatterns() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done } package_qt5-translations() { @@ -250,6 +308,12 @@ package_qt5-tools() { # Fix wrong path in prl files find "${pkgdir}/usr/lib" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + + # Useful symlinks + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt/bin/*; do + ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5 + done } package_qt5-webkit() { diff --git a/extra/qt5/gcc48.patch b/extra/qt5/gcc48.patch new file mode 100644 index 000000000..03b205b68 --- /dev/null +++ b/extra/qt5/gcc48.patch @@ -0,0 +1,63 @@ +# Author: David E. Narváez +# AuthorDate: 2013-02-23 23:14:50 -0500 +# Commit: David E. Narváez +# CommitDate: 2013-02-23 23:14:50 -0500 +# +# Rename qAbs Function for timeval +# +# This decouples it from qAbs which is declared as a constexpr under +# certain compilation flags and enables for qtbase to be compiled with +# GCC 4.8 +# +# Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 +diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp +index 0eee425..7a29247 100644 +--- a/src/corelib/kernel/qtimerinfo_unix.cpp ++++ b/src/corelib/kernel/qtimerinfo_unix.cpp +@@ -87,22 +87,21 @@ + firstTimerInfo = 0; + } + + timeval QTimerInfoList::updateCurrentTime() + { + return (currentTime = qt_gettime()); + } + + #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) + +-template <> +-timeval qAbs(const timeval &t) ++timeval qAbsTimeval(const timeval &t) + { + timeval tmp = t; + if (tmp.tv_sec < 0) { + tmp.tv_sec = -tmp.tv_sec - 1; + tmp.tv_usec -= 1000000; + } + if (tmp.tv_sec == 0 && tmp.tv_usec < 0) { + tmp.tv_usec = -tmp.tv_usec; + } + return normalizedTimeval(tmp); +@@ -137,21 +136,21 @@ + *delta = elapsedTime - elapsedTimeTicks; + + previousTicks = currentTicks; + previousTime = currentTime; + + // If tick drift is more than 10% off compared to realtime, we assume that the clock has + // been set. Of course, we have to allow for the tick granularity as well. + timeval tickGranularity; + tickGranularity.tv_sec = 0; + tickGranularity.tv_usec = msPerTick * 1000; +- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); ++ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); + } + + /* + repair broken timer + */ + void QTimerInfoList::timerRepair(const timeval &diff) + { + // repair all timers + for (int i = 0; i < size(); ++i) { + register QTimerInfo *t = at(i); diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch index 8a7075a97..eb53b10f6 100644 --- a/extra/qt5/use-python2.patch +++ b/extra/qt5/use-python2.patch @@ -94,3 +94,14 @@ message_receiver_generator.input = MESSAGE_RECEIVERS message_receiver_generator.depends = $$SCRIPTS message_receiver_generator.output_function = message_receiver_generator_output +--- qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-04-11 08:05:15.149214600 +0000 ++++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-04-11 08:05:28.829105110 +0000 +@@ -116,7 +116,7 @@ + production_build:blackberry { + addReasonForSkippingBuild("Build not supported on BB10 yet.") + } +- requiredPrograms = gperf python perl bison ruby flex ++ requiredPrograms = gperf python2 perl bison ruby flex + for(program, requiredPrograms): \ + !programExistsInPath($$program): \ + addReasonForSkippingBuild("Missing $$program from PATH") diff --git a/extra/qtchooser/3.conf b/extra/qtchooser/3.conf new file mode 100644 index 000000000..bea263c91 --- /dev/null +++ b/extra/qtchooser/3.conf @@ -0,0 +1,2 @@ +/usr/lib/qt3/bin +/usr/lib diff --git a/extra/qtchooser/4.conf b/extra/qtchooser/4.conf new file mode 100644 index 000000000..96e344eba --- /dev/null +++ b/extra/qtchooser/4.conf @@ -0,0 +1,2 @@ +/usr/lib/qt4/bin +/usr/lib diff --git a/extra/qtchooser/5.conf b/extra/qtchooser/5.conf new file mode 100644 index 000000000..bcd76decb --- /dev/null +++ b/extra/qtchooser/5.conf @@ -0,0 +1,2 @@ +/usr/lib/qt/bin +/usr/lib diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD new file mode 100644 index 000000000..d288fb09d --- /dev/null +++ b/extra/qtchooser/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 182622 2013-04-11 12:14:29Z andrea $ +# Maintainer: Andrea Scarpino + +pkgname=qtchooser +pkgver=26 +pkgrel=3 +pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system' +arch=('i686' 'x86_64') +url='http://qt.gitorious.org/qt/qtchooser' +license=('GPL') +depends=('gcc-libs') +source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz" + {3,4,5}.conf) +md5sums=('a188a5cb63113130e0d05fe4d5bf4e95' + '7c5da2b7911d1c4fabc63d6ef00f0020' + 'aa4d49b269e1b806f5eea170801f0aa6' + 'cf83f09a9a5a44d898b93f624d74dd11') + +build() { + cd ${pkgname}-${pkgver}-g97962d2 + make +} + +package() { + cd ${pkgname}-${pkgver}-g97962d2 + make INSTALL_ROOT="${pkgdir}" install + + install -d "${pkgdir}"/etc/xdg/qtchooser + install -m644 "${srcdir}"/{3,4,5}.conf \ + "${pkgdir}"/etc/xdg/qtchooser/ + + # Set the default Qt + ln -s /etc/xdg/qtchooser/5.conf \ + "${pkgdir}"/etc/xdg/qtchooser/default.conf +} -- cgit v1.2.3-54-g00ecf