[arch-commits] Commit in paprefs/repos (10 files)

Jan Steffens heftig at archlinux.org
Wed Nov 9 06:00:22 EST 2011


    Date: Wednesday, November 9, 2011 @ 06:00:22
  Author: heftig
Revision: 142425

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  paprefs/repos/extra-i686/PKGBUILD
    (from rev 142424, paprefs/trunk/PKGBUILD)
  paprefs/repos/extra-i686/do-not-require-recompile.patch
    (from rev 142424, paprefs/trunk/do-not-require-recompile.patch)
  paprefs/repos/extra-i686/paprefs.desktop
    (from rev 142424, paprefs/trunk/paprefs.desktop)
  paprefs/repos/extra-x86_64/PKGBUILD
    (from rev 142424, paprefs/trunk/PKGBUILD)
  paprefs/repos/extra-x86_64/do-not-require-recompile.patch
    (from rev 142424, paprefs/trunk/do-not-require-recompile.patch)
  paprefs/repos/extra-x86_64/paprefs.desktop
    (from rev 142424, paprefs/trunk/paprefs.desktop)
Deleted:
  paprefs/repos/extra-i686/PKGBUILD
  paprefs/repos/extra-i686/paprefs.desktop
  paprefs/repos/extra-x86_64/PKGBUILD
  paprefs/repos/extra-x86_64/paprefs.desktop

---------------------------------------------+
 extra-i686/PKGBUILD                         |   68 +++++++++++++-------------
 extra-i686/do-not-require-recompile.patch   |   33 ++++++++++++
 extra-i686/paprefs.desktop                  |   26 ++++-----
 extra-x86_64/PKGBUILD                       |   68 +++++++++++++-------------
 extra-x86_64/do-not-require-recompile.patch |   33 ++++++++++++
 extra-x86_64/paprefs.desktop                |   26 ++++-----
 6 files changed, 162 insertions(+), 92 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-09 10:58:56 UTC (rev 142424)
+++ extra-i686/PKGBUILD	2011-11-09 11:00:22 UTC (rev 142425)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=paprefs
-pkgver=0.9.10
-pkgrel=1
-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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-lynx
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/paprefs.desktop" \
-    "$pkgdir/usr/share/applications/paprefs.desktop"
-}

Copied: paprefs/repos/extra-i686/PKGBUILD (from rev 142424, paprefs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-09 11:00:22 UTC (rev 142425)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=paprefs
+pkgver=0.9.10
+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://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
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/paprefs.desktop" \
+    "$pkgdir/usr/share/applications/paprefs.desktop"
+}

Copied: paprefs/repos/extra-i686/do-not-require-recompile.patch (from rev 142424, paprefs/trunk/do-not-require-recompile.patch)
===================================================================
--- extra-i686/do-not-require-recompile.patch	                        (rev 0)
+++ extra-i686/do-not-require-recompile.patch	2011-11-09 11:00:22 UTC (rev 142425)
@@ -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
+

Deleted: extra-i686/paprefs.desktop
===================================================================
--- extra-i686/paprefs.desktop	2011-11-09 10:58:56 UTC (rev 142424)
+++ extra-i686/paprefs.desktop	2011-11-09 11:00:22 UTC (rev 142425)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PulseAudio Preferences
-Name[de]=PulseAudio-Einstellungen
-GenericName=Sound Server Preferences
-GenericName[de]=Audio-Dienst-Einstellungen
-Comment=View and modify the configuration of the local sound server
-Comment[de]=Anzeigen und Ändern der Konfiguration des lokalen Audio-Dienstes
-Exec=paprefs
-Icon=preferences-desktop
-StartupNotify=true
-Type=Application
-Categories=Settings;

Copied: paprefs/repos/extra-i686/paprefs.desktop (from rev 142424, paprefs/trunk/paprefs.desktop)
===================================================================
--- extra-i686/paprefs.desktop	                        (rev 0)
+++ extra-i686/paprefs.desktop	2011-11-09 11:00:22 UTC (rev 142425)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=PulseAudio Preferences
+Name[de]=PulseAudio-Einstellungen
+GenericName=Sound Server Preferences
+GenericName[de]=Audio-Dienst-Einstellungen
+Comment=View and modify the configuration of the local sound server
+Comment[de]=Anzeigen und Ändern der Konfiguration des lokalen Audio-Dienstes
+Exec=paprefs
+Icon=preferences-desktop
+StartupNotify=true
+Type=Application
+Categories=Settings;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-11-09 10:58:56 UTC (rev 142424)
+++ extra-x86_64/PKGBUILD	2011-11-09 11:00:22 UTC (rev 142425)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=paprefs
-pkgver=0.9.10
-pkgrel=1
-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')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-lynx
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/paprefs.desktop" \
-    "$pkgdir/usr/share/applications/paprefs.desktop"
-}

Copied: paprefs/repos/extra-x86_64/PKGBUILD (from rev 142424, paprefs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-11-09 11:00:22 UTC (rev 142425)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=paprefs
+pkgver=0.9.10
+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://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
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$srcdir/paprefs.desktop" \
+    "$pkgdir/usr/share/applications/paprefs.desktop"
+}

Copied: paprefs/repos/extra-x86_64/do-not-require-recompile.patch (from rev 142424, paprefs/trunk/do-not-require-recompile.patch)
===================================================================
--- extra-x86_64/do-not-require-recompile.patch	                        (rev 0)
+++ extra-x86_64/do-not-require-recompile.patch	2011-11-09 11:00:22 UTC (rev 142425)
@@ -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
+

Deleted: extra-x86_64/paprefs.desktop
===================================================================
--- extra-x86_64/paprefs.desktop	2011-11-09 10:58:56 UTC (rev 142424)
+++ extra-x86_64/paprefs.desktop	2011-11-09 11:00:22 UTC (rev 142425)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PulseAudio Preferences
-Name[de]=PulseAudio-Einstellungen
-GenericName=Sound Server Preferences
-GenericName[de]=Audio-Dienst-Einstellungen
-Comment=View and modify the configuration of the local sound server
-Comment[de]=Anzeigen und Ändern der Konfiguration des lokalen Audio-Dienstes
-Exec=paprefs
-Icon=preferences-desktop
-StartupNotify=true
-Type=Application
-Categories=Settings;

Copied: paprefs/repos/extra-x86_64/paprefs.desktop (from rev 142424, paprefs/trunk/paprefs.desktop)
===================================================================
--- extra-x86_64/paprefs.desktop	                        (rev 0)
+++ extra-x86_64/paprefs.desktop	2011-11-09 11:00:22 UTC (rev 142425)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=PulseAudio Preferences
+Name[de]=PulseAudio-Einstellungen
+GenericName=Sound Server Preferences
+GenericName[de]=Audio-Dienst-Einstellungen
+Comment=View and modify the configuration of the local sound server
+Comment[de]=Anzeigen und Ändern der Konfiguration des lokalen Audio-Dienstes
+Exec=paprefs
+Icon=preferences-desktop
+StartupNotify=true
+Type=Application
+Categories=Settings;



More information about the arch-commits mailing list