2011-06-13 Stephen Browne <[email protected]> gnome-2-30
authorstephen
Mon, 13 Jun 2011 14:07:02 +0000
branchgnome-2-30
changeset 21871 f035508e504c
parent 21870 ff5ab02d13a1
child 21872 693f0cf21170
2011-06-13 Stephen Browne <[email protected]> * patches/tsoljdsdevmgr-04-wnck-api-fix.diff: fix API mismatch * specs/SUNWtgnome-tsoljdsdevmgr.spec: add new patch Fixes bugster 7053235
ChangeLog
patches/tsoljdsdevmgr-04-wnck-api-fix.diff
specs/SUNWtgnome-tsoljdsdevmgr.spec
--- a/ChangeLog	Mon Jun 13 12:36:58 2011 +0000
+++ b/ChangeLog	Mon Jun 13 14:07:02 2011 +0000
@@ -1,3 +1,9 @@
+2011-06-13  Stephen Browne <[email protected]>
+
+	* patches/tsoljdsdevmgr-04-wnck-api-fix.diff: fix API mismatch
+	* specs/SUNWtgnome-tsoljdsdevmgr.spec: add new patch
+	Fixes bugster 7053235
+
 2011-06-13  Michal Pryc <[email protected]>
 
         * patches/rdesktop-04-remote-file-access.diff: Fixes CR 7053893.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/tsoljdsdevmgr-04-wnck-api-fix.diff	Mon Jun 13 14:07:02 2011 +0000
@@ -0,0 +1,13 @@
+diff -urN devmgr.orig/src/devmgr-dialog.c devmgr.new/src/devmgr-dialog.c
+--- devmgr.orig/src/devmgr-dialog.c	2011-06-13 14:57:37.035522970 +0100
++++ devmgr.new/src/devmgr-dialog.c	2011-06-13 14:58:10.443713362 +0100
+@@ -918,7 +918,8 @@
+ }
+ 
+ void
+-workspace_changed_callback(WnckScreen *screen, gpointer data)
++workspace_changed_callback(WnckScreen *screen, WnckWorkspace *prev, 
++			   gpointer data)
+ {
+   char *zonename = get_zonename( screen );
+   gint value = GPOINTER_TO_INT(data);
--- a/specs/SUNWtgnome-tsoljdsdevmgr.spec	Mon Jun 13 12:36:58 2011 +0000
+++ b/specs/SUNWtgnome-tsoljdsdevmgr.spec	Mon Jun 13 14:07:02 2011 +0000
@@ -30,6 +30,7 @@
 Patch1:                  tsoljdsdevmgr-01-dialog-crash.diff
 Patch2:                  tsoljdsdevmgr-02-use-stock-icons.diff
 Patch3:                  tsoljdsdevmgr-03-use-dev_alloc_h.diff
+Patch4:                  tsoljdsdevmgr-04-wnck-api-fix.diff
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:		 %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -60,6 +61,7 @@
 %patch1 -p1
 %patch2
 %patch3
+%patch4 -p1
 
 %build
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"