[Pkg-xfce-commits] r4600 - in goodies/branches/experimental/xfce4-indicator-plugin/debian: . patches

Yves-Alexis Perez corsac at alioth.debian.org
Tue Nov 30 04:55:45 UTC 2010


Author: corsac
Date: 2010-11-30 16:55:38 +0000 (Tue, 30 Nov 2010)
New Revision: 4600

Removed:
   goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch
Modified:
   goodies/branches/experimental/xfce4-indicator-plugin/debian/changelog
   goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/series
Log:
* debian/patches:
  - 01_libindicator0.3.0_compat dropped, included upstream.

Modified: goodies/branches/experimental/xfce4-indicator-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-indicator-plugin/debian/changelog	2010-11-30 16:54:11 UTC (rev 4599)
+++ goodies/branches/experimental/xfce4-indicator-plugin/debian/changelog	2010-11-30 16:55:38 UTC (rev 4600)
@@ -9,8 +9,10 @@
     - add -O1, --as-needed and -z,defs to LDFLAGS
     - add hardening flags to {C,LD}FLAGS
   * debian/watch updated.
+  * debian/patches:
+    - 01_libindicator0.3.0_compat dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Tue, 30 Nov 2010 17:53:34 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 30 Nov 2010 17:55:12 +0100
 
 xfce4-indicator-plugin (0.0.1-2) unstable; urgency=low
 

Deleted: goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch
===================================================================
--- goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch	2010-11-30 16:54:11 UTC (rev 4599)
+++ goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch	2010-11-30 16:55:38 UTC (rev 4600)
@@ -1,146 +0,0 @@
-Description: fix compilation with libindicator >=0.3
-Forwarded: Yes
-Author: Evgeni Golov <evgeni at debian.org>
-Applied-Upstream: http://hg.foresightlinux.org/xfce/xfce4-indicator-plugin/rev/630cdff47172
-Last-Update: 2010-05-31
-
-#diff -r e02fa5b5ff30 configure.in.in
-#--- a/configure.in.in	Fri Oct 23 15:03:46 2009 +0200
-#+++ b/configure.in.in	Mon May 31 13:11:30 2010 +0200
-#@@ -65,7 +65,7 @@
-# XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
-# XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
-# XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
-#-XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.2.0])
-#+XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0])
-# 
-# dnl ***********************************
-# dnl *** Check for debugging support ***
-Index: xfce4-indicator-plugin-0.0.1/panel-plugin/indicator.c
-===================================================================
---- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/indicator.c	2010-06-13 18:00:28.372224709 +0200
-+++ xfce4-indicator-plugin-0.0.1/panel-plugin/indicator.c	2010-06-13 18:57:35.276310144 +0200
-@@ -26,7 +26,7 @@
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include <libxfce4panel/xfce-hvbox.h>
--#include <libindicator/indicator.h>
-+#include <libindicator/indicator-object.h>
- 
- #include "indicator.h"
- 
-@@ -34,7 +34,7 @@
- #define DEFAULT_SETTING1 NULL
- #define DEFAULT_SETTING2 1
- #define DEFAULT_SETTING3 FALSE
--#define ICONS_DIR  (DATADIR G_DIR_SEPARATOR_S "indicator-applet" G_DIR_SEPARATOR_S "icons")
-+#define ICONS_DIR "/usr/share/libindicator/icons/"
- 
- 
- /* prototypes */
-@@ -320,57 +320,35 @@
- 	g_debug("Loading Module: %s", name);
- 
- 	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
--	GModule * module = g_module_open(fullpath,
--                                     G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-+	IndicatorObject * io = indicator_object_new_from_file(fullpath);
- 	g_free(fullpath);
--	g_return_val_if_fail(module != NULL, FALSE);
- 
--	get_version_t lget_version = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE);
--	if (!INDICATOR_VERSION_CHECK(lget_version())) {
--		g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION);
--		return FALSE;
--	}
-+	GList * entries = indicator_object_get_entries(io);
-+	GList * entry = NULL;
- 
--	get_label_t lget_label = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE);
--	g_return_val_if_fail(lget_label != NULL, FALSE);
--	GtkLabel * label = lget_label();
--
--	get_icon_t lget_icon = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE);
--	g_return_val_if_fail(lget_icon != NULL, FALSE);
--	GtkImage * icon = lget_icon();
--
--	get_menu_t lget_menu = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE);
--	g_return_val_if_fail(lget_menu != NULL, FALSE);
--	GtkMenu * lmenu = lget_menu();
--
--	if (label == NULL && icon == NULL) {
--		/* This is the case where there is nothing to display,
--		   kinda odd that we'd have a module with nothing. */
--		g_warning("No label or icon.  Odd.");
--		return FALSE;
--	}
-+	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
-+		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
- 
--	GtkWidget * menuitem = gtk_menu_item_new();
--	GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
--	if (icon != NULL) {
--		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(icon), FALSE, FALSE, 0);
--	}
--	if (label != NULL) {
--		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0);
--	}
--	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
--	gtk_widget_show(hbox);
-+		GtkWidget * menuitem = gtk_menu_item_new();
-+		GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
-+		if (entrydata->image != NULL) {
-+			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->image), FALSE, FALSE, 0);
-+		}
-+		if (entrydata->label != NULL) {
-+			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->label), FALSE, FALSE, 0);
-+		}
-+		gtk_container_add(GTK_CONTAINER(menuitem), hbox);
-+		gtk_widget_show(hbox);
-+
-+		if (entrydata->menu != NULL) {
-+			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entrydata->menu));
-+		}
- 
--	if (lmenu != NULL) {
--		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(lmenu));
-+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-+		gtk_widget_show(menuitem);
- 	}
- 
--	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
--	gtk_widget_show(menuitem);
-+	g_list_free(entries);
- 
- 	return TRUE;
- }
-Index: xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.am
-===================================================================
---- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/Makefile.am	2010-06-13 18:01:02.988286674 +0200
-+++ xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.am	2010-06-13 18:56:45.432223655 +0200
-@@ -24,7 +24,7 @@
- 	$(INDICATOR_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)					\
- 	-DDATADIR=\""$(datadir)"\" 				\
--	-DINDICATOR_DIR=\""$(libdir)/indicators/2"\"
-+	-DINDICATOR_DIR=\""$(libdir)/indicators/3"\"
- 
- 
- xfce4_indicator_plugin_LDADD =					\
-Index: xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.in
-===================================================================
---- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/Makefile.in	2010-06-13 19:01:13.216725094 +0200
-+++ xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.in	2010-06-13 19:01:22.384224345 +0200
-@@ -273,7 +273,7 @@
- 	$(INDICATOR_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)					\
- 	-DDATADIR=\""$(datadir)"\" 				\
--	-DINDICATOR_DIR=\""$(libdir)/indicators/2"\"
-+	-DINDICATOR_DIR=\""$(libdir)/indicators/3"\"
- 
- xfce4_indicator_plugin_LDADD = \
- 	$(LIBXFCE4UTIL_LIBS)						\

Modified: goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/series	2010-11-30 16:54:11 UTC (rev 4599)
+++ goodies/branches/experimental/xfce4-indicator-plugin/debian/patches/series	2010-11-30 16:55:38 UTC (rev 4600)
@@ -1,3 +1,2 @@
-01_libindicator0.3.0_compat.patch
 02_menu_on_no-indicators.patch
 03_skip_pofiles_in_patches.patch




More information about the Pkg-xfce-commits mailing list