packages: padevchooser/padevchooser-libnotify.patch, padevchooser/padevchoo...

glen glen at pld-linux.org
Mon Jul 11 21:51:53 CEST 2011


Author: glen                         Date: Mon Jul 11 19:51:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use 0.9.4 snapshot (svn20070925), fixes white background issue in black systray (gnome3 default)

---- Files affected:
packages/padevchooser:
   padevchooser-libnotify.patch (1.1 -> 1.2) , padevchooser.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/padevchooser/padevchooser-libnotify.patch
diff -u packages/padevchooser/padevchooser-libnotify.patch:1.1 packages/padevchooser/padevchooser-libnotify.patch:1.2
--- packages/padevchooser/padevchooser-libnotify.patch:1.1	Sat Apr  9 22:28:00 2011
+++ packages/padevchooser/padevchooser-libnotify.patch	Mon Jul 11 21:51:47 2011
@@ -1,15 +1,25 @@
-diff -urN padevchooser-0.9.3/src/padevchooser.c padevchooser-0.9.3.new//src/padevchooser.c
---- padevchooser-0.9.3/src/padevchooser.c	2006-07-27 20:27:12.000000000 +0200
-+++ padevchooser-0.9.3.new//src/padevchooser.c	2011-04-09 22:25:35.012378517 +0200
-@@ -162,7 +162,11 @@
-         
+From fc8bd87c9827632828789f50caa196329d35c5a8 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Sun, 6 Feb 2011 14:44:28 +0100
+Subject: [PATCH 2/2] Fix build with new libnotify
+
+---
+ src/padevchooser.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/padevchooser.c b/src/padevchooser.c
+index 3703e34..2f506fd 100644
+--- a/src/padevchooser.c
++++ b/src/padevchooser.c
+@@ -171,7 +171,7 @@ static void notify_event(const char *title, const char*text) {
+ 
      if (!notification) {
          s = g_strdup_printf("<i>%s</i>\n%s", title, text);
-+#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
-         notification = notify_notification_new(title, s, "audio-card", GTK_WIDGET(tray_icon));
-+#else
-+        notification = notify_notification_new(title, s, "audio-card");
-+#endif
+-        notification = notify_notification_new_with_status_icon(title, s, "audio-card", tray_icon);
++        notification = notify_notification_new(title, s, NULL);
          notify_notification_set_category(notification, "device.added");
          notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW);
          g_signal_connect_swapped(G_OBJECT(notification), "closed", G_CALLBACK(notification_closed), NULL);
+-- 
+1.7.1
+

================================================================
Index: packages/padevchooser/padevchooser.spec
diff -u packages/padevchooser/padevchooser.spec:1.11 packages/padevchooser/padevchooser.spec:1.12
--- packages/padevchooser/padevchooser.spec:1.11	Sat Apr  9 22:28:00 2011
+++ packages/padevchooser/padevchooser.spec	Mon Jul 11 21:51:47 2011
@@ -1,19 +1,24 @@
 # $Revision$, $Date$
+%define		subver	svn20070925
+%define		rel		1
 Summary:	PulseAudio Device Chooser
 Summary(pl.UTF-8):	PulseAudio Device Chooser - narzędzie do wyboru urządzeń
 Name:		padevchooser
-Version:	0.9.3
-Release:	4
+Version:	0.9.4
+Release:	0.%{subver}.%{rel}
 License:	GPL v2+
 Group:		X11/Applications/Sound
-Source0:	http://0pointer.de/lennart/projects/padevchooser/%{name}-%{version}.tar.gz
-# Source0-md5:	6a9b52ad349f3fb3d5a3ccdf85958710
+#Source0:	http://0pointer.de/lennart/projects/padevchooser/%{name}-%{version}.tar.gz
+Source0:	http://pkgs.fedoraproject.org/repo/pkgs/padevchooser/%{name}-%{version}.%{subver}.tar.gz/164cc955445b3165d49f3de48e9551cf/%{name}-%{version}.%{subver}.tar.gz
+# Source0-md5:	164cc955445b3165d49f3de48e9551cf
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-libnotify.patch
 URL:		http://0pointer.de/lennart/projects/padevchooser/
 BuildRequires:	GConf2-devel >= 2.0
+BuildRequires:	gnome-desktop2-devel
 BuildRequires:	gtk+2-devel >= 1:2.0
 BuildRequires:	libglade2-devel >= 1:2.0
+BuildRequires:	libgnomeui-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel >= 0.9.2
@@ -26,8 +31,8 @@
 features of the PulseAudio sound server. Specifically it can do for
 you:
  - Notify about new sink/sources becoming available on the LAN
- - Quickly change the default PulseAudio sink/source/server assigned
-   to the current X11 display, selecting devices available on the LAN
+ - Quickly change the default PulseAudio sink/source/server assigned to
+   the current X11 display, selecting devices available on the LAN
  - Start the auxiliary tools: PulseAudio Volume Control, PulseAudio
    Volume Meter, PulseAudio Manager, PulseAudio Preferences
 
@@ -55,7 +60,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -75,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2011/07/11 19:51:47  glen
+- use 0.9.4 snapshot (svn20070925), fixes white background issue in black systray (gnome3 default)
+
 Revision 1.11  2011/04/09 20:28:00  megabajt
 - fixed build with libnotify 0.7
 - release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/padevchooser/padevchooser-libnotify.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/padevchooser/padevchooser.spec?r1=1.11&r2=1.12&f=u



More information about the pld-cvs-commit mailing list