2007-01-17 Damien Carbery <
[email protected]>
* totem.spec: Bump to 2.17.5.
* metacity.spec: Bump to 2.17.5.
* quick-lounge-applet.spec: Bump to 2.12.4. Remove all patches as they
are all upstream.
* patches/quick-lounge-applet-01-xlibs.diff,
patches/quick-lounge-applet-02-launch-default-help.diff
patches/quick-lounge-applet-03-multihead-fix.diff: Removed, upstream.
* glib2.spec: Bump to 2.12.9.
* gtk2.spec: Bump to 2.10.8. Removed upstream patch 15-load-gdm-modules.
* patches/gtk+-15-load-gdm-modules.diff: Removed, upstream.
--- a/ChangeLog Wed Jan 17 16:56:03 2007 +0000
+++ b/ChangeLog Wed Jan 17 18:01:11 2007 +0000
@@ -1,3 +1,16 @@
+2007-01-17 Damien Carbery <[email protected]>
+
+ * totem.spec: Bump to 2.17.5.
+ * metacity.spec: Bump to 2.17.5.
+ * quick-lounge-applet.spec: Bump to 2.12.4. Remove all patches as they
+ are all upstream.
+ * patches/quick-lounge-applet-01-xlibs.diff,
+ patches/quick-lounge-applet-02-launch-default-help.diff
+ patches/quick-lounge-applet-03-multihead-fix.diff: Removed, upstream.
+ * glib2.spec: Bump to 2.12.9.
+ * gtk2.spec: Bump to 2.10.8. Removed upstream patch 15-load-gdm-modules.
+ * patches/gtk+-15-load-gdm-modules.diff: Removed, upstream.
+
2007-01-17 Padraig O'Briain <[email protected]>
* gnome-panel.spec: Use patch gnome-panel-08-launch-menu.diff
--- a/glib2.spec Wed Jan 17 16:56:03 2007 +0000
+++ b/glib2.spec Wed Jan 17 18:01:11 2007 +0000
@@ -10,7 +10,7 @@
Name: glib2
License: LGPL
Group: System/Libraries
-Version: 2.12.8
+Version: 2.12.9
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -223,6 +223,8 @@
%{_mandir}/man3/*
%changelog
+* Wed Jan 17 2007 - [email protected]
+- Bump to 2.12.9.
* Mon Jan 15 2007 - [email protected]
- Bump to 2.12.8.
* Fri Jan 05 2007 - [email protected]
--- a/gtk2.spec Wed Jan 17 16:56:03 2007 +0000
+++ b/gtk2.spec Wed Jan 17 18:01:11 2007 +0000
@@ -10,7 +10,7 @@
Name: gtk2
License: LGPL
Group: System/Libraries
-Version: 2.10.7
+Version: 2.10.8
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -52,8 +52,6 @@
Patch13: gtk+-13-printing-papi-backend.diff
# date:2006-11-22 bugster:6438587 bugzilla:335796,331369 owner:padraig type:bug
Patch14: gtk+-14-gedit-menu-shortcuts.diff
-# date:2007-01-07 bugster:6465924 bugzilla:393102 owner:padraig type:bug
-Patch15: gtk+-15-load-gdm-modules.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -122,7 +120,6 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p1
%ifos solaris
%ifarch amd64 sparcv9
@@ -283,6 +280,8 @@
%{_mandir}/man3/*.gz
%changelog -n gtk2
+* Wed Jan 17 2007 - [email protected]
+- Bump to 2.10.8. Removed upstream patches, 15-load-gdm-modules.
* Mon Jan 08 2007 - [email protected]
- Bump to 2.10.7. Remove upstream patches, 15-hidden and 17-recent-files-crash.
Renumber remainder.
--- a/metacity.spec Wed Jan 17 16:56:03 2007 +0000
+++ b/metacity.spec Wed Jan 17 18:01:11 2007 +0000
@@ -10,7 +10,7 @@
Name: metacity
License: GPL
Group: System/GUI/GNOME
-Version: 2.17.3
+Version: 2.17.5
Release: 4
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -152,6 +152,9 @@
%{_mandir}/man1/*
%changelog
+* Wed Jan 17 2007 - [email protected]
+- Bump to 2.17.5.
+
* Fri Dec 22 2006 - [email protected]
- Updated metacity-10-trusted-extensions.diff. Fixes 6468212.
--- a/patches/gtk+-15-load-gdm-modules.diff Wed Jan 17 16:56:03 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gtk+-2.10.6/gtk/gtkmodules.c.orig 2007-01-08 08:13:14.258026000 +0000
-+++ gtk+-2.10.6/gtk/gtkmodules.c 2007-01-08 08:12:43.078178000 +0000
-@@ -499,6 +499,7 @@
- }
-
- display_manager = gdk_display_manager_get ();
-+ default_display_opened = gdk_display_get_default () != NULL;
- g_signal_connect (display_manager, "notify::default-display",
- G_CALLBACK (default_display_notify_cb),
- NULL);
--- a/patches/quick-lounge-applet-01-xlibs.diff Wed Jan 17 16:56:03 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-diff -urN quick-lounge-applet-2.12.1/configure.in quick-lounge-applet-2.12.1-hacked/configure.in
---- quick-lounge-applet-2.12.1/configure.in 2005-11-11 02:07:53.000000000 +1300
-+++ quick-lounge-applet-2.12.1-hacked/configure.in 2006-11-02 19:20:48.794935000 +1300
-@@ -52,6 +52,38 @@
- AC_SUBST(QL_CFLAGS)
- AC_SUBST(QL_LIBS)
-
-+#
-+# If Pango included the shared library dependencies from X11 in
-+# the pkg-config output, then we use that (to avoid duplicates).
-+# but if they were omitted to avoid binary compatibility problems
-+# then we need to repeat the checks.
-+#
-+if $PKG_CONFIG --exists pangoxft ; then
-+ PANGO_PACKAGES="pangox pangoxft"
-+else
-+ PANGO_PACKAGES="pangox"
-+fi
-+
-+x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
-+case x_libs in
-+ *-lX11*) pango_omitted_x_deps=no ;;
-+ *) pango_omitted_x_deps=yes ;;
-+esac
-+
-+if test $pango_omitted_x_deps = yes ; then
-+ AC_PATH_XTRA
-+
-+ if test x$no_x = xyes ; then
-+ AC_MSG_ERROR([X development libraries not found])
-+ else
-+ X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+ fi
-+fi
-+
-+AC_CHECK_LIB(Xau, XauFileName, [X_LIBS="$X_LIBS -lXau"])
-+
-+AC_SUBST(X_LIBS)
-+
- dnl ******************************
-
- AC_ARG_ENABLE(deprecations,AC_HELP_STRING([--enable-deprecations],[warn about deprecated usages]))
-diff -urN quick-lounge-applet-2.12.1/src/Makefile.am quick-lounge-applet-2.12.1-hacked/src/Makefile.am
---- quick-lounge-applet-2.12.1/src/Makefile.am 2005-11-11 02:07:53.000000000 +1300
-+++ quick-lounge-applet-2.12.1-hacked/src/Makefile.am 2006-11-02 19:20:48.796017000 +1300
-@@ -45,7 +45,7 @@
- xstuff.c \
- xstuff.h
-
--quick_lounge_applet_LDADD = $(QL_LIBS)
-+quick_lounge_applet_LDADD = $(QL_LIBS) $(X_LIBS)
-
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_QuickLoungeApplet.xml
-diff -urN quick-lounge-applet-2.12.1/src/Makefile.am~ quick-lounge-applet-2.12.1-hacked/src/Makefile.am~
---- quick-lounge-applet-2.12.1/src/Makefile.am~ 1970-01-01 12:00:00.000000000 +1200
-+++ quick-lounge-applet-2.12.1-hacked/src/Makefile.am~ 2006-11-02 19:20:36.101987000 +1300
-@@ -0,0 +1,88 @@
-+glade_DATA = quick-lounge.glade
-+gladedir = $(datadir)/quick-lounge/glade
-+
-+if ENABLE_DEPRECATIONS
-+DISABLE_DEPRECATED = -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED
-+else
-+DISABLE_DEPRECATED =
-+endif
-+
-+INCLUDES = \
-+ -I$(top_srcdir) \
-+ -I$(top_builddir) \
-+ -DPREFIX=\"$(prefix)\" \
-+ -DSYSCONFDIR=\"$(sysconfdir)\" \
-+ -DDATADIR=\"$(datadir)\" \
-+ -DLIBDIR=\"$(libdir)\" \
-+ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-+ -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" \
-+ -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" \
-+ -DGLADEDIR=\""$(gladedir)"\" \
-+ -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
-+ $(DISABLE_DEPRECATED) \
-+ $(QL_CFLAGS)
-+
-+libexec_PROGRAMS = quick-lounge-applet
-+
-+quick_lounge_applet_SOURCES = \
-+ dlg-pick-applications.c \
-+ dlg-pick-applications.h \
-+ dlg-properties.c \
-+ dlg-properties.h \
-+ file-utils.c \
-+ file-utils.h \
-+ gtk-utils.c \
-+ gtk-utils.h \
-+ quick-box.c \
-+ quick-box.h \
-+ quick-button.c \
-+ quick-button.h \
-+ quick-lounge.c \
-+ quick-lounge.h \
-+ quick-separator.c \
-+ quick-separator.h \
-+ typedefs.h \
-+ xstuff.c \
-+ xstuff.h
-+
-+quick_lounge_applet_LDADD = $(QL_LIBS)
-+
-+uidir = $(datadir)/gnome-2.0/ui
-+ui_DATA = GNOME_QuickLoungeApplet.xml
-+
-+serverdir = $(libdir)/bonobo/servers
-+server_in_files = GNOME_QuickLoungeApplet_Factory.server.in
-+server_DATA = $(server_in_files:.server.in=.server)
-+
-+$(server_in_files): $(server_in_files:.server.in=.server.in.in)
-+ sed -e "s|\@PIXMAPSDIR\@|$(datadir)/pixmaps|" $< > temp.server.in
-+ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" temp.server.in > $@
-+ rm temp.server.in
-+
-+CLEANFILES = $(server_in_files) $(server_DATA)
-+
-+@INTLTOOL_SERVER_RULE@
-+
-+schemasdir = @GCONF_SCHEMA_FILE_DIR@
-+schemas_in_files = quick-lounge.schemas.in
-+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-+
-+@INTLTOOL_SCHEMAS_RULE@
-+
-+# don't do this if we are building in eg. rpm
-+if SCHEMAS_INSTALL
-+install-data-local:
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schemas_DATA)
-+endif
-+
-+EXTRA_DIST = \
-+ GNOME_QuickLoungeApplet_Factory.server.in.in \
-+ quick-lounge.schemas \
-+ $(glade_DATA) \
-+ $(ui_DATA) \
-+ $(schemas_in_files)
-+
-+DISTCLEANFILES = \
-+ $(schemas_DATA) \
-+ $(desktop_DATA)
-+
--- a/patches/quick-lounge-applet-02-launch-default-help.diff Wed Jan 17 16:56:03 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-diff -urNp quick-lounge-applet-2.10.1/src/quick-lounge.c quick-lounge-applet-2.10.1-hacked/src/quick-lounge.c
---- quick-lounge-applet-2.10.1/src/quick-lounge.c 2005-08-16 20:20:34.000000000 +1200
-+++ quick-lounge-applet-2.10.1-hacked/src/quick-lounge.c 2005-09-18 18:08:43.202999280 +1200
-@@ -406,8 +406,26 @@ ditem_properties_clicked (GtkWidget *w,
- GtkWidget *dialog = data;
-
- if (response == GTK_RESPONSE_HELP) {
-- /* FIXME */
--
-+ GError *error = NULL;
-+
-+ gnome_help_display_desktop_on_screen (NULL,
-+ "user-guide",
-+ "user-guide.xml",
-+ "gospanel-52",
-+ gtk_window_get_screen (GTK_WINDOW (dialog)),
-+ &error);
-+
-+ if (error) {
-+ GtkWidget *message_dialog;
-+ message_dialog = gtk_message_dialog_new (NULL, 0,
-+ GTK_MESSAGE_ERROR,
-+ GTK_BUTTONS_OK,
-+ _("There was an error displaying help: %s"),
-+ error->message);
-+ g_error_free (error);
-+ gtk_dialog_run (GTK_DIALOG (message_dialog));
-+ gtk_widget_destroy (message_dialog);
-+ }
- } else if (response == REVERT_BUTTON) {
- QuickButton *button;
- GnomeDItemEdit *dedit;
--- a/patches/quick-lounge-applet-03-multihead-fix.diff Wed Jan 17 16:56:03 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,334 +0,0 @@
-diff -urN quick-lounge-applet-2.12.1/Makefile.am quick-lounge-applet-2.12.1-hacked/Makefile.am
---- quick-lounge-applet-2.12.1/Makefile.am 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/Makefile.am 2006-10-16 23:26:08.559586000 +0000
-@@ -2,9 +2,20 @@
-
- @INTLTOOL_DESKTOP_RULE@
-
--icondir = $(datadir)/pixmaps
-+icondir = $(datadir)/icons/hicolor/48x48/apps
- icon_DATA = quick-lounge-applet.png
-
-+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-+
-+install-data-hook:
-+ @-if test -z "$(DESTDIR)"; then \
-+ echo "Updating Gtk icon cache."; \
-+ $(gtk_update_icon_cache); \
-+ else \
-+ echo "*** Icon cache not updated. After install, run this:"; \
-+ echo "*** $(gtk_update_icon_cache)"; \
-+ fi
-+
- distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out'
-
- distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' | grep -v 'omf' | grep -v 'figures'
-diff -urN quick-lounge-applet-2.12.1/src/GNOME_QuickLoungeApplet_Factory.server.in.in quick-lounge-applet-2.12.1-hacked/src/GNOME_QuickLoungeApplet_Factory.server.in.in
---- quick-lounge-applet-2.12.1/src/GNOME_QuickLoungeApplet_Factory.server.in.in 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/GNOME_QuickLoungeApplet_Factory.server.in.in 2006-10-16 08:01:20.685056000 +0000
-@@ -25,7 +25,7 @@
- <oaf_attribute name="name" type="string" _value="Launchers List"/>
- <oaf_attribute name="description" type="string" _value="Organize your favourite applications on the Panel"/>
- <oaf_attribute name="panel:category" type="string" value="Utilities"/>
-- <oaf_attribute name="panel:icon" type="string" value="@PIXMAPSDIR@/quick-lounge-applet.png"/>
-+ <oaf_attribute name="panel:icon" type="string" value="quick-lounge-applet"/>
-
- </oaf_server>
-
-diff -urN quick-lounge-applet-2.12.1/src/Makefile.am quick-lounge-applet-2.12.1-hacked/src/Makefile.am
---- quick-lounge-applet-2.12.1/src/Makefile.am 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/Makefile.am 2006-10-16 23:26:14.940581000 +0000
-@@ -15,8 +15,6 @@
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)\" \
- -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-- -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" \
-- -DPIXMAPSDIR=\""$(datadir)/pixmaps"\" \
- -DGLADEDIR=\""$(gladedir)"\" \
- -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
- $(DISABLE_DEPRECATED) \
-@@ -55,9 +53,7 @@
- server_DATA = $(server_in_files:.server.in=.server)
-
- $(server_in_files): $(server_in_files:.server.in=.server.in.in)
-- sed -e "s|\@PIXMAPSDIR\@|$(datadir)/pixmaps|" $< > temp.server.in
-- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" temp.server.in > $@
-- rm temp.server.in
-+ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
- CLEANFILES = $(server_in_files) $(server_DATA)
-
-diff -urN quick-lounge-applet-2.12.1/src/dlg-pick-applications.c quick-lounge-applet-2.12.1-hacked/src/dlg-pick-applications.c
---- quick-lounge-applet-2.12.1/src/dlg-pick-applications.c 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/dlg-pick-applications.c 2006-10-16 23:26:19.888578000 +0000
-@@ -102,7 +102,7 @@
- GTK_BUTTONS_CLOSE,
- _("Could not display help: %s"),
- err->message);
-- gnome_window_icon_set_from_file (GTK_WINDOW (dialog), GNOME_ICONDIR "quick-lounge-applet.png");
-+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "quick-lounge-applet");
- gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (data->quick_lounge->applet)));
-
- g_signal_connect (G_OBJECT (dialog), "response",
-@@ -487,6 +487,9 @@
-
- g_object_set_data (G_OBJECT (data->dialog), "dialog_data", data);
-
-+ gtk_window_set_screen (GTK_WINDOW (data->dialog),
-+ gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)));
-+
- gtk_widget_show (data->dialog);
-
- add_applications (data, "applications.menu");
-diff -urN quick-lounge-applet-2.12.1/src/dlg-properties.c quick-lounge-applet-2.12.1-hacked/src/dlg-properties.c
---- quick-lounge-applet-2.12.1/src/dlg-properties.c 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/dlg-properties.c 2006-10-16 23:26:19.890297000 +0000
-@@ -174,7 +174,7 @@
- GTK_BUTTONS_CLOSE,
- _("Could not display help: %s"),
- err->message);
-- gnome_window_icon_set_from_file (GTK_WINDOW (dialog), GNOME_ICONDIR "quick-lounge-applet.png");
-+ gtk_window_set_icon_name (GTK_WINDOW (dialog), "quick-lounge-applet");
- gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (GTK_WIDGET (data->quick_lounge->applet)));
-
- g_signal_connect (G_OBJECT (dialog), "response",
-diff -urN quick-lounge-applet-2.12.1/src/gtk-utils.c quick-lounge-applet-2.12.1-hacked/src/gtk-utils.c
---- quick-lounge-applet-2.12.1/src/gtk-utils.c 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/gtk-utils.c 2006-10-16 23:26:19.894699000 +0000
-@@ -499,10 +499,11 @@
- * Modified by Paolo Bacchilega for the Quick Lounge applet
- */
- static char *
--panel_find_icon (GnomeIconTheme *icon_theme,
-+panel_find_icon (GtkIconTheme *icon_theme,
- const char *icon_name,
- gint size)
- {
-+ GtkIconInfo *icon_info;
- char *retval;
- char *icon_no_extension;
- char *p;
-@@ -536,17 +537,24 @@
- *p = 0;
- }
-
-- retval = gnome_icon_theme_lookup_icon (icon_theme, icon_no_extension,
-- size, NULL, NULL);
-+ icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_no_extension,
-+ size, NULL);
-
- g_free (icon_no_extension);
-
-+ if (icon_info) {
-+ retval = g_strdup (gtk_icon_info_get_filename (icon_info));
-+ gtk_icon_info_free (icon_info);
-+
-+ } else
-+ retval = NULL;
-+
- return retval;
- }
-
-
- GdkPixbuf *
--create_pixbuf (GnomeIconTheme *icon_theme,
-+create_pixbuf (GtkIconTheme *icon_theme,
- const char *icon_name,
- int icon_size)
- {
-@@ -592,7 +600,7 @@
-
-
- GtkWidget *
--create_image (GnomeIconTheme *icon_theme,
-+create_image (GtkIconTheme *icon_theme,
- const char *icon_path,
- int icon_size)
- {
-diff -urN quick-lounge-applet-2.12.1/src/gtk-utils.h quick-lounge-applet-2.12.1-hacked/src/gtk-utils.h
---- quick-lounge-applet-2.12.1/src/gtk-utils.h 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/gtk-utils.h 2006-10-16 23:26:22.858723000 +0000
-@@ -70,13 +70,13 @@
-
- char * _gtk_label_get_locale_text (GtkLabel *label);
-
--GdkPixbuf * create_pixbuf (GnomeIconTheme *icon_theme,
-- const char *icon_path,
-- int icon_size);
--
--GtkWidget * create_image (GnomeIconTheme *icon_theme,
-- const char *icon_path,
-- int icon_size);
-+GdkPixbuf * create_pixbuf (GtkIconTheme *icon_theme,
-+ const char *icon_path,
-+ int icon_size);
-+
-+GtkWidget * create_image (GtkIconTheme *icon_theme,
-+ const char *icon_path,
-+ int icon_size);
-
- GList * _gtk_container_get_all_children (GtkContainer *container);
-
-diff -urN quick-lounge-applet-2.12.1/src/quick-box.c quick-lounge-applet-2.12.1-hacked/src/quick-box.c
---- quick-lounge-applet-2.12.1/src/quick-box.c 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/quick-box.c 2006-10-16 23:26:19.897603000 +0000
-@@ -79,7 +79,7 @@
- PopulateMenuFunc populate_menu_func;
- gpointer populate_menu_data;
-
-- GnomeIconTheme *icon_theme;
-+ GtkIconTheme *icon_theme;
- };
-
-
-@@ -1270,6 +1270,9 @@
- G_CALLBACK (deactivate_arrow),
- quick_box);
-
-+ gtk_menu_set_screen (GTK_MENU (popup_menu),
-+ gtk_widget_get_screen (GTK_WIDGET (quick_box)));
-+
- gtk_menu_popup (GTK_MENU (popup_menu),
- NULL, NULL,
- popup_menu_position,
-@@ -1537,7 +1540,7 @@
-
-
- static void
--icon_theme_changed (GnomeIconTheme *icon_theme,
-+icon_theme_changed (GtkIconTheme *icon_theme,
- QuickBox *quick_box)
- {
- GList *children, *scan;
-@@ -1672,7 +1675,7 @@
- GtkWidget*
- quick_box_new (PanelAppletOrient orient,
- int size,
-- GnomeIconTheme *icon_theme)
-+ GtkIconTheme *icon_theme)
- {
- QuickBox *quick_box;
-
-diff -urN quick-lounge-applet-2.12.1/src/quick-button.c quick-lounge-applet-2.12.1-hacked/src/quick-button.c
---- quick-lounge-applet-2.12.1/src/quick-button.c 2005-11-10 13:07:53.000000000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/quick-button.c 2006-10-16 23:26:19.936165000 +0000
-@@ -263,20 +263,22 @@
-
-
- static GdkPixbuf *
--get_missing (GnomeIconTheme *theme,
-+get_missing (GtkIconTheme *theme,
- int preffered_size)
- {
-+ GtkIconInfo *icon_info;
- char *filename = NULL;
-+
-+ icon_info = gtk_icon_theme_lookup_icon (theme,
-+ "gnome-unknown",
-+ preffered_size,
-+ NULL);
-
-- filename = gnome_icon_theme_lookup_icon (theme,
-- "gnome-unknown",
-- preffered_size,
-- NULL,
-- NULL);
--
-+ filename = gtk_icon_info_get_filename (icon_info);
-+ gtk_icon_info_free (icon_info);
- if (filename == NULL)
- return missing_pixbuf (preffered_size);
--
-+
- return gdk_pixbuf_new_from_file (filename, NULL);
- }
-
-diff -urN quick-lounge-applet-2.12.1/src/quick-lounge.c quick-lounge-applet-2.12.1-hacked/src/quick-lounge.c
---- quick-lounge-applet-2.12.1/src/quick-lounge.c 2006-10-12 22:47:23.616661000 +0000
-+++ quick-lounge-applet-2.12.1-hacked/src/quick-lounge.c 2006-10-16 23:26:19.938403000 +0000
-@@ -94,8 +94,11 @@
- quick_lounge);
- }
-
-- if (quick_lounge->prop_dialog != NULL)
-+ if (quick_lounge->prop_dialog != NULL) {
-+ gtk_window_set_screen (GTK_WINDOW (quick_lounge->prop_dialog),
-+ gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)));
- gtk_window_present (GTK_WINDOW (quick_lounge->prop_dialog));
-+ }
- }
-
-
-@@ -129,7 +132,6 @@
- QuickLounge *quick_lounge,
- const gchar *verbname)
- {
-- GdkPixbuf *pixbuf = NULL;
- char *file;
- const char *authors[] = {
- "Paolo Bacchilega <[email protected]>",
-@@ -141,12 +143,6 @@
- };
- const char *translator_credits = _("translator_credits");
-
-- file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "quick-lounge-applet.png", TRUE, NULL);
-- if (file != NULL) {
-- pixbuf = gdk_pixbuf_new_from_file (file, NULL);
-- g_free(file);
-- }
--
- gtk_show_about_dialog (NULL,
- "name", _("Launchers List"),
- "version", VERSION,
-@@ -155,11 +151,9 @@
- "authors", authors,
- "documenters", documenters,
- "translator-credits", strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL,
-- "logo", pixbuf,
-+ "logo-icon-name", "quick-lounge-applet",
-+ "screen", gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)),
- NULL);
--
-- if (pixbuf)
-- g_object_unref (pixbuf);
- }
-
-
-@@ -542,7 +536,7 @@
- GTK_STOCK_HELP,
- GTK_RESPONSE_HELP,
- NULL);
-- gnome_window_icon_set_from_file (GTK_WINDOW (widget), GNOME_ICONDIR "quick-lounge-applet.png");
-+ gtk_window_set_icon_name (GTK_WINDOW (widget), "quick-lounge-applet");
- gtk_window_set_screen (GTK_WINDOW (widget), gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)));
-
- dialog = GTK_DIALOG (widget);
-@@ -766,7 +760,7 @@
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- NULL);
-- gnome_window_icon_set_from_file (GTK_WINDOW (widget), GNOME_ICONDIR "quick-lounge-applet.png");
-+ gtk_window_set_icon_name (GTK_WINDOW (widget), "quick-lounge-applet");
- gtk_window_set_screen (GTK_WINDOW (widget), gtk_widget_get_screen (GTK_WIDGET (quick_lounge->applet)));
-
- dialog = GTK_DIALOG (widget);
-@@ -1481,6 +1475,8 @@
- int min_cols, max_size;
- gboolean icon_size_follows_panel;
-
-+ gtk_window_set_default_icon_name ("quick-lounge-applet");
-+
- quick_lounge = g_new0 (QuickLounge, 1);
-
- quick_lounge->applet = GTK_WIDGET (applet);
-@@ -1492,9 +1488,7 @@
- g_free,
- NULL);
-
-- quick_lounge->icon_theme = gnome_icon_theme_new ();
-- gnome_icon_theme_set_allow_svg (GNOME_ICON_THEME (quick_lounge->icon_theme), TRUE);
-- gnome_icon_theme_append_search_path (quick_lounge->icon_theme, PIXMAPSDIR);
-+ quick_lounge->icon_theme = gtk_icon_theme_get_default ();
-
- /**/
-
--- a/quick-lounge-applet.spec Wed Jan 17 16:56:03 2007 +0000
+++ b/quick-lounge-applet.spec Wed Jan 17 18:01:11 2007 +0000
@@ -9,18 +9,12 @@
Name: quick-lounge-applet
License: GPL
Group: Productivity/Graphics/Viewers
-Version: 2.12.1
+Version: 2.12.4
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Quick Lounge Panel Applet
Source: http://ftp.gnome.org/pub/GNOME/sources/quick-lounge-applet/2.12/%{name}-%{version}.tar.bz2
-#owner:gman date:2006-11-02 type:bug bugzilla:369265
-Patch1: quick-lounge-applet-01-xlibs.diff
-#owner:gman date:2006-10-12 type:bug bugzilla:369103
-Patch2: quick-lounge-applet-02-launch-default-help.diff
-#owner:gman date:2006-10-12 type:bug bugster:6435439 bugzilla:319050
-Patch3: quick-lounge-applet-03-multihead-fix.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/quick-lounge-applet
@@ -51,9 +45,6 @@
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%ifos linux
@@ -113,6 +104,9 @@
%{_libexecdir}/*
%changelog
+* Wed Jan 17 2007 - [email protected]
+- Bump to 2.12.4. Remove all patches as they are all upstream.
+
* Fri Oct 12 2006 - [email protected]
- Add patch to fix bugzilla #319050 and other issues on
multihead/xinerama.
--- a/totem.spec Wed Jan 17 16:56:03 2007 +0000
+++ b/totem.spec Wed Jan 17 18:01:11 2007 +0000
@@ -10,7 +10,7 @@
Name: totem
License: GPL
Group: System/GUI/GNOME
-Version: 2.17.3
+Version: 2.17.5
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -145,6 +145,9 @@
%{_includedir}/totem/*
%changelog
+* Wed Jan 17 2007 - [email protected]
+- Bump to 2.17.5.
+
* Wed Dec 06 2006 - [email protected]
- Add totem-06-novisual.diff so that the visualizer is turned off
by default since goom has basd performance issues on Solaris