From 12c644d217ecdb0db21da6ed7643eebfd5a1570b Mon Sep 17 00:00:00 2001 From: abveritas Date: Thu, 19 Jan 2012 20:22:57 +0000 Subject: [PATCH 1/8] nvidia update to beta to remove the marble bug --- nvidia-utils/PKGBUILD | 8 ++++---- nvidia/PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nvidia-utils/PKGBUILD b/nvidia-utils/PKGBUILD index 6d1191682..2875d915f 100644 --- a/nvidia-utils/PKGBUILD +++ b/nvidia-utils/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=nvidia-utils pkgname=('nvidia-utils' 'opencl-nvidia' 'libcl' 'nvidia-settings') -pkgver=290.10 -pkgrel=4 +pkgver=295.09 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') @@ -22,7 +22,7 @@ options=('!strip') [ "$CARCH" = "x86_64" ] && { ARCH='x86_64' _pkg="NVIDIA-Linux-${ARCH}-${pkgver}-no-compat32" - md5sums=('cebfba9a7e91716a06c66bb5b38d9661') + md5sums=('d3746ccbfdffed6dc984703c5163a0e9') } source=("ftp://download.nvidia.com/XFree86/Linux-${ARCH}/${pkgver}/${_pkg}.run" @@ -46,7 +46,7 @@ build() { package_libcl() { pkgdesc="OpenCL library and ICD loader from NVIDIA" - pkgver=1.1 + pkgver=1.1.5 cd "${srcdir}/${_pkg}" diff --git a/nvidia/PKGBUILD b/nvidia/PKGBUILD index 6e035044b..31c14d18f 100644 --- a/nvidia/PKGBUILD +++ b/nvidia/PKGBUILD @@ -8,8 +8,8 @@ _kernver=$(pacman -Q linux | cut -c7-9 | sed 's/linux //g')-CHAKRA pkgname=nvidia -pkgver=290.10 -pkgrel=2 +pkgver=295.09 +pkgrel=1 pkgdesc="NVIDIA drivers for linux." arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -28,7 +28,7 @@ elif [ "$CARCH" = "x86_64" ]; then _ARCH='x86_64' _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run") - md5sums=('cebfba9a7e91716a06c66bb5b38d9661') + md5sums=('d3746ccbfdffed6dc984703c5163a0e9') fi build() { From 79acd5f2904a0744da7a937367d165d8d2e4a19e Mon Sep 17 00:00:00 2001 From: abveritas Date: Thu, 19 Jan 2012 21:51:55 +0000 Subject: [PATCH 2/8] nvidia-lts update to beta version too --- nvidia-lts/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nvidia-lts/PKGBUILD b/nvidia-lts/PKGBUILD index f4d3aa326..ce355ce01 100644 --- a/nvidia-lts/PKGBUILD +++ b/nvidia-lts/PKGBUILD @@ -8,7 +8,7 @@ _kernver="2.6.35-CHAKRA-LTS" pkgname=nvidia-lts -pkgver=290.10 +pkgver=295.09 pkgrel=1 pkgdesc="NVIDIA drivers for kernel26." arch=('i686' 'x86_64') @@ -28,7 +28,7 @@ elif [ "$CARCH" = "x86_64" ]; then _ARCH='x86_64' _pkg="NVIDIA-Linux-${_ARCH}-${pkgver}-no-compat32" source=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run") - md5sums=('cebfba9a7e91716a06c66bb5b38d9661') + md5sums=('d3746ccbfdffed6dc984703c5163a0e9') fi build() { From 942c6673b88d7f2d55f2f03f30dae21c6bd765b8 Mon Sep 17 00:00:00 2001 From: Anke Date: Fri, 20 Jan 2012 07:20:38 +0000 Subject: [PATCH 3/8] port qt 4.8 unstable commit to testing --- qt/PKGBUILD | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/qt/PKGBUILD b/qt/PKGBUILD index 65ee6535b..a4cbdb0eb 100644 --- a/qt/PKGBUILD +++ b/qt/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -19,12 +19,14 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' - 'qtconfig.desktop') + 'qtconfig.desktop' + "http://chakra-linux.org/sources/qt/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch") md5sums=('e8a5fdbeba2927c948d9f477a6abe904' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' - '6b771c8a81dd90b45e8a79afa0e5bbfd') + '6b771c8a81dd90b45e8a79afa0e5bbfd' + '7bc255a36733d0fbc80c1902ade4beca') # source PKGBUILD && _create-kdeqt-patch _create-kdeqt-patch() { @@ -53,6 +55,9 @@ build() { # sed -i -e 's/^.*kde-qt .*/ echo " kde-qt '${kdeqtver}'"/' $startdir/qt.install # fi + #KDE sound-notification work-around + patch -Np1 -i ${srcdir}/qt-everywhere-opensource-src-4.8.0-QUrl_toLocalFile.patch + export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} From ee035352d5d3c92221bdcc9caa04324e153ae057 Mon Sep 17 00:00:00 2001 From: philm Date: Mon, 23 Jan 2012 09:11:47 +0100 Subject: [PATCH 4/8] ntfs-3g: bump to 2012.1.15 - see changelog: http://www.tuxera.com/community/release-history/ --- ntfs-3g/PKGBUILD | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/ntfs-3g/PKGBUILD b/ntfs-3g/PKGBUILD index 9b75b4d50..6b950bee3 100644 --- a/ntfs-3g/PKGBUILD +++ b/ntfs-3g/PKGBUILD @@ -4,35 +4,46 @@ # maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa -pkgname=ntfs-3g -_realname=ntfs-3g_ntfsprogs -pkgver=2011.4.12 +pkgbase=ntfs-3g_ntfsprogs +pkgname=('ntfs-3g' 'ntfsprogs') +pkgver=2012.1.15 pkgrel=1 -pkgdesc="Stable read and write NTFS driver" url="http://www.tuxera.com" arch=('i686' 'x86_64') license=('GPL2') -depends=('glibc') +depends=('glibc' 'fuse') makedepends=('pkgconfig') options=('!libtool') -conflicts=('ntfsprogs') -provides=("ntfsprogs=${pkgver}") -source=(http://www.tuxera.com/opensource/${_realname}-${pkgver}.tgz +source=(http://tuxera.com/opensource/${pkgbase}-${pkgver}.tgz 25-ntfs-config-write-policy.fdi) -sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7' +sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb' '200029f2999a2c284fd30ae25734abf6459c3501') + build() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \ - --with-fuse=internal --disable-static --disable-gnome-vfs \ + --with-fuse=external --disable-static \ --mandir=/usr/share/man make } -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install +package_ntfs-3g() { + pkgdesc="Stable read and write NTFS driver" + + for DIR in src libntfs-3g include; do + cd "${srcdir}/${pkgbase}-${pkgver}/${DIR}" + make DESTDIR="${pkgdir}" install + done + ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs" install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor" install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/" } + +package_ntfsprogs() { + pkgdesc="NTFS filesystem utilities" + depends=('util-linux' 'ntfs-3g') + + cd "${srcdir}/${pkgbase}-${pkgver}/ntfsprogs" + make DESTDIR="${pkgdir}" install +} From e119d70e362c99d61d379f12f974b75332069251 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 23 Jan 2012 16:36:20 +0000 Subject: [PATCH 5/8] hwinfo update and attempt to fix --- .gitignore | 2 +- hwinfo/PKGBUILD | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ce02dcf76..a24dbed1a 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,4 @@ user.conf *.tar.* *.log *.log* -!*.logrotate + diff --git a/hwinfo/PKGBUILD b/hwinfo/PKGBUILD index 94edb282b..60b758868 100644 --- a/hwinfo/PKGBUILD +++ b/hwinfo/PKGBUILD @@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=hwinfo pkgver=19.0 -pkgrel=3 +pkgrel=4 pkgdesc="A simple program that lists results from the hardware detection library." arch=('i686' 'x86_64') url="http://www.opensuse.org" @@ -17,14 +17,14 @@ license=('GPL2') depends=('perl' 'libx86emu') makedepends=('sysfsutils' 'rpmextract' 'flex') options=('!emptydirs') -source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-4.1.src.rpm" +source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-4.2.src.rpm" "kbd.patch") build() { cd "${srcdir}" msg2 "Extracting source rpm..." - rpmextract.sh "${pkgname}-${pkgver}-4.1.src.rpm" + rpmextract.sh "${pkgname}-${pkgver}-4.2.src.rpm" tar -xjf ${pkgname}-${pkgver}.tar.bz2 cd "${pkgname}-${pkgver}" msg2 "Patching..." @@ -32,12 +32,12 @@ build() { # Fix Makefile using /usr/lib64 instead of /usr/lib - it broke x86_64, possibly i686 too. # Comment if this fix breaks it. sed -i 's_usr/lib64_usr/lib_' src/hd/Makefile - make -j1 + make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } -md5sums=('32873044be2a193357fc177f0fb0f2e3' +md5sums=('a9173a198cacd834fb596c47d163e0fd' '1500ecfa26f6aaf4d7967eea74e86e5d') From b20c1371e854d2878ae719f7524479ce3ec2113d Mon Sep 17 00:00:00 2001 From: Neophytos Date: Mon, 23 Jan 2012 17:36:32 +0000 Subject: [PATCH 6/8] second attempt on hwinfo fix --- hwinfo/PKGBUILD | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/hwinfo/PKGBUILD b/hwinfo/PKGBUILD index 60b758868..7f1311447 100644 --- a/hwinfo/PKGBUILD +++ b/hwinfo/PKGBUILD @@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=hwinfo pkgver=19.0 -pkgrel=4 +pkgrel=5 pkgdesc="A simple program that lists results from the hardware detection library." arch=('i686' 'x86_64') url="http://www.opensuse.org" @@ -28,16 +28,24 @@ build() { tar -xjf ${pkgname}-${pkgver}.tar.bz2 cd "${pkgname}-${pkgver}" msg2 "Patching..." - patch -p0 < ../kbd.patch + patch -p0 < ../kbd.patch + msg2 "Compiling..." + # Fix Makefile using /usr/lib64 instead of /usr/lib - it broke x86_64, possibly i686 too. # Comment if this fix breaks it. - sed -i 's_usr/lib64_usr/lib_' src/hd/Makefile + #sed -i 's_usr/lib64_usr/lib_' src/hd/Makefile + + #Added this from ARCH, to fix the above issue: make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + + #Added this from ARCH, to fix the same issue as stated earlier: + make LIBDIR=/usr/lib DESTDIR=${pkgdir} install + # disabled the following line to add the one above + # make DESTDIR=${pkgdir} install } md5sums=('a9173a198cacd834fb596c47d163e0fd' '1500ecfa26f6aaf4d7967eea74e86e5d') From 002d453c10256caa8069963e4b7399370087f476 Mon Sep 17 00:00:00 2001 From: Daniele Date: Tue, 24 Jan 2012 00:41:42 +0000 Subject: [PATCH 7/8] Rebuilding dbus-glib, for the dbus-core rebuild. --- dbus-glib/PKGBUILD | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dbus-glib/PKGBUILD b/dbus-glib/PKGBUILD index 691b0f4c2..f0fbe22b7 100644 --- a/dbus-glib/PKGBUILD +++ b/dbus-glib/PKGBUILD @@ -3,31 +3,38 @@ # # maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa -# + pkgname=dbus-glib pkgver=0.94 -pkgrel=1 +pkgrel=2 pkgdesc="GLib bindings for DBUS" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') url="http://www.freedesktop.org/wiki/Software/DBusBindings" depends=('dbus-core' 'glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - fix_network_manager.patch) +source=("http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'fix_network_manager.patch') md5sums=('e1f1506a6f4941e67bffd614b1ad5af6' '2a3598342dd25722d452e7beaf21b5f3') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix_network_manager.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-static=no --enable-bash-completion=no + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --enable-bash-completion=no make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install -} \ No newline at end of file +} + +# vim:set ts=2 sw=2 et: From b1acb967bf6033a6d40e115b230d642a92e34643 Mon Sep 17 00:00:00 2001 From: Daniele Date: Tue, 24 Jan 2012 00:42:07 +0000 Subject: [PATCH 8/8] Rebuilding dbus, for the dbus-core rebuild. --- dbus/30-dbus | 9 +++++---- dbus/PKGBUILD | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dbus/30-dbus b/dbus/30-dbus index 603e92d3e..efa846cd7 100644 --- a/dbus/30-dbus +++ b/dbus/30-dbus @@ -1,9 +1,10 @@ -#!/bin/bash +#!/bin/sh # launches a session dbus instance -dbuslaunch="`which dbus-launch 2>/dev/null`" -if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then - eval `$dbuslaunch --sh-syntax --exit-with-session` +dbuslaunch="$(which dbus-launch 2>/dev/null)" + +if [ -x "${dbuslaunch}" ] && [ -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then + eval $("${dbuslaunch}" --sh-syntax --exit-with-session) fi diff --git a/dbus/PKGBUILD b/dbus/PKGBUILD index a4c334957..8bbf26db8 100644 --- a/dbus/PKGBUILD +++ b/dbus/PKGBUILD @@ -6,25 +6,35 @@ # pkgname=dbus pkgver=1.4.14 -pkgrel=1 +pkgrel=2 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') depends=("dbus-core>=${pkgver}" 'libx11') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - 30-dbus) +source=("http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + '30-dbus') md5sums=('ae6de2562a57516cfabaf56903375ba9' - 'd14e59575f04e55d21a04907b6fd9f3c') + 'd1c8e6ed22a59762773dd81363ffacd8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --disable-verbose-mode --disable-static \ - --enable-inotify --disable-dnotify \ - --disable-tests --disable-asserts + + ECHO="echo" ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/dbus-1.0 \ + --with-dbus-user=81 \ + --with-system-pid-file=/var/run/dbus.pid \ + --disable-verbose-mode \ + --disable-static \ + --enable-inotify \ + --disable-dnotify \ + --disable-tests \ + --disable-asserts \ + --with-x \ + --enable-x11-autolaunch + make -C tools dbus-launch } @@ -40,4 +50,6 @@ package() { install -d -m755 "${pkgdir}/usr/share/licenses/dbus" install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/" -} \ No newline at end of file +} + +# vim:set ts=2 sw=2 et: