[SCM] paprefs packaging branch, master, updated. debian/0.9.9-1-11-ge91f7b9

q-funk-guest at users.alioth.debian.org q-funk-guest at users.alioth.debian.org
Tue May 15 08:46:16 UTC 2012 

The branch, master has been updated
       via  e91f7b979b98b0fffb034f8d489458287d7b0c3d (commit)
      from  992af4760a12208e7fb7273a890c4bbfa5e66fc6 (commit)


- Shortlog ------------------------------------------------------------
e91f7b9 patches: multiarch support from upstream GIT.

Summary of changes:
 debian/changelog                                   |    1 +
 debian/patches/0001_make_PA_version_Agnostic.patch |   29 +++++++
 debian/patches/0002_multiarch_support.patch        |   82 ++++++++++++++++++++
 debian/patches/series                              |    2 +
 4 files changed, 114 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit e91f7b979b98b0fffb034f8d489458287d7b0c3d
Author: Martin-Éric Racine <martin-eric.racine at iki.fi>
Date:   Tue May 15 11:45:29 2012 +0300

    patches: multiarch support from upstream GIT.

diff --git a/debian/changelog b/debian/changelog
index 0e6a5f7..88858e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ paprefs (0.9.10-1) UNRELEASED; urgency=low
     - [debian/control]: drop the Build-Depends on quilt.
     - [debian/rules]: drop the patchsys-quilt.mk CDBS include.
   * watch: updated to point to FreeDesktop.org XZ tarball archive.
+  * patches: added two patches from upstream GIT to support multiarch.
 
  -- Martin-Éric Racine <martin-eric.racine at iki.fi>  Tue, 15 May 2012 00:21:55 +0300
 
diff --git a/debian/patches/0001_make_PA_version_Agnostic.patch b/debian/patches/0001_make_PA_version_Agnostic.patch
new file mode 100644
index 0000000..be84041
--- /dev/null
+++ b/debian/patches/0001_make_PA_version_Agnostic.patch
@@ -0,0 +1,29 @@
+From 4fcee37cb92c689b43a0d8fc1d8e6b2764834cbf Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin at mageia.org>
+Date: Sun, 06 Nov 2011 14:31:27 +0000
+Subject: Do not require a recompile for each new PA version in order to detect the modules.
+
+---
+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);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/0002_multiarch_support.patch b/debian/patches/0002_multiarch_support.patch
new file mode 100644
index 0000000..f787a11
--- /dev/null
+++ b/debian/patches/0002_multiarch_support.patch
@@ -0,0 +1,82 @@
+From 779c0ca043406c64761557f511d2a805ab5beb9e Mon Sep 17 00:00:00 2001
+From: Colin Guthrie <colin at mageia.org>
+Date: Fri, 20 Jan 2012 14:20:54 +0000
+Subject: modules: Better code for working out the dynamic module dir.
+
+The current code used libdir from the pkgconfig file, but Debian
+and Ubuntu do not put their modules inside this folder and thus it's
+a bit flawed.
+
+So take the static module dir and strip of the trailing parts that
+might change with a new library version and make that tail end
+dynamic. Should work on all platforms.
+---
+diff --git a/configure.ac b/configure.ac
+index 9f4543b..69eea2f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,8 +43,8 @@ AC_SUBST(GUILIBS_CFLAGS)
+ AC_SUBST(GUILIBS_LIBS)
+ 
+ PKG_CHECK_MODULES(LIBPULSE, libpulse)
+-LIBPULSE_MODLIBDIR=`pkg-config libpulse --variable libdir`
+-AC_SUBST(LIBPULSE_MODLIBDIR)
++LIBPULSE_MODLIBEXECDIR=`pkg-config libpulse --variable modlibexecdir`
++AC_SUBST(LIBPULSE_MODLIBEXECDIR)
+ 
+ # If using GCC specifiy some additional parameters
+ if test "x$GCC" = "xyes" ; then
+diff --git a/src/Makefile.am b/src/Makefile.am
+index bacfb1a..34f454f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,7 +31,7 @@ paprefs_SOURCES=paprefs.cc
+ 
+ paprefs_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(LIBPULSE_LIBS)
+ paprefs_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(LIBPULSE_CFLAGS)
+-paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODLIBDIR=\""$(LIBPULSE_MODLIBDIR)/"\" -DSHREXT=\"$(SHREXT)\"
++paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODDIR=\""$(LIBPULSE_MODLIBEXECDIR)"\" -DSHREXT=\"$(SHREXT)\"
+ 
+ EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
+ 
+diff --git a/src/paprefs.cc b/src/paprefs.cc
+index 919b15c..9f3ad31 100644
+--- a/src/paprefs.cc
++++ b/src/paprefs.cc
+@@ -637,18 +637,26 @@ void MainWindow::readFromGConf() {
+ }
+ 
+ gchar * MainWindow::modulePath(const gchar *name) {
+-  gchar *path, *pulsedir, *c, **versions;
++  gchar *path, *c, **versions;
+ 
+   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);
++  if (versions[0] && versions[1]) {
++      gchar *pulsedir, *search;
++
++      /* Remove the "/pulse-x.y/modules" suffix so we can dynamically inject
++       * it again with runtime library version numbers */
++      pulsedir = g_strdup_printf ("%s", MODDIR);
++      if ((search = g_strrstr (pulsedir, G_DIR_SEPARATOR_S))) {
++          *search = '\0';
++          if ((search = g_strrstr (pulsedir, G_DIR_SEPARATOR_S)))
++              *search = '\0';
++      }
++      path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "pulse-%s.%s" G_DIR_SEPARATOR_S "modules" G_DIR_SEPARATOR_S "%s", pulsedir, versions[0], versions[1], name);
++      g_free (pulsedir);
++  } else
++      path = g_build_filename (MODDIR, name, NULL);
+   g_strfreev(versions);
+ 
+-  path = g_build_filename (MODLIBDIR, pulsedir, "modules", name, NULL);
+-  g_free (pulsedir);
+-
+   return path;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..1d1bb00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001_make_PA_version_Agnostic.patch
+0002_multiarch_support.patch

-- 
paprefs packaging

More information about the pkg-pulseaudio-devel mailing list