diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/kdebase-workspace/sensors-fix.patch | 22 | ||||
| -rw-r--r-- | extra/kdebase-workspace/shutdown-fix.patch | 11 | ||||
| -rw-r--r-- | extra/procmail/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/pycups/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/qsynth/PKGBUILD | 23 | ||||
| -rw-r--r-- | extra/swig/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/swig/swig-pyslice.patch | 22 |
8 files changed, 81 insertions, 38 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index e30f73a9a..44593c57b 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118067 2011-04-05 10:07:59Z andrea $ +# $Id: PKGBUILD 118827 2011-04-08 07:49:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace pkgver=4.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -26,7 +26,9 @@ backup=('usr/share/config/kdm/kdmrc' 'etc/pam.d/kscreensaver') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch') + 'fixpath.patch' 'terminate-server.patch' + 'shutdown-fix.patch' + 'sensors-fix.patch') sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -34,13 +36,19 @@ sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7' '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' - 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'c18422cb964e51d2cfcca3907904a361d507c8e1' + 'fd6bb3239705c23d38f51fb39048b05ed6e95703') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p0 -i ${srcdir}/kdm-zsh-profile.patch patch -p0 -i ${srcdir}/fixpath.patch patch -p0 -i ${srcdir}/terminate-server.patch + patch -Np1 -i ${srcdir}/shutdown-fix.patch + + # Already fixed upstream + patch -Np1 -i ${srcdir}/sensors-fix.patch cd ${srcdir} mkdir build @@ -50,8 +58,7 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_Xmms=OFF \ - -DWITH_Googlegadgets=OFF \ - -DWITH_PolkitQt=OFF + -DWITH_Googlegadgets=OFF make } diff --git a/extra/kdebase-workspace/sensors-fix.patch b/extra/kdebase-workspace/sensors-fix.patch new file mode 100644 index 000000000..2d9b70c52 --- /dev/null +++ b/extra/kdebase-workspace/sensors-fix.patch @@ -0,0 +1,22 @@ +commit 23863a99399cbb274f6756146b3c08de2efa0c7f +Author: John Tapsell <johnflux@gmail.com> +Date: Thu Apr 7 10:59:20 2011 +0100 + + Fix accidental removal of a #include, when adding freebsd support. This broke the lmsensors at minimum + + BUG: 270246 + BUG: 270246 + CCMAIL: naylor.b.david@gmail.com + +diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h +index e780be6..9aae890 100644 +--- a/ksysguard/ksysguardd/modules.h ++++ b/ksysguard/ksysguardd/modules.h +@@ -23,6 +23,7 @@ + #ifndef KSG_MODULES_H + #define KSG_MODULES_H + ++#include "config-ksysguardd.h" + #include "Command.h" + #include "conf.h" + #include "ksysguardd.h" diff --git a/extra/kdebase-workspace/shutdown-fix.patch b/extra/kdebase-workspace/shutdown-fix.patch new file mode 100644 index 000000000..b01ab7fba --- /dev/null +++ b/extra/kdebase-workspace/shutdown-fix.patch @@ -0,0 +1,11 @@ +--- kdebase-workspace-4.6.2/kdm/config.def~ 2011-04-08 00:29:48.291941154 -0700 ++++ kdebase-workspace-4.6.2/kdm/config.def 2011-04-08 00:32:04.738607619 -0700 +@@ -38,7 +38,7 @@ + # define HALT_CMD "/usr/sbin/shutdown -h now" + # define REBOOT_CMD "/usr/sbin/shutdown -r now" + #elif defined(BSD) || defined(__linux__) +-# define HALT_CMD "/sbin/shutdown -p now" ++# define HALT_CMD "/sbin/shutdown -h now" + # define REBOOT_CMD "/sbin/shutdown -r now" + #elif defined(__SVR4) + # define HALT_CMD "/usr/sbin/halt" diff --git a/extra/procmail/PKGBUILD b/extra/procmail/PKGBUILD index df4a9c2a6..4fe479094 100644 --- a/extra/procmail/PKGBUILD +++ b/extra/procmail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 114723 2011-03-15 18:50:11Z andyrtr $ +# $Id: PKGBUILD 118844 2011-04-08 11:25:08Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=procmail pkgver=3.22 -pkgrel=3 +pkgrel=4 pkgdesc="Highly configurable auto mail processing." arch=(i686 x86_64) url="http://www.procmail.org" @@ -19,7 +19,7 @@ md5sums=('1678ea99b973eb77eda4ecf6acae53f1' build() { cd $srcdir/$pkgname-$pkgver patch -Np1 -i ${srcdir}/procmail-3.22-getline.patch - yes n | make LOCKINGTEST="/tmp ." + yes n | make CFLAGS0="${CFLAGS} ${LDFLAGS}" LOCKINGTEST="/tmp ." make BASENAME=${pkgdir}/usr MANDIR=${pkgdir}/usr/share/man install } diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD index 6e0ae9700..9d1109f93 100644 --- a/extra/pycups/PKGBUILD +++ b/extra/pycups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111850 2011-03-01 12:31:00Z andrea $ +# $Id: PKGBUILD 118849 2011-04-08 14:57:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: nesl247 <nesl247@gmail.com> pkgname=pycups -pkgver=1.9.54 +pkgver=1.9.55 pkgrel=1 pkgdesc="Python CUPS Bindings" url="http://cyberelk.net/tim/software/pycups/" @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') license=('GPL') depends=('libcups' 'python2') source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('57e6e0b0e7ea814660c08b8d19fc20e1') +md5sums=('b2a5082cfacc3350b53e7fee188b2dc5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD index 781def0d3..56524dc94 100644 --- a/extra/qsynth/PKGBUILD +++ b/extra/qsynth/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 85922 2010-07-22 10:34:18Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 118833 2011-04-08 10:15:47Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=qsynth -pkgver=0.3.5 +pkgver=0.3.6 pkgrel=1 -pkgdesc="Qt GUI for fluidsynth" +pkgdesc="Qt GUI for FluidSynth" arch=('i686' 'x86_64') -url="http://qsynth.sourceforge.net/qsynth-index.html" +url="http://qsynth.sourceforge.net/" license=('GPL') depends=('fluidsynth' 'qt') options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e1566eecf7bf3869211783cfe7a327b5') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('3cba3c87463be75ac188ebc3c3023d12') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr - make || return 1 - make DESTDIR="${pkgdir}" install + make + make DESTDIR="$pkgdir/" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD index b74e723ad..bec4664f4 100644 --- a/extra/swig/PKGBUILD +++ b/extra/swig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 115117 2011-03-17 01:15:24Z stephane $ +# $Id: PKGBUILD 118854 2011-04-08 16:01:46Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=swig -pkgver=2.0.2 -pkgrel=4 +pkgver=2.0.3 +pkgrel=1 pkgdesc="Generate scripting interfaces to C/C++ code" arch=('i686' 'x86_64') url="http://www.swig.org/" @@ -13,9 +13,9 @@ depends=('gcc-libs' 'zlib' 'pcre') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz swig-deprecated-pycobject.patch swig-pyslice.patch) -sha1sums=('1fc5a7b42ae41c51772d7268ba0f987e9514d110' +sha1sums=('da09610f0b925fae40b40186d262c46e3e1f2bf0' 'add71330c5d839d9a27b1ca688e6c5e31f1edb7b' - '7248b34032db7cb84143a6cefae425b222ce43a6') + 'b8e28148fcef01f24a9acc6218dc090dbde03c37') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/swig/swig-pyslice.patch b/extra/swig/swig-pyslice.patch index e615b5d03..a6dd852ec 100644 --- a/extra/swig/swig-pyslice.patch +++ b/extra/swig/swig-pyslice.patch @@ -1,6 +1,6 @@ -diff -Naur swig-2.0.2.ori/Lib/python/pycontainer.swg swig-2.0.2/Lib/python/pycontainer.swg ---- swig-2.0.2.ori/Lib/python/pycontainer.swg 2010-10-19 02:31:31.000000000 -0400 -+++ swig-2.0.2/Lib/python/pycontainer.swg 2011-03-16 20:41:28.090000004 -0400 +diff -Naur swig-2.0.3.ori/Lib/python/pycontainer.swg swig-2.0.3/Lib/python/pycontainer.swg +--- swig-2.0.3.ori/Lib/python/pycontainer.swg 2010-10-18 23:31:31.000000000 -0700 ++++ swig-2.0.3/Lib/python/pycontainer.swg 2011-04-08 08:50:37.281941342 -0700 @@ -630,6 +630,7 @@ return x; } @@ -53,14 +53,14 @@ diff -Naur swig-2.0.2.ori/Lib/python/pycontainer.swg swig-2.0.2/Lib/python/pycon throw (std::out_of_range) { Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { -diff -Naur swig-2.0.2.ori/Source/Modules/python.cxx swig-2.0.2/Source/Modules/python.cxx ---- swig-2.0.2.ori/Source/Modules/python.cxx 2011-02-20 08:47:14.000000000 -0500 -+++ swig-2.0.2/Source/Modules/python.cxx 2011-03-16 20:40:01.223333338 -0400 -@@ -440,6 +440,7 @@ +diff -Naur swig-2.0.3.ori/Source/Modules/python.cxx swig-2.0.3/Source/Modules/python.cxx +--- swig-2.0.3.ori/Source/Modules/python.cxx 2011-03-14 00:22:08.000000000 -0700 ++++ swig-2.0.3/Source/Modules/python.cxx 2011-04-08 08:53:39.288607977 -0700 +@@ -437,6 +437,7 @@ + if (py3) { - /* force disable features that not compatible with Python 3.x */ - classic = 0; -+ Preprocessor_define((DOH *) "NO_PYSLICE 1", 0); + /* force disable features that not compatible with Python 3.x */ ++ Preprocessor_define((DOH *) "NO_PYSLICE 1", 0); + classic = 0; } - if (cppcast) { |