rpms/paprefs/devel paprefs-0.9.7-modulepath.patch, NONE, 1.1 paprefs.spec, 1.12, 1.13 paprefs-gcc43.patch, 1.1, NONE

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/paprefs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1534

Modified Files:
	paprefs.spec 
Added Files:
	paprefs-0.9.7-modulepath.patch 
Removed Files:
	paprefs-gcc43.patch 
Log Message:
* Sun Mar 15 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.9.7-5
- Try harder when looking for modules


paprefs-0.9.7-modulepath.patch:

--- NEW FILE paprefs-0.9.7-modulepath.patch ---
Instead of looking in hardcoded pulse-0.9/modules, look in pulse-*/modules.
Not nice, but a correct fix would probably add dependency on pulseaudio.

Lubomir Rintel <lkundrak at v3.sk>

diff -up paprefs-0.9.7/src/Makefile.am.modulepath paprefs-0.9.7/src/Makefile.am
--- paprefs-0.9.7/src/Makefile.am.modulepath	2008-08-05 20:14:28.000000000 +0200
+++ paprefs-0.9.7/src/Makefile.am	2009-03-15 20:43:22.803955812 +0100
@@ -31,7 +31,7 @@ paprefs_SOURCES=paprefs.cc
 
 paprefs_LDADD=$(AM_LDADD) $(GUILIBS_LIBS)
 paprefs_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS)
-paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODULESDIR=\""${libdir}/pulse-0.9/modules/"\" -DSHREXT=\"$(SHREXT)\"
+paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODULESDIR=\""${libdir}/pulse-*/modules/"\" -DSHREXT=\"$(SHREXT)\"
 #paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODULESDIR=\""/usr/local/lib/pulse-0.9/modules/"\" -DSHREXT=\"$(SHREXT)\"
 
 EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
diff -up paprefs-0.9.7/src/Makefile.in.modulepath paprefs-0.9.7/src/Makefile.in
--- paprefs-0.9.7/src/Makefile.in.modulepath	2008-09-09 14:45:02.000000000 +0200
+++ paprefs-0.9.7/src/Makefile.in	2009-03-15 20:43:22.806959534 +0100
@@ -264,7 +264,7 @@ paprefs_LDADD = $(AM_LDADD) $(GUILIBS_LI
 paprefs_CXXFLAGS = $(AM_CXXFLAGS) $(GUILIBS_CFLAGS) \
 	-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DMODULESDIR=\""${libdir}/pulse-0.9/modules/"\" \
+	-DMODULESDIR=\""${libdir}/pulse-*/modules/"\" \
 	-DSHREXT=\"$(SHREXT)\"
 #paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODULESDIR=\""/usr/local/lib/pulse-0.9/modules/"\" -DSHREXT=\"$(SHREXT)\"
 EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
diff -up paprefs-0.9.7/src/paprefs.cc.modulepath paprefs-0.9.7/src/paprefs.cc
--- paprefs-0.9.7/src/paprefs.cc.modulepath	2008-08-05 19:46:06.000000000 +0200
+++ paprefs-0.9.7/src/paprefs.cc	2009-03-15 20:48:27.991070713 +0100
@@ -27,6 +27,8 @@
 #include <libglademm.h>
 #include <gconfmm.h>
 #include <libintl.h>
+#include <glob.h>
+#include <string>
 
 #define PA_GCONF_ROOT "/system/pulseaudio"
 #define PA_GCONF_PATH_MODULES PA_GCONF_ROOT"/modules"
@@ -389,17 +391,25 @@ void MainWindow::readFromGConf() {
     updateSensitive();
 }
 
+bool file_exists(std::string fileglob)
+{
+    glob_t pglob;
+    bool retval = (glob(fileglob.c_str(), GLOB_NOSORT, NULL, &pglob) == 0);
+    globfree(&pglob);
+    return retval;
+}
+
 void MainWindow::checkForModules() {
 
     remoteAvailable =
-        access(MODULESDIR "module-esound-protocol-tcp" SHREXT, F_OK) == 0 ||
-        access(MODULESDIR "module-native-protocol-tcp" SHREXT, F_OK) == 0;
+        file_exists(MODULESDIR "module-esound-protocol-tcp" SHREXT) ||
+        file_exists(MODULESDIR "module-native-protocol-tcp" SHREXT);
 
-    zeroconfPublishAvailable = access(MODULESDIR "module-zeroconf-publish" SHREXT, F_OK) == 0;
-    zeroconfDiscoverAvailable = access(MODULESDIR "module-zeroconf-discover" SHREXT, F_OK) == 0;
+    zeroconfPublishAvailable = file_exists(MODULESDIR "module-zeroconf-publish" SHREXT);
+    zeroconfDiscoverAvailable = file_exists(MODULESDIR "module-zeroconf-discover" SHREXT);
 
-    rtpRecvAvailable = access(MODULESDIR "module-rtp-recv" SHREXT, F_OK) == 0;
-    rtpSendAvailable = access(MODULESDIR "module-rtp-send" SHREXT, F_OK) == 0;
+    rtpRecvAvailable = file_exists(MODULESDIR "module-rtp-recv" SHREXT);
+    rtpSendAvailable = file_exists(MODULESDIR "module-rtp-send" SHREXT);
 }
 
 int main(int argc, char *argv[]) {


Index: paprefs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paprefs/devel/paprefs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- paprefs.spec	26 Feb 2009 09:46:40 -0000	1.12
+++ paprefs.spec	15 Mar 2009 20:03:56 -0000	1.13
@@ -1,27 +1,26 @@
 Name:           paprefs
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Management tool for PulseAudio
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/paprefs
 Source0:        http://0pointer.de/lennart/projects/paprefs/paprefs-%{version}.tar.gz
+Patch0:         paprefs-0.9.7-modulepath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       pulseaudio-module-gconf
 
 BuildRequires:  gconfmm26-devel libglademm24-devel lynx desktop-file-utils
 BuildRequires: intltool
 
-#Patch1:         paprefs-gcc43.patch
-
 %description
 PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog
 for the PulseAudio sound server.
 
 %prep
 %setup -q
-#%patch1 -p1 -b .gcc43
+%patch0 -p1 -b .modulepath
 
 
 %build
@@ -54,6 +53,9 @@
 %{_datadir}/applications/paprefs.desktop
 
 %changelog
+* Sun Mar 15 2009 Lubomir Rintel <lkundrak at v3.sk> - 0.9.7-5
+- Try harder when looking for modules
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- paprefs-gcc43.patch DELETED ---