Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-06-10 Halton Huo <[email protected]>
authorhalton
Wed, 10 Jun 2009 11:21:40 +0000
changeset 15886 05669badf0fd
parent 15885 6c55e71413ed
child 15887 84659186b3f6
2009-06-10 Halton Huo <[email protected]> * base-specs/gnome-pilot.spec: add patch5 * patches/gnome-pilot-03-disable-gob-check.diff: rework * patches/gnome-pilot-05-fix-missing-icons.diff: Add to fix bugzilla #584894.
ChangeLog file | annotate | diff | comparison | revisions
base-specs/gnome-pilot.spec file | annotate | diff | comparison | revisions
patches/gnome-pilot-03-disable-gob-check.diff file | annotate | diff | comparison | revisions
patches/gnome-pilot-05-fix-missing-icons.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Wed Jun 10 09:38:39 2009 +0000
+++ b/ChangeLog	Wed Jun 10 11:21:40 2009 +0000
@@ -1,3 +1,10 @@
+2009-06-10  Halton Huo  <[email protected]>
+
+	* base-specs/gnome-pilot.spec: add patch5
+	* patches/gnome-pilot-03-disable-gob-check.diff: rework
+	* patches/gnome-pilot-05-fix-missing-icons.diff:
+	  Add to fix bugzilla #584894.
+
 2009-06-10  Chris Wang <[email protected]>
 
 	* base-specs/gdesklets.spec: correct the status of patch 05
--- a/base-specs/gnome-pilot.spec	Wed Jun 10 09:38:39 2009 +0000
+++ b/base-specs/gnome-pilot.spec	Wed Jun 10 11:21:40 2009 +0000
@@ -25,10 +25,12 @@
 Patch1:         gnome-pilot-01-capplet-install.diff
 #date:2006-11-15 owner:calumb bugster:6489289 bugzilla:375639 type:bug
 Patch2:         gnome-pilot-02-launch-menu-item.diff
-#date:2006-12-13 owner:halton type:branding
+#date:2006-12-13 owner:halton type:bug bugzilla:584904
 Patch3:		gnome-pilot-03-disable-gob-check.diff
 #date:2006-12-18 owner:halton type:branding
 Patch4:		gnome-pilot-04-usb-default.diff
+#date:2009-07-09 owner:halton type:bug bugzilla:584894 status:upstreamed
+Patch5:		gnome-pilot-05-fix-missing-icons.diff
 URL:		http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Docdir:         %{_defaultdocdir}/gnome-pilot
@@ -70,6 +72,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %ifos linux
@@ -93,7 +96,7 @@
 bash -x %SOURCE2 --enable-copyright
 %endif
 
-aclocal $ACLOCAL_FLAGS
+aclocal $ACLOCAL_FLAGS -I macros
 automake -a -c -f
 autoconf
 
@@ -159,6 +162,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Jun 09 2009 - [email protected]
+- Add patch fix-missing-icons.diff to fix bugzilla 584894.
+
 * Thu Jan 8 2008 - [email protected]
 - Bump to 2.0.17.
 - Remove upstream patch.
--- a/patches/gnome-pilot-03-disable-gob-check.diff	Wed Jun 10 09:38:39 2009 +0000
+++ b/patches/gnome-pilot-03-disable-gob-check.diff	Wed Jun 10 11:21:40 2009 +0000
@@ -1,11 +1,87 @@
---- gnome-pilot-2.0.15/configure.in.orig	2006-11-28 13:52:42.671641000 +0800
-+++ gnome-pilot-2.0.15/configure.in	2006-11-28 13:54:26.400932000 +0800
-@@ -195,8 +195,6 @@
- 	else
- 		AC_MSG_ERROR([GOB2 not found and the gob outputfiles are not present, check http://www.5z.com/jirka/gob.html and read the HACKING file])
- 	fi
--else
--	GOB2_CHECK(2.0.3)
- fi
+diff --git a/Makefile.am b/Makefile.am
+index 306ce24..1cd1c23 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -32,6 +32,7 @@ changelogs =				\
+ EXTRA_DIST=			\
+ 	$(changelogs)		\
+ 	macros/compiler-flags.m4 \
++	macros/gob2.m4		\
+ 	conduit.mk		\
+ 	server.mk		\
+ 	intltool-extract.in	\
+diff --git a/configure.in b/configure.in
+index 93e089c..9e5ff3f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,4 +1,6 @@
+ AC_INIT(Makefile.am)
++AC_CONFIG_MACRO_DIR([macros])
++AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I macros")
  
- dnl ***********
+ dnl ******************************
+ dnl Version
+diff --git a/macros/gob2.m4 b/macros/gob2.m4
+new file mode 100644
+index 0000000..b3659fa
+--- /dev/null
++++ b/macros/gob2.m4
+@@ -0,0 +1,58 @@
++dnl
++dnl GOB_HOOK(script if found, fail)
++dnl if fail = "failure", abort if GOB not found
++dnl
++
++
++AC_DEFUN([GOB2_HOOK],[
++	AC_PATH_PROG(GOB2,gob2)
++	if test ! x$GOB2 = x; then	
++		if test ! x$1 = x; then 
++			AC_MSG_CHECKING(for gob-2 >= $1)
++			g_r_ve=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++			g_r_ma=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++			g_r_mi=`echo $1|sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++			g_ve=`$GOB2 --version 2>&1|sed 's/Gob version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++			g_ma=`$GOB2 --version 2>&1|sed 's/Gob version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++			g_mi=`$GOB2 --version 2>&1|sed 's/Gob version \([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++
++			if test $g_ve -eq $g_r_ve; then
++				if test $g_ma -ge $g_r_ma; then
++					if test $g_mi -ge $g_r_mi; then
++						AC_MSG_RESULT(ok)
++					else
++						if test $g_ma -gt $g_r_ma; then
++							AC_MSG_RESULT(ok)
++						else
++							AC_MSG_ERROR("found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi")
++						fi
++					fi
++				else
++					AC_MSG_ERROR("found $g_ve.$g_ma.$g_mi requires $g_r_ve.$g_r_ma.$g_r_mi")
++				fi
++			else
++				if test $g_ve -gt $g_r_ve; then
++					AC_MSG_RESULT(ok)
++				else
++					AC_MSG_ERROR(major version $g_ve found but $g_r_ve required)
++				fi
++			fi
++	
++			unset gob_version
++			unset g_ve
++			unset g_ma
++			unset g_mi
++			unset g_r_ve
++			unset g_r_ma
++			unset g_r_mi
++		fi
++		AC_SUBST(GOB2)
++		$2
++	else		
++		$3
++	fi
++])
++
++AC_DEFUN([GOB2_CHECK],[
++	GOB2_HOOK($1,[],[AC_MSG_WARN([Cannot find GOB-2, check http://www.5z.com/jirka/gob.html])])
++])
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-05-fix-missing-icons.diff	Wed Jun 10 11:21:40 2009 +0000
@@ -0,0 +1,89 @@
+--- /tmp/t/gnome-pilot-2.0.17/applet/pilot.c	2007-01-11 08:32:39.000000000 +0000
++++ gnome-pilot-2.0.17/applet/pilot.c	2009-05-04 23:55:04.000000000 +0100
+@@ -29,7 +29,7 @@
+ #include <errno.h>
+ #include <gnome.h>
+ #include <glade/glade.h>
+-#include <libgnomeui/gnome-window-icon.h>
++#include <gtk/gtk.h>
+ #include <panel-applet-gconf.h>
+ 
+ #include <signal.h>
+@@ -131,6 +131,7 @@
+ {
+ 	GdkColormap *colormap;
+ 	gchar *buf;
++	GError *error;
+ 	PilotApplet *applet = PILOT_APPLET (user_data);
+ 
+ 	gtk_tooltips_set_tip (applet->tooltips, GTK_WIDGET(applet->applet),
+@@ -146,8 +147,8 @@
+ 	if (applet->properties.popups == FALSE) return;
+ 
+ 	if (applet->progressDialog == NULL) {
+-		gnome_window_icon_set_default_from_file (
+-				GNOME_ICONDIR "/sync_icon.png");
++		gtk_window_set_default_icon_from_file (
++		    GNOME_ICONDIR "/sync_icon.png", &error);
+ 		GladeXML *xml              = glade_xml_new (applet->glade_file,"ProgressDialog",NULL);
+ 		applet->progressDialog       = glade_xml_get_widget (xml,"ProgressDialog");
+ 		applet->sync_label           = glade_xml_get_widget (xml,"sync_label");
+@@ -427,7 +428,10 @@
+ 
+ static void
+ about_cb(BonoboUIComponent *uic, PilotApplet *pilot, const gchar *verbname)
++
+ {
++	GError *error;
++
+ 	GtkWidget *about;
+ 	const gchar *authors[] = {"Vadim Strizhevsky <[email protected]>",
+ 				  "Eskil Heyn Olsen, <[email protected]>",
+@@ -437,8 +441,15 @@
+ 				  "Matt Davey <[email protected]>",
+ 				  NULL};
+ 
+-	gnome_window_icon_set_default_from_file (
+-				GNOME_ICONDIR "/sync_icon.png");
++	gtk_window_set_default_icon_from_file (
++	    GNOME_ICONDIR "/sync_icon.png", &error);
++
++
++	if (error)
++	{
++		g_warning ("Can't find icon: " GNOME_ICONDIR "/sync_icon.png" );
++	}
++
+ 	about = gnome_about_new (_("gnome-pilot applet"), 
+ 				 VERSION,
+ 				 _("Copyright 2000-2006 Free Software Foundation, Inc."),
+@@ -493,8 +504,9 @@
+ 	PilotApplet *self = user_data;
+ 	GtkWidget *button, *entry, *dialog;
+ 	GladeXML *xml;
++	GError *error;
+ 
+-	gnome_window_icon_set_default_from_file (GNOME_ICONDIR "/sync_icon.png");
++	gtk_window_set_default_icon_from_file (GNOME_ICONDIR "/sync_icon.png", &error);
+ 	xml =glade_xml_new (self->glade_file,"PropertiesDialog", NULL);
+ 	dialog=glade_xml_get_widget (xml,"PropertiesDialog");
+ 	
+@@ -1325,7 +1337,6 @@
+ create_pilot_widgets (GtkWidget *widget, PilotApplet *self) 
+ { 
+ 	GtkStyle *style; 
+-	int i; 
+ 
+ 	static GtkTargetEntry drop_types [] = {  
+ 		{ "text/uri-list", 0, TARGET_URI_LIST }, 
+@@ -1345,10 +1356,6 @@
+ 
+ 	self->curstate = INITIALISING; 
+ 
+-	for (i = 0; i < sizeof (pixmaps)/sizeof (pixmaps[0]); i++) 
+-		pixmaps[i] = gnome_program_locate_file(
+-		    NULL, GNOME_FILE_DOMAIN_PIXMAP, pixmaps[i], TRUE, NULL);
+-
+ 	self->image = gtk_image_new_from_file (pixmaps[self->curstate]); 
+ 
+ 	gtk_signal_connect (GTK_OBJECT (widget), "button-press-event",
sustaining/oi_151a/spec-files