Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

hwinfo/PKGBUILD

@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=hwinfo
 pkgver=19.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A simple program that lists results from the hardware detection library."
 arch=('i686' 'x86_64')
 url="http://www.opensuse.org"
@@ -17,29 +17,27 @@ license=('GPL2')
 depends=('perl' 'libx86emu')
 makedepends=('sysfsutils' 'rpmextract' 'flex')
 options=('!emptydirs')
-source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-1.1.src.rpm"
+source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-4.1.src.rpm"
         "kbd.patch")
 
 build() {
   cd "${srcdir}"
 
   msg2 "Extracting source rpm..."
-  rpmextract.sh "${pkgname}-${pkgver}-1.1.src.rpm"
+  rpmextract.sh "${pkgname}-${pkgver}-4.1.src.rpm"
-  tar jxf ${pkgname}-${pkgver}.tar.bz2
+  tar -xjf ${pkgname}-${pkgver}.tar.bz2
   cd "${pkgname}-${pkgver}"
   msg2 "Patching..."
   patch -p0 < ../kbd.patch
-  msg2 "Compiling..."
+  # Fix Makefile using /usr/lib64 instead of /usr/lib - it broke x86_64, possibly i686 too. 
-  make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib
+  # Comment if this fix breaks it.
+  sed -i 's_usr/lib64_usr/lib_' src/hd/Makefile 
+  make -j1
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
+  make DESTDIR=${pkgdir} install
-  msg2 "Packaging files..."
-  make LIBDIR=/usr/lib DESTDIR=${pkgdir} install
-  msg2 "Cleaning up..."
-  rmdir "${pkgdir}/sbin"
 }
-md5sums=('751238feaa13449324593ee5e145cd56'
+md5sums=('32873044be2a193357fc177f0fb0f2e3'
          '1500ecfa26f6aaf4d7967eea74e86e5d')

libx86emu/PKGBUILD

@@ -9,8 +9,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=libx86emu
 pkgver=1.1
-_minorver=6.8
+_minorver=15.1
-pkgrel=1
+pkgrel=2
 pkgdesc="x86 emulation library"
 arch=('i686' 'x86_64')
 url="http://www.opensuse.org"
@@ -19,22 +19,17 @@ depends=('glibc')
 makedepends=('rpmextract')
 options=('!emptydirs')
 source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-${_minorver}.src.rpm")
+md5sums=('c3edd3bf1ee56ab2a7b64515c7bc6f27')
+
 build() {
+  cd "${srcdir}"
+  rpmextract.sh "${pkgname}-${pkgver}-${_minorver}.src.rpm"
+  tar -xjf $pkgname-$pkgver.tar.bz2
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cd ${srcdir}
+  make LIBDIR=/usr/lib
-  rpmextract.sh ${pkgname}-${pkgver}-${_minorver}.src.rpm || return 1
+  make LIBDIR=/usr/lib DESTDIR=$pkgdir install
-  tar -xjf ${pkgname}-${pkgver}.tar.bz2
+  install -Dm644 LICENSE \
-
+  ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-# Fix Makefile using /usr/lib64 instead of /usr/lib - it broke x86_64, possibly i686 too. 
-# Comment if this fix breaks it - untested on i686 or anything special.
-  sed -i 's_usr/lib64_usr/lib_' Makefile 
-
-  make -j1 || return 1
-  make DESTDIR=${pkgdir} install || return 1
-
-  install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
 }
-md5sums=('848e5aeb5885b2f71364d68d91080b94')
+

qt/PKGBUILD

@@ -7,7 +7,7 @@
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.0
-pkgrel=3
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
@@ -18,21 +18,9 @@ makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'db
 options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
-        "http://chakra.sourceforge.net/sources/${pkgbase}/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch"
-        "http://chakra.sourceforge.net/sources/${pkgbase}/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch"
-        "http://chakra.sourceforge.net/sources/${pkgbase}/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch"
-        "http://chakra.sourceforge.net/sources/${pkgbase}/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch"
-        "http://chakra.sourceforge.net/sources/${pkgbase}/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch"
-        "http://chakra.sourceforge.net/sources/${pkgbase}/qt-everywhere-opensource-src-4.8.0-icu_no_spam.patch"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop')
 md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
-         '7f9592bcd5d47421455125537845b5fe'
-         'f9b63a5dc2ec17d9e386959b4174477d'
-         '64e3c15a0f51dc11957b2a62c79b69c9'
-         '7bc255a36733d0fbc80c1902ade4beca'
-         '64a910e50f98b7dcd3f03b427d6cebe3'
-         'd45a908a6e1333fc4f361c8e3ab00d5a'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
@@ -65,26 +53,6 @@ build() {
 #	  sed -i -e 's/^.*kde-qt .*/        echo "   kde-qt '${kdeqtver}'"/' $startdir/qt.install
 #	fi
 
-	# revert qlist.h commit that seems to induce crashes in qDeleteAll<QList (QTBUG-22037)
-	patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.8.0-QTBUG-22037.patch
-
-	# Qt doesn't close orphaned file descriptors after printing (#746601, QTBUG-14724)
-	patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.8.0-QTBUG-14724.patch 
-
-	# Buttons in Qt applications not clickable when run under gnome-shell (#742658, QTBUG-21900)
-	patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.8.0-QTBUG-21900.patch
-
-	# restore Qt-4.7 behavior (which kde needs) to QUrl.toLocalfile
-	# https://bugzilla.redhat.com/show_bug.cgi?id=749213
-	patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch
-
-	# workaround
-	# sql/drivers/tds/qsql_tds.cpp:341:49: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
-	patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.7.4-tds_no_strict_aliasing.patch
-
-	# don't spam if libicu is not present at runtime
-	patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.8.0-icu_no_spam.patch
-
         export QT4DIR="${srcdir}"/${_pkgfqn}
         export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}