[arch-commits] Commit in paprefs/trunk (PKGBUILD do-not-require-recompile.patch)

[Jan Steffens]

    Date: Wednesday, November 9, 2011 @ 05:58:56
  Author: heftig
Revision: 142424

fix paths

Added:
  paprefs/trunk/do-not-require-recompile.patch
Modified:
  paprefs/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |    8 +++++---
 do-not-require-recompile.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-09 10:25:24 UTC (rev 142423)
+++ PKGBUILD	2011-11-09 10:58:56 UTC (rev 142424)
@@ -6,7 +6,7 @@
 
 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"
@@ -14,12 +14,14 @@
 depends=(gconfmm gnome-icon-theme libglademm libsigc++ pulseaudio)
 makedepends=(intltool)
 source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.xz
-        paprefs.desktop)
+        paprefs.desktop do-not-require-recompile.patch)
 sha256sums=('261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0'
-            '5cdd6cffb08d611451f01b34b08b316fb14cbd14b283bf5d180b8dcde11fa46b')
+            '5cdd6cffb08d611451f01b34b08b316fb14cbd14b283bf5d180b8dcde11fa46b'
+            '00fd4b14e81d90ac6d74e6eb689fa4e20e1a2fbc2eefbb440a11b1373e115a9d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/do-not-require-recompile.patch"
   ./configure --prefix=/usr --disable-lynx
   make
 }

Added: do-not-require-recompile.patch
===================================================================
--- do-not-require-recompile.patch	                        (rev 0)
+++ do-not-require-recompile.patch	2011-11-09 10:58:56 UTC (rev 142424)
@@ -0,0 +1,33 @@
+From 4fcee37cb92c689b43a0d8fc1d8e6b2764834cbf Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin at 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
+