diff --git a/lib32-qt/PKGBUILD b/lib32-qt/PKGBUILD index 5e9906f..4a47c7e 100644 --- a/lib32-qt/PKGBUILD +++ b/lib32-qt/PKGBUILD @@ -2,69 +2,47 @@ # # maintainer (x86_64): Giuseppe Calà # maintainer (x86_64): Anke Boersma +# contributor: Florian Pritz +# Contributor: Andrea Scarpino +# Contributor: Pierre Schmitz _pkgbasename=qt pkgname=lib32-$_pkgbasename -pkgver=4.7.4 +pkgver=4.8.2 pkgrel=1 -#kdeqtver=b427b5e64483612122e56104552a9704f6013680 pkgdesc='A cross-platform application and UI framework (32-bit)' arch=('x86_64') -url='http://qt.nokia.com/' +url='http://qt-project.org/' license=('GPL3' 'LGPL') depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl} - lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi,xinerama,xcursor,xfixes} $_pkgbasename) - + lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi,xinerama,xcursor,xfixes,ffi} $_pkgbasename) makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes}) options=('!libtool') -_pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" -# "http://chakra-project.org/sources/qt/kde-qt-${kdeqtver}.patch.gz" - "appmenu.patch") - -md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf' -# 'cc361e2dff48a56cff9a1649cfc004b2' +_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}" +source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" + 'appmenu.patch') +md5sums=('3c1146ddf56247e16782f96910a8423b' '7ca519c824d67cfae0281ec50af24ad8') -_create-kdeqt-patch() { - #Create patches - echo "creating kde-qt patches" - local codir=$(mktemp -d) - mkdir -p "${codir}/kde-qt" - git clone git://gitorious.org/+kde-developers/qt/kde-qt.git "${codir}/kde-qt" - pushd "${codir}/kde-qt" - git checkout --track -b ${pkgver}-patched origin/${pkgver}-patched - local kdeqtver=$(git --no-pager show --format='%H' "${pkgver}-patched" | head -1) - git diff "v${pkgver}..${pkgver}-patched" | gzip > "${codir}/kde-qt-${kdeqtver}.patch.gz" - popd - mv "${codir}/kde-qt-${kdeqtver}.patch.gz" . - rm -rf "${codir}" - md5sum kde-qt-${kdeqtver}.patch.gz - echo "change kdeqtver to $kdeqtver" -} - build() { - unset QMAKESPEC + cd $srcdir/$_pkgfqn + export QT4DIR=$srcdir/$_pkgfqn - export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd $srcdir/$_pkgfqn - -# msg "applying kde-qt patches" -# patch -p1 -i $srcdir/kde-qt-${kdeqtver}.patch || return 1 - - msg "apply other patches" - # apply appmenu patch from Aurelien Gateau - patch -Np1 -i ${srcdir}/appmenu.patch || return 1 - cp ${srcdir}/${_pkgfqn}/src/gui/widgets/qabstractmenubarimpl_p.h ${srcdir}/${_pkgfqn}/include/QtGui/private/ || return 1 - - sed -e "s|-O2|$CXXFLAGS -m32|" \ - -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ - -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \ - -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ - -i mkspecs/common/g++.conf +# some of those are likely unnecessary, but I7ca519c824d67cfae0281ec50af24ad8'm too lazy to find and remove them + sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf + sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf + sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/gcc-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS} -m32|g" mkspecs/common/gcc-base.conf + sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf + sed -e "s|-O2|$CXXFLAGS -m32|" \ + -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ + -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \ + -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ + -i mkspecs/common/g++.conf ./configure -confirm-license -opensource -v -platform linux-g++-32 \ -prefix /usr \ @@ -74,37 +52,24 @@ build() { -datadir /usr/share/qt \ -translationdir /usr/share/qt/translations \ -sysconfdir /etc \ - -largefile \ -system-sqlite \ - -xmlpatterns \ -no-phonon \ -no-phonon-backend \ - -svg \ - -webkit \ - -script \ - -scripttools \ - -system-zlib \ - -system-libtiff \ - -system-libpng \ - -system-libmng \ - -system-libjpeg \ + -no-webkit \ + -graphicssystem raster \ + -openssl-linked \ -nomake demos \ -nomake examples \ -nomake docs \ -nomake tools \ - -no-rpath \ - -openssl-linked \ -optimized-qmake \ - -dbus \ + -no-rpath \ + -dbus-linked \ -reduce-relocations \ - -no-separate-debug-info \ - -no-gtkstyle \ - -opengl \ -no-openvg \ - -glib + -xcursor - msg "starting the build" - make + make } package() { diff --git a/skype/PKGBUILD b/skype/PKGBUILD index 4028fe2..0901b0c 100644 --- a/skype/PKGBUILD +++ b/skype/PKGBUILD @@ -4,8 +4,8 @@ # maintainer (x86_64): Anke Boersma pkgname=skype -pkgver=2.1.0.81 -pkgrel=2 +pkgver=2.2.0.35 +pkgrel=3 arch=(i686 x86_64) pkgdesc="P2P software for high-quality voice communication" url="http://www.skype.com/" @@ -30,7 +30,7 @@ else fi source=(http://download.skype.com/linux/$pkgname-$pkgver.tar.bz2 PERMISSION) -md5sums=('5411dcf89e33f53df5fbe5958bbaef54' +md5sums=('b60a19345ee7b3522b5fe4047150aaf8' '26e1772379d4d4df9471b6ed660a6d97') package() { diff --git a/wine/PKGBUILD b/wine/PKGBUILD index 0dac7ee..386f5f8 100644 --- a/wine/PKGBUILD +++ b/wine/PKGBUILD @@ -4,23 +4,25 @@ # maintainer (x86_64): Anke Boersma pkgname=wine -pkgver=1.3.34 -pkgrel=1 +pkgver=1.5.5 +pkgrel=2 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('ae7be1767e95e27360fc86f573649c19') +md5sums=('63639cfe9addb75cd40726cac36bcf8a') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" +categories=('system') +screenshot=('http://wstaw.org/m/2012/04/28/wine.png') arch=(i686 x86_64) license=(LGPL) install=wine.install depends=( fontconfig lib32-fontconfig - mesa lib32-mesa + mesa lib32-mesa libxcursor lib32-libxcursor libxrandr lib32-libxrandr libxdamage lib32-libxdamage @@ -30,11 +32,13 @@ depends=( mpg123 lib32-mpg123 openal lib32-openal libxml2 lib32-libxml2 - freetype2 lib32-freetype2 + libxi lib32-libxi + gettext lib32-gettext + desktop-file-utils ) makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.6.2' 'gcc-multilib>=4.6.2' + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' giflib lib32-giflib libxpm lib32-libxpm libpng lib32-libpng @@ -52,8 +56,11 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink libcups lib32-libcups gnutls lib32-gnutls v4l-utils lib32-v4l-utils + alsa-lib lib32-alsa-lib + oss + samba ) - + optdepends=( giflib lib32-giflib libpng lib32-libpng @@ -62,6 +69,8 @@ optdepends=( libcups lib32-libcups gnutls lib32-gnutls v4l-utils lib32-v4l-utils + oss cups + samba ) if [[ $CARCH == i686 ]]; then @@ -70,10 +79,6 @@ if [[ $CARCH == i686 ]]; then makedepends=(${makedepends[@]/*32-*/}) makedepends=(${makedepends[@]/*-multilib*/}) optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') fi build() { @@ -86,6 +91,10 @@ build() { rm -rf $pkgname-{32,64}-build mkdir $pkgname-32-build + # These additional CFLAGS solve FS#27662 + export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" + if [[ $CARCH == x86_64 ]]; then msg2 "Building Wine-64..." @@ -116,7 +125,8 @@ build() { --with-x \ "${_wine32opts[@]}" - make + # These additional CFLAGS solve FS#27560 + make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign" } package() {