2006-09-15 Brian Cameron <
[email protected]>
* patches/gnome-applets-06-multiload-Xau.diff: Patch was only needed
if building applets against build 48 of libgtop since libgtop used
to include -lXau. It no longer does, so simply rebuilding libgtop
and rebuilding gnome-applets works better if you run into this
problem.
--- a/ChangeLog Fri Sep 15 21:40:46 2006 +0000
+++ b/ChangeLog Fri Sep 15 23:24:14 2006 +0000
@@ -5,6 +5,14 @@
the appropriate way to fix the problem.
* rhytmbox.spec, patches/rhythmbox-02-fixcompile.diff: Remove patch
that is no longer needed.
+ * gnome-applets.spec,
+ patches/gnome-applets-02-mini-commander-tooltip.diff: We no longer
+ ship mini-commander - no need to patch it anymore.
+ * patches/gnome-applets-06-multiload-Xau.diff: Patch was only needed
+ if building applets against build 48 of libgtop since libgtop used
+ to include -lXau. It no longer does, so simply rebuilding libgtop
+ and rebuilding gnome-applets works better if you run into this
+ problem.
2006-09-15 Brian Cameron <[email protected]>
--- a/gnome-applets.spec Fri Sep 15 21:40:46 2006 +0000
+++ b/gnome-applets.spec Fri Sep 15 23:24:14 2006 +0000
@@ -15,11 +15,9 @@
Summary: GNOME Applets
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
Patch1: gnome-applets-01-disable-drivemount.diff
-Patch2: gnome-applets-02-mini-commander-tooltip.diff
-Patch3: gnome-applets-03-non-utf8-date-title.diff
-Patch4: gnome-applets-04-disable-keyboard-layout.diff
-Patch5: gnome-applets-05-make-multiload-network-available.diff
-Patch6: gnome-applets-06-multiload-Xau.diff
+Patch2: gnome-applets-02-non-utf8-date-title.diff
+Patch3: gnome-applets-03-disable-keyboard-layout.diff
+Patch4: gnome-applets-04-make-multiload-network-available.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/gnome-applets
@@ -54,8 +52,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
for po in po/*.po; do
dos2unix -ascii $po $po
@@ -123,6 +119,9 @@
%{_datadir}/pixmaps/*
%changelog
+* Fri Sep 15 2006 - [email protected]
+- Remove stale patches.
+
* Thu Sep 14 2006 - [email protected]
- Rework gnome-applets-04-disable-keyboard-layout.diff patch so that the
gswitchit applet is disabled with --disable-gswitchit, which is now
--- a/patches/gnome-applets-02-mini-commander-tooltip.diff Fri Sep 15 21:40:46 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- gnome-applets-2.10.1/mini-commander/src/mini-commander_applet.c 2005-03-20 15:58:53.000000000 +0530
-+++ gnome-applets-2.10.1-new/mini-commander/src/mini-commander_applet.c 2005-05-11 12:02:49.845302000 +0530
-@@ -214,6 +214,7 @@ mc_applet_draw (MCData *mc)
- gtk_container_set_border_width (GTK_CONTAINER (mc->applet_box), 0);
-
- mc_create_command_entry (mc);
-+ gtk_tooltips_set_tip (mc->tooltips, mc->entry, _("Type your command here"), NULL);
-
- if (command_text != NULL) {
- gtk_entry_set_text (GTK_ENTRY (mc->entry), command_text);
-@@ -243,7 +244,7 @@ mc_applet_draw (MCData *mc)
- icon = gtk_image_new_from_stock (COMMANDLINE_BROWSER_STOCK, button_icon_size);
- gtk_container_add (GTK_CONTAINER (button), icon);
-
-- gtk_tooltips_set_tip (mc->tooltips, button, _("Browser"), NULL);
-+ gtk_tooltips_set_tip (mc->tooltips, button, _("Mini-Commander Browser"), NULL);
- gtk_box_pack_start (GTK_BOX (hbox_buttons), button, TRUE, TRUE, 0);
-
- set_atk_name_description (button,
-@@ -261,7 +262,7 @@ mc_applet_draw (MCData *mc)
- icon = gtk_image_new_from_stock (COMMANDLINE_HISTORY_STOCK, button_icon_size);
- gtk_container_add (GTK_CONTAINER (button), icon);
-
-- gtk_tooltips_set_tip (mc->tooltips, button, _("History"), NULL);
-+ gtk_tooltips_set_tip (mc->tooltips, button, _("Mini-Commander History"), NULL);
- gtk_box_pack_end (GTK_BOX (hbox_buttons), button, TRUE, TRUE, 0);
-
- set_atk_name_description (button,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-02-non-utf8-date-title.diff Fri Sep 15 23:24:14 2006 +0000
@@ -0,0 +1,30 @@
+--- gnome-applets-2.10.1/stickynotes/util.c 2005-03-20 16:10:43.000000000 +0530
++++ gnome-applets-2.10.1-new/stickynotes/util.c 2005-05-11 12:23:11.257295000 +0530
+@@ -38,6 +38,11 @@ gchar * get_current_date(const gchar *fo
+ gint date_length = 10;
+ gchar *date = g_new(gchar, date_length);
+
++ gchar *end_valid = NULL;
++ gsize bytes_read = 0;
++ gsize bytes_written = 0;
++ gchar *date_utf8 = NULL;
++
+ do
+ {
+ date_length += 5;
+@@ -45,6 +50,15 @@ gchar * get_current_date(const gchar *fo
+ }
+ while(strftime(date, date_length, format, current) == 0);
+
++ if (g_utf8_validate (date, -1, &end_valid) == FALSE) {
++ date_utf8 = g_locale_to_utf8 (date, -1, &bytes_read, &bytes_written, NULL);
++ if (date_utf8) {
++ g_free (date);
++ return date_utf8;
++ } else
++ return date;
++ }
++
+ return date;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-03-disable-keyboard-layout.diff Fri Sep 15 23:24:14 2006 +0000
@@ -0,0 +1,86 @@
+--- gnome-applets-2.16.0.1/configure.in-orig 2006-09-14 17:37:27.788957000 -0500
++++ gnome-applets-2.16.0.1/configure.in 2006-09-14 18:03:16.615772000 -0500
+@@ -151,6 +151,19 @@ AC_SUBST(GTOP_APPLETS_CFLAGS)
+ AC_SUBST(GTOP_APPLETS_LIBS)
+ AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
+
++dnl --disable-gswitchit=(yes|no)
++AC_ARG_ENABLE(gswitchit,
++ [ --disable-gswitchit=[[no/yes]]
++ don't build gswitchit applet [[default: no]]],,
++ disable_gswitchit=no)
++
++dnl -- Set default value of HAVE_LIBXKLAVIER
++HAVE_LIBXKLAVIER=no
++
++dnl -- Don't both to check for libxklavier if gswitchit it disabled. This will
++dnl -- cause BUILD_GSWITCHIT to be set to no.
++if test x$disable_gswitchit = xyes; then
++
+ dnl -- check for libxklavier (optional) ---------------------------------------
+ LIBXKLAVIER_CFLAGS=
+ LIBXKLAVIER_LIBS=
+@@ -166,6 +179,7 @@ fi
+
+ AC_SUBST(LIBXKLAVIER_CFLAGS)
+ AC_SUBST(LIBXKLAVIER_LIBS)
++fi
+
+ AM_CONDITIONAL(BUILD_GSWITCHIT, test "x$HAVE_LIBXKLAVIER" = "xyes")
+
+--- gnome-applets-2.16.0.1/Makefile.am-orig 2006-09-14 17:46:34.070215000 -0500
++++ gnome-applets-2.16.0.1/Makefile.am 2006-09-14 17:44:03.113366000 -0500
+@@ -35,7 +34,7 @@ accessx_status_SUBDIR = accessx-status
+ endif
+
+ if BUILD_GSWITCHIT
+-gswitchit_SUBDIRS = libgswitchit libkbdraw gswitchit
++gswitchit_SUBDIRS = libgswitchit libkbdraw gswitchit gkb-new
+ endif
+
+ if BUILD_CPUFREQ_APPLET
+@@ -50,7 +49,6 @@ always_built_SUBDIRS = \
+ charpick \
+ geyes \
+ mini-commander \
+- gkb-new \
+ stickynotes \
+ null_applet
+
+diff -urN gnome-applets-2.14.1/null_applet/Makefile.am gnome-applets-2.14.1-hacked/null_applet/Makefile.am
+--- gnome-applets-2.14.1/null_applet/Makefile.am 2005-01-07 13:15:26.000000000 +1300
++++ gnome-applets-2.14.1-hacked/null_applet/Makefile.am 2006-07-15 08:23:35.498817000 +1200
+@@ -13,6 +13,7 @@
+ server_in_files = \
+ GNOME_NullApplet_Factory.server.in \
+ GNOME_CDPlayerApplet.server.in \
++ GNOME_KeyboardApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in
+ server_DATA = $(server_in_files:.server.in=.server)
+@@ -27,5 +28,6 @@
+ EXTRA_DIST = \
+ GNOME_NullApplet_Factory.server.in.in \
+ GNOME_CDPlayerApplet.server.in \
++ GNOME_KeyboardApplet.server.in \
+ GNOME_MailcheckApplet_Factory.server.in \
+ GNOME_Panel_WirelessApplet.server.in
+--- gnome-applets-2.15.3.old/null_applet/GNOME_KeyboardApplet.server.in 1970-01-01 01:00:00.000000000 +0100
++++ gnome-applets-2.15.3/null_applet/GNOME_KeyboardApplet.server.in 2006-08-11 15:42:55.487501000 +0100
+@@ -0,0 +1,16 @@
++<oaf_info>
++
++<oaf_server iid="OAFIID:GNOME_KeyboardApplet_Factory"
++ type="exe"
++ location="/usr/lib/null_applet">
++
++ <oaf_attribute name="repo_ids" type="stringv">
++ <item value="IDL:Bonobo/GenericFactory:1.0"/>
++ <item value="IDL:Bonobo/Unknown:1.0"/>
++ </oaf_attribute>
++ <oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
++ <oaf_attribute name="description" type="string" _value="Keyboard applet factory"/>
++
++</oaf_server>
++
++</oaf_info>
--- a/patches/gnome-applets-03-non-utf8-date-title.diff Fri Sep 15 21:40:46 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
---- gnome-applets-2.10.1/stickynotes/util.c 2005-03-20 16:10:43.000000000 +0530
-+++ gnome-applets-2.10.1-new/stickynotes/util.c 2005-05-11 12:23:11.257295000 +0530
-@@ -38,6 +38,11 @@ gchar * get_current_date(const gchar *fo
- gint date_length = 10;
- gchar *date = g_new(gchar, date_length);
-
-+ gchar *end_valid = NULL;
-+ gsize bytes_read = 0;
-+ gsize bytes_written = 0;
-+ gchar *date_utf8 = NULL;
-+
- do
- {
- date_length += 5;
-@@ -45,6 +50,15 @@ gchar * get_current_date(const gchar *fo
- }
- while(strftime(date, date_length, format, current) == 0);
-
-+ if (g_utf8_validate (date, -1, &end_valid) == FALSE) {
-+ date_utf8 = g_locale_to_utf8 (date, -1, &bytes_read, &bytes_written, NULL);
-+ if (date_utf8) {
-+ g_free (date);
-+ return date_utf8;
-+ } else
-+ return date;
-+ }
-+
- return date;
- }
-
--- a/patches/gnome-applets-04-disable-keyboard-layout.diff Fri Sep 15 21:40:46 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
---- gnome-applets-2.16.0.1/configure.in-orig 2006-09-14 17:37:27.788957000 -0500
-+++ gnome-applets-2.16.0.1/configure.in 2006-09-14 18:03:16.615772000 -0500
-@@ -151,6 +151,19 @@ AC_SUBST(GTOP_APPLETS_CFLAGS)
- AC_SUBST(GTOP_APPLETS_LIBS)
- AM_CONDITIONAL(BUILD_GTOP_APPLETS, $build_gtop_applets)
-
-+dnl --disable-gswitchit=(yes|no)
-+AC_ARG_ENABLE(gswitchit,
-+ [ --disable-gswitchit=[[no/yes]]
-+ don't build gswitchit applet [[default: no]]],,
-+ disable_gswitchit=no)
-+
-+dnl -- Set default value of HAVE_LIBXKLAVIER
-+HAVE_LIBXKLAVIER=no
-+
-+dnl -- Don't both to check for libxklavier if gswitchit it disabled. This will
-+dnl -- cause BUILD_GSWITCHIT to be set to no.
-+if test x$disable_gswitchit = xyes; then
-+
- dnl -- check for libxklavier (optional) ---------------------------------------
- LIBXKLAVIER_CFLAGS=
- LIBXKLAVIER_LIBS=
-@@ -166,6 +179,7 @@ fi
-
- AC_SUBST(LIBXKLAVIER_CFLAGS)
- AC_SUBST(LIBXKLAVIER_LIBS)
-+fi
-
- AM_CONDITIONAL(BUILD_GSWITCHIT, test "x$HAVE_LIBXKLAVIER" = "xyes")
-
---- gnome-applets-2.16.0.1/Makefile.am-orig 2006-09-14 17:46:34.070215000 -0500
-+++ gnome-applets-2.16.0.1/Makefile.am 2006-09-14 17:44:03.113366000 -0500
-@@ -35,7 +34,7 @@ accessx_status_SUBDIR = accessx-status
- endif
-
- if BUILD_GSWITCHIT
--gswitchit_SUBDIRS = libgswitchit libkbdraw gswitchit
-+gswitchit_SUBDIRS = libgswitchit libkbdraw gswitchit gkb-new
- endif
-
- if BUILD_CPUFREQ_APPLET
-@@ -50,7 +49,6 @@ always_built_SUBDIRS = \
- charpick \
- geyes \
- mini-commander \
-- gkb-new \
- stickynotes \
- null_applet
-
-diff -urN gnome-applets-2.14.1/null_applet/Makefile.am gnome-applets-2.14.1-hacked/null_applet/Makefile.am
---- gnome-applets-2.14.1/null_applet/Makefile.am 2005-01-07 13:15:26.000000000 +1300
-+++ gnome-applets-2.14.1-hacked/null_applet/Makefile.am 2006-07-15 08:23:35.498817000 +1200
-@@ -13,6 +13,7 @@
- server_in_files = \
- GNOME_NullApplet_Factory.server.in \
- GNOME_CDPlayerApplet.server.in \
-+ GNOME_KeyboardApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
-@@ -27,5 +28,6 @@
- EXTRA_DIST = \
- GNOME_NullApplet_Factory.server.in.in \
- GNOME_CDPlayerApplet.server.in \
-+ GNOME_KeyboardApplet.server.in \
- GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in
---- gnome-applets-2.15.3.old/null_applet/GNOME_KeyboardApplet.server.in 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-applets-2.15.3/null_applet/GNOME_KeyboardApplet.server.in 2006-08-11 15:42:55.487501000 +0100
-@@ -0,0 +1,16 @@
-+<oaf_info>
-+
-+<oaf_server iid="OAFIID:GNOME_KeyboardApplet_Factory"
-+ type="exe"
-+ location="/usr/lib/null_applet">
-+
-+ <oaf_attribute name="repo_ids" type="stringv">
-+ <item value="IDL:Bonobo/GenericFactory:1.0"/>
-+ <item value="IDL:Bonobo/Unknown:1.0"/>
-+ </oaf_attribute>
-+ <oaf_attribute name="name" type="string" _value="Keyboard applet factory"/>
-+ <oaf_attribute name="description" type="string" _value="Keyboard applet factory"/>
-+
-+</oaf_server>
-+
-+</oaf_info>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-applets-04-make-multiload-network-available.diff Fri Sep 15 23:24:14 2006 +0000
@@ -0,0 +1,13 @@
+diff -Nrup gnome-applets-2.14.1/multiload/linux-proc.c gnome-applets-2.14.1.mod/multiload/linux-proc.c
+--- gnome-applets-2.14.1/multiload/linux-proc.c 2006-01-15 17:31:02.000000000 +0800
++++ gnome-applets-2.14.1.mod/multiload/linux-proc.c 2006-07-28 11:22:34.324755000 +0800
+@@ -306,7 +306,8 @@ GetNet (int Maximum, int data [5], LoadG
+
+ glibtop_get_netload(&netload, devices[i]);
+
+- g_return_if_fail((netload.flags & needed_netload_flags) == needed_netload_flags);
++ if ((netload.flags & needed_netload_flags) != needed_netload_flags)
++ continue;
+
+ if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
+ continue;
--- a/patches/gnome-applets-05-make-multiload-network-available.diff Fri Sep 15 21:40:46 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -Nrup gnome-applets-2.14.1/multiload/linux-proc.c gnome-applets-2.14.1.mod/multiload/linux-proc.c
---- gnome-applets-2.14.1/multiload/linux-proc.c 2006-01-15 17:31:02.000000000 +0800
-+++ gnome-applets-2.14.1.mod/multiload/linux-proc.c 2006-07-28 11:22:34.324755000 +0800
-@@ -306,7 +306,8 @@ GetNet (int Maximum, int data [5], LoadG
-
- glibtop_get_netload(&netload, devices[i]);
-
-- g_return_if_fail((netload.flags & needed_netload_flags) == needed_netload_flags);
-+ if ((netload.flags & needed_netload_flags) != needed_netload_flags)
-+ continue;
-
- if (!(netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP)))
- continue;