summaryrefslogtreecommitdiff
path: root/extra/paprefs
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-11-10 23:14:50 +0000
committerroot <root@rshg054.dnsready.net>2011-11-10 23:14:50 +0000
commit4141f5b04aab597f88a617a82649a404c773469a (patch)
treeb293827df78bf1e9b7059db63c04c3f7ab854ae6 /extra/paprefs
parent7b0cdd65ac7bcd3c7597b528a10de58e4e0a430f (diff)
Thu Nov 10 23:14:50 UTC 2011
Diffstat (limited to 'extra/paprefs')
-rw-r--r--extra/paprefs/PKGBUILD14
-rw-r--r--extra/paprefs/do-not-require-recompile.patch33
2 files changed, 41 insertions, 6 deletions
diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD
index c6b773a0e..6be68601b 100644
--- a/extra/paprefs/PKGBUILD
+++ b/extra/paprefs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139412 2011-10-01 19:00:47Z ibiru $
+# $Id: PKGBUILD 142425 2011-11-09 11:00:22Z heftig $
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -6,20 +6,22 @@
pkgname=paprefs
pkgver=0.9.10
-pkgrel=1
+pkgrel=2
pkgdesc="A simple GTK-based configuration dialog for PulseAudio"
arch=(i686 x86_64)
url="http://0pointer.de/lennart/projects/paprefs"
license=(GPL)
depends=(gconfmm gnome-icon-theme libglademm libsigc++ pulseaudio)
makedepends=(intltool)
-source=(http://0pointer.de/lennart/projects/paprefs/$pkgname-$pkgver.tar.gz
- paprefs.desktop)
-md5sums=('15bc6caea388e4de17e8746293cfb529'
- '20dc978f0bd4a0bf925a4eaf80a2b8f8')
+source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.xz
+ paprefs.desktop do-not-require-recompile.patch)
+sha256sums=('261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0'
+ '5cdd6cffb08d611451f01b34b08b316fb14cbd14b283bf5d180b8dcde11fa46b'
+ '00fd4b14e81d90ac6d74e6eb689fa4e20e1a2fbc2eefbb440a11b1373e115a9d')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i "$srcdir/do-not-require-recompile.patch"
./configure --prefix=/usr --disable-lynx
make
}
diff --git a/extra/paprefs/do-not-require-recompile.patch b/extra/paprefs/do-not-require-recompile.patch
new file mode 100644
index 000000000..66d110b3e
--- /dev/null
+++ b/extra/paprefs/do-not-require-recompile.patch
@@ -0,0 +1,33 @@
+From 4fcee37cb92c689b43a0d8fc1d8e6b2764834cbf Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin@mageia.org>
+Date: Sun, 6 Nov 2011 14:31:27 +0000
+Subject: [PATCH] Do not require a recompile for each new PA version in order to detect the modules.
+
+---
+ src/paprefs.cc | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/paprefs.cc b/src/paprefs.cc
+index 21fdc95..919b15c 100644
+--- a/src/paprefs.cc
++++ b/src/paprefs.cc
+@@ -637,9 +637,14 @@ void MainWindow::readFromGConf() {
+ }
+
+ gchar * MainWindow::modulePath(const gchar *name) {
+- gchar *path, *pulsedir, *c;
++ gchar *path, *pulsedir, *c, **versions;
+
+- pulsedir = g_strdup_printf ("pulse-%d.%d", PA_MAJOR, PA_MINOR);
++ versions = g_strsplit(pa_get_library_version(), ".", 3);
++ if (versions[0] && versions[1])
++ pulsedir = g_strdup_printf ("pulse-%s.%s", versions[0], versions[1]);
++ else
++ pulsedir = g_strdup_printf ("pulse-%d.%d", PA_MAJOR, PA_MINOR);
++ g_strfreev(versions);
+
+ path = g_build_filename (MODLIBDIR, pulsedir, "modules", name, NULL);
+ g_free (pulsedir);
+--
+1.6.3.3
+