[Pkg-xfce-commits] r264 - goodies/xfce4-cpufreq-plugin/debian/patches

[Stefan Ott]

Author: cockroach-guest
Date: 2005-10-11 21:35:14 +0000 (Tue, 11 Oct 2005)
New Revision: 264

Added:
   goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.dpatch
   goodies/xfce4-cpufreq-plugin/debian/patches/02_makefile.dpatch
Removed:
   goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch
Modified:
   goodies/xfce4-cpufreq-plugin/debian/patches/00list
Log:
Renamed warning message patch, added patch for makefile


Modified: goodies/xfce4-cpufreq-plugin/debian/patches/00list
===================================================================
--- goodies/xfce4-cpufreq-plugin/debian/patches/00list	2005-10-11 21:34:36 UTC (rev 263)
+++ goodies/xfce4-cpufreq-plugin/debian/patches/00list	2005-10-11 21:35:14 UTC (rev 264)
@@ -1 +1,2 @@
 01_warning-message.patch
+02_makefile.dpatch

Copied: goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.dpatch (from rev 263, goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch)

Deleted: goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch
===================================================================
--- goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch	2005-10-11 21:34:36 UTC (rev 263)
+++ goodies/xfce4-cpufreq-plugin/debian/patches/01_warning-message.patch	2005-10-11 21:35:14 UTC (rev 264)
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_warning-message.dpatch by  <stefan at desire.ch>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Prevent the warning popups from showing over and over again
- at DPATCH@
---- xfce4-cpufreq-0.1-orig/cpufreq.c	2005-07-15 19:36:59.000000000 +0200
-+++ xfce4-cpufreq-0.1/cpufreq.c	2005-10-11 23:10:51.000000000 +0200
-@@ -65,6 +65,8 @@
- 	int cpu;
- 	int timeoutid;
- 
-+	gboolean showed_warning;
-+
- 	GdkColor colorLow;
- 	GdkColor colorHi;
- 
-@@ -136,6 +138,8 @@
- 
- 	if (cur == 0) /* error */
- 	{
-+		if (c->showed_warning) return TRUE;
-+
- 		GtkWindow* win = GTK_WINDOW(gtk_widget_get_toplevel(c->vbox));
- 		
- 		if (c->cpu == 0) /* MUST work, unless cpufreq support is not available */
-@@ -143,11 +147,13 @@
- 			GtkWidget* d = gtk_message_dialog_new(win, 0,
- 				GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- 				_("CPUFreq support is not present. The CPUFreq Monitor will not function this session."));
--			gtk_dialog_run(GTK_DIALOG(d));
-+			c->showed_warning = (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK);
- 			gtk_widget_destroy(d);
- 
--			/* hide the useless widgets */
--			gtk_widget_hide(c->vbox);
-+			gtk_widget_modify_bg(c->pbar, GTK_STATE_PRELIGHT, &(c->colorLow));
-+			gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(c->pbar), 1);
-+			gtk_label_set_markup(GTK_LABEL(c->label), "error");
-+
- 			return TRUE; /* not an indicator of success */
- 		}
- 		else /* some other error, fall back to 0 */
-@@ -155,7 +161,7 @@
- 			GtkWidget* d = gtk_message_dialog_new(win, 0,
- 				GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
- 				_("CPU %d is not present. The CPUFreq Monitor will monitor CPU 0 for this session."), c->cpu);
--			gtk_dialog_run(GTK_DIALOG(d));
-+			c->showed_warning = (gtk_dialog_run(GTK_DIALOG(d)) == GTK_RESPONSE_OK);
- 			gtk_widget_destroy(d);
- 
- 			c->cpu = 0;
-@@ -239,6 +245,7 @@
- 	c->cpu = 0;
- 	c->orientation = VERTICAL; /* a very good default */
- 	c->nr_cpus = get_nr_cpus();
-+	c->showed_warning = FALSE;
- 	
- 	/* determine min/max */
- 	cpufreq_get_hardware_limits(c->cpu, &c->min, &c->max);

Added: goodies/xfce4-cpufreq-plugin/debian/patches/02_makefile.dpatch
===================================================================
--- goodies/xfce4-cpufreq-plugin/debian/patches/02_makefile.dpatch	2005-10-11 21:34:36 UTC (rev 263)
+++ goodies/xfce4-cpufreq-plugin/debian/patches/02_makefile.dpatch	2005-10-11 21:35:14 UTC (rev 264)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_makefile.dpatch by  <stefan at desire.ch>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add -fPIC option (as requested by lintian)
+ at DPATCH@
+--- xfce4-cpufreq-0.1-orig/Makefile	2005-07-15 19:23:21.000000000 +0200
++++ xfce4-cpufreq-0.1/Makefile	2005-10-11 23:30:26.000000000 +0200
+@@ -2,7 +2,7 @@
+ OUT = libcpufreq.so
+ EXT_CFLAGS := $(shell pkg-config --cflags libxml-2.0 gtk+-2.0 libxfcegui4-1.0)
+ EXT_LIBS := $(shell pkg-config --libs libxml-2.0 gtk+-2.0 libxfcegui4-1.0)
+-CFLAGS = -Wl,-export-dynamic -shared -g -O2 -Wall $(EXT_CFLAGS) $(EXT_LIBS) -lcpufreq
++CFLAGS = -fPIC -Wl,-export-dynamic -shared -g -O2 -Wall $(EXT_CFLAGS) $(EXT_LIBS) -lcpufreq
+ 
+ $(OUT): cpufreq.c
+ 	$(CC) $(CFLAGS) $< -o $@


Property changes on: goodies/xfce4-cpufreq-plugin/debian/patches/02_makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *