From 822fbc3ee4988973336b2c86f5b1a477dee8a487 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sat, 25 Aug 2012 00:03:52 +0000 Subject: Remove old LXDE packages (Portage version: 2.1.11.11/cvs/Linux x86_64) --- lxde-base/lxpanel/ChangeLog | 14 +- .../lxpanel/files/lxpanel-0.5.1-sandbox.patch | 18 - .../lxpanel/files/lxpanel-0.5.6-broken-apps.patch | 20 -- .../lxpanel/files/lxpanel-0.5.6-symbol-alarm.patch | 43 --- .../lxpanel/files/lxpanel-0.5.7-requisition.patch | 31 -- .../files/lxpanel-0.5.7-tooltip-netstatus.patch | 33 -- .../files/lxpanel-0.5.8-battery-meter.patch | 27 -- .../files/lxpanel-0.5.8-dynamic-width.patch | 40 --- .../files/lxpanel-0.5.8-thermal-plugin.patch | 378 --------------------- lxde-base/lxpanel/lxpanel-0.5.8-r3.ebuild | 58 ---- lxde-base/lxpanel/lxpanel-0.5.8.ebuild | 55 --- lxde-base/lxpanel/lxpanel-0.5.9.ebuild | 64 ---- 12 files changed, 12 insertions(+), 769 deletions(-) delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.1-sandbox.patch delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.6-symbol-alarm.patch delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.7-requisition.patch delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.7-tooltip-netstatus.patch delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.8-battery-meter.patch delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.8-dynamic-width.patch delete mode 100644 lxde-base/lxpanel/files/lxpanel-0.5.8-thermal-plugin.patch delete mode 100644 lxde-base/lxpanel/lxpanel-0.5.8-r3.ebuild delete mode 100644 lxde-base/lxpanel/lxpanel-0.5.8.ebuild delete mode 100644 lxde-base/lxpanel/lxpanel-0.5.9.ebuild (limited to 'lxde-base') diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog index 4225efc93db3..9d07570a4b35 100644 --- a/lxde-base/lxpanel/ChangeLog +++ b/lxde-base/lxpanel/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for lxde-base/lxpanel # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.50 2012/08/14 22:05:50 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.51 2012/08/25 00:03:51 hwoarang Exp $ + + 25 Aug 2012; Markos Chandras + -files/lxpanel-0.5.1-sandbox.patch, -files/lxpanel-0.5.6-broken-apps.patch, + -files/lxpanel-0.5.6-symbol-alarm.patch, + -files/lxpanel-0.5.7-requisition.patch, + -files/lxpanel-0.5.7-tooltip-netstatus.patch, + -files/lxpanel-0.5.8-battery-meter.patch, + -files/lxpanel-0.5.8-dynamic-width.patch, + -files/lxpanel-0.5.8-thermal-plugin.patch, -lxpanel-0.5.8-r3.ebuild, + -lxpanel-0.5.8.ebuild, -lxpanel-0.5.9.ebuild: + Remove old LXDE packages 14 Aug 2012; Johannes Huber lxpanel-0.5.10.ebuild: Stable for x86, wrt bug #430494 @@ -214,4 +225,3 @@ 07 Nov 2008; Ben de Groot +metadata.xml, +lxpanel-0.3.8.1.ebuild: Initial import of ebuild from lxde overlay - diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.1-sandbox.patch b/lxde-base/lxpanel/files/lxpanel-0.5.1-sandbox.patch deleted file mode 100644 index e7a12d24b081..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.1-sandbox.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -burN lxpanel-0.5.1.orig/src/plugins/Makefile.am lxpanel-0.5.1/src/plugins/Makefile.am ---- lxpanel-0.5.1.orig/src/plugins/Makefile.am 2009-07-09 07:02:10.000000000 +0200 -+++ lxpanel-0.5.1/src/plugins/Makefile.am 2009-08-04 20:42:03.000000000 +0200 -@@ -47,6 +47,3 @@ - icon.xpm - - install-exec-hook: -- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.la -- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.a -- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*. -diff -burN lxpanel-0.5.1.orig/src/plugins/netstatus/Makefile.am lxpanel-0.5.1/src/plugins/netstatus/Makefile.am ---- lxpanel-0.5.1.orig/src/plugins/netstatus/Makefile.am 2009-08-02 04:29:06.000000000 +0200 -+++ lxpanel-0.5.1/src/plugins/netstatus/Makefile.am 2009-08-04 20:42:36.000000000 +0200 -@@ -34,4 +34,3 @@ - $(LXPANEL_MODULE) - - install-exec-hook: -- rm -f "$(moduledir)\*.la" *.a diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch b/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch deleted file mode 100644 index 16cda10915aa..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -NrU5 lxpanel-0.5.6.original/data/default/panels/panel.in lxpanel-0.5.6/data/default/panels/panel.in ---- lxpanel-0.5.6.original/data/default/panels/panel.in 2010-02-08 00:37:52.000000000 -0600 -+++ lxpanel-0.5.6/data/default/panels/panel.in 2010-12-26 12:49:42.000000000 -0600 -@@ -50,16 +50,10 @@ - type = launchbar - Config { - Button { - id=pcmanfm.desktop - } -- Button { -- id=gnome-terminal.desktop -- } -- Button { -- id=firefox.desktop -- } - } - } - - Plugin { - type = space diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.6-symbol-alarm.patch b/lxde-base/lxpanel/files/lxpanel-0.5.6-symbol-alarm.patch deleted file mode 100644 index e3da3d89776c..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.6-symbol-alarm.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001 -From: Marty Jack -Date: Thu, 22 Jul 2010 19:46:13 -0400 -Subject: [PATCH 3/3] Fix build issue with symbol "alarm" showing up on F14 (Bug3033293) - ---- - src/plugins/batt/batt.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/batt/batt.c b/src/plugins/batt/batt.c -index 288231f..05c0deb 100644 ---- a/src/plugins/batt/batt.c -+++ b/src/plugins/batt/batt.c -@@ -95,7 +95,7 @@ typedef struct { - typedef struct { - char *command; - sem_t *lock; --} alarm; -+} Alarm; - - static void destructor(Plugin *p); - static void update_display(lx_battery *lx_b, gboolean repaint); -@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint); - /* alarmProcess takes the address of a dynamically allocated alarm struct (which - it must free). It ensures that alarm commands do not run concurrently. */ - static void * alarmProcess(void *arg) { -- alarm *a = (alarm *) arg; -+ Alarm *a = (Alarm *) arg; - - sem_wait(a->lock); - system(a->command); -@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) { - /* Run the alarm command if it isn't already running */ - if (alarmCanRun) { - -- alarm *a = (alarm *) malloc(sizeof(alarm)); -+ Alarm *a = (Alarm *) malloc(sizeof(Alarm)); - a->command = lx_b->alarmCommand; - a->lock = &(lx_b->alarmProcessLock); - --- -1.7.1.1 - diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.7-requisition.patch b/lxde-base/lxpanel/files/lxpanel-0.5.7-requisition.patch deleted file mode 100644 index b52cf991af34..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.7-requisition.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 200121f93d7c6ac9aadb53c58f45906ecd1e3b7a Mon Sep 17 00:00:00 2001 -From: Julien Lavergne -Date: Sun, 24 Jul 2011 15:43:24 +0200 -Subject: [PATCH] Fix usage of GtkRequisition - ---- - src/plugins/menu.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/plugins/menu.c b/src/plugins/menu.c -index 59a8dad..6d0ad9c 100644 ---- a/src/plugins/menu.c -+++ b/src/plugins/menu.c -@@ -142,10 +142,10 @@ menu_pos(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *widget) - gdk_window_get_origin(widget->window, &ox, &oy); - #endif - #if GTK_CHECK_VERSION(2,20,0) -- GtkRequisition *requisition; -- gtk_widget_get_requisition(GTK_WIDGET(menu),requisition); -- w = requisition->width; -- h = requisition->height; -+ GtkRequisition requisition; -+ gtk_widget_get_requisition(GTK_WIDGET(menu), &requisition); -+ w = requisition.width; -+ h = requisition.height; - - #else - w = GTK_WIDGET(menu)->requisition.width; --- -1.7.0.1 - diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.7-tooltip-netstatus.patch b/lxde-base/lxpanel/files/lxpanel-0.5.7-tooltip-netstatus.patch deleted file mode 100644 index a92732783ac2..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.7-tooltip-netstatus.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c30911ee2846a7ab544552651e679786483f2168 Mon Sep 17 00:00:00 2001 -From: Andrea Florio -Date: Mon, 25 Jul 2011 00:55:29 +0200 -Subject: [PATCH] fixed error in tooltipS function call - ---- - src/plugins/netstatus/netstatus-icon.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/netstatus/netstatus-icon.c b/src/plugins/netstatus/netstatus-icon.c -index 2cd3ccb..b3bfc19 100644 ---- a/src/plugins/netstatus/netstatus-icon.c -+++ b/src/plugins/netstatus/netstatus-icon.c -@@ -26,6 +26,7 @@ - - #include - #include -+#include - - #include "netstatus-util.h" - #include "netstatus-enums.h" -@@ -899,7 +900,7 @@ netstatus_icon_instance_init (NetstatusIcon *icon, - gtk_container_add (GTK_CONTAINER (icon), icon->priv->signal_image); - gtk_widget_hide (icon->priv->signal_image); - -- icon->priv->tooltips = gtk_tooltip_new (); -+ icon->priv->tooltips = gtk_tooltips_new (); - g_object_ref (icon->priv->tooltips); - gtk_object_sink (GTK_OBJECT (icon->priv->tooltips)); - --- -1.7.0.1 - diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.8-battery-meter.patch b/lxde-base/lxpanel/files/lxpanel-0.5.8-battery-meter.patch deleted file mode 100644 index 99ae7bc6dbf6..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.8-battery-meter.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/plugins/batt/batt_sys.c.orig 2011-12-19 15:10:52.690113669 +0100 -+++ src/plugins/batt/batt_sys.c 2011-12-19 15:14:36.154315765 +0100 -@@ -217,10 +217,24 @@ - b->remaining_capacity = b->remaining_energy; - } - } -+ // Start ideapad patch -+ if (b->remaining_capacity != -1 && b->last_capacity == -1) { -+ if (b->voltage != -1) { -+ b->remaining_energy = b->remaining_capacity * b->voltage / 1000; -+ b->present_rate = b->present_rate * 1000 / b->voltage; -+ } else { -+ b->remaining_capacity = b->remaining_energy; -+ } -+ } -+ // end ideapad patch - if (b->last_capacity < MIN_CAPACITY) - b->percentage = 0; - else -+ if (b->last_capacity_unit != -1) { - b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit; -+ } else { -+ b->percentage = ((float) b->remaining_capacity *100.0) / (float) b->last_capacity; -+ } - - if (b->percentage > 100) - b->percentage = 100; diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.8-dynamic-width.patch b/lxde-base/lxpanel/files/lxpanel-0.5.8-dynamic-width.patch deleted file mode 100644 index 0aea7b1a0d67..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.8-dynamic-width.patch +++ /dev/null @@ -1,40 +0,0 @@ -# See https://bugs.gentoo.org/show_bug.cgi?id=408541 -diff -urN lxpanel-0.5.8.bak/src/panel.c lxpanel-0.5.8/src/panel.c ---- lxpanel-0.5.8.bak/src/panel.c 2012-03-16 18:09:33.000000000 +0800 -+++ lxpanel-0.5.8/src/panel.c 2012-03-16 22:38:58.000000000 +0800 -@@ -484,13 +484,29 @@ - { - ENTER; - -- if (p->widthtype == WIDTH_REQUEST) -- p->width = (p->orientation == ORIENT_HORIZ) ? req->width : req->height; -- if (p->heighttype == HEIGHT_REQUEST) -- p->height = (p->orientation == ORIENT_HORIZ) ? req->height : req->width; -+ if (p->autohide && !p->visible) -+ { -+ /* When the panel is in invisible state, the content box also got hidden, thus always -+ * report 0 size. Ask the content box instead for its size. */ -+ GtkRequisition req_box; -+ gtk_widget_size_request(p->box, &req_box); -+ if (p->widthtype == WIDTH_REQUEST) -+ p->width = (p->orientation == ORIENT_HORIZ) ? req_box.width : req_box.height; -+ if (p->heighttype == HEIGHT_REQUEST) -+ p->height = (p->orientation == ORIENT_HORIZ) ? req_box.height : req_box.width; -+ } -+ else -+ { -+ if (p->widthtype == WIDTH_REQUEST) -+ p->width = (p->orientation == ORIENT_HORIZ) ? req->width : req->height; -+ if (p->heighttype == HEIGHT_REQUEST) -+ p->height = (p->orientation == ORIENT_HORIZ) ? req->height : req->width; -+ } - calculate_position(p); -- req->width = p->aw; -- req->height = p->ah; -+ -+ gtk_widget_set_size_request( widget, p->aw, p->ah ); -+// req->width = p->aw; -+// req->height = p->ah; - - RET( TRUE ); - } diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.8-thermal-plugin.patch b/lxde-base/lxpanel/files/lxpanel-0.5.8-thermal-plugin.patch deleted file mode 100644 index 0d9a1e7ecf99..000000000000 --- a/lxde-base/lxpanel/files/lxpanel-0.5.8-thermal-plugin.patch +++ /dev/null @@ -1,378 +0,0 @@ -X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxpanel;a=blobdiff_plain;f=src%2Fplugins%2Fthermal%2Fthermal.c;h=1ac80939630e4c26b376a45dc7474ddca8246189;hp=afe5e89135fa28d72f7aa625f70214c3adb3239e;hb=HEAD;hpb=8e33d60b30bb9236d7a16c06e8f079936c8dd9b0 - -diff --git a/src/plugins/thermal/thermal.c b/src/plugins/thermal/thermal.c -index afe5e89..1ac8093 100644 ---- a/src/plugins/thermal/thermal.c -+++ b/src/plugins/thermal/thermal.c -@@ -32,12 +32,18 @@ - - #include "dbg.h" - --#define THERMAL_DIRECTORY "/proc/acpi/thermal_zone/" /* must be slash-terminated */ --#define THERMAL_TEMPF "temperature" --#define THERMAL_TRIP "trip_points" --#define TRIP_CRITICAL "critical (S5):" -+#define PROC_THERMAL_DIRECTORY "/proc/acpi/thermal_zone/" /* must be slash-terminated */ -+#define PROC_THERMAL_TEMPF "temperature" -+#define PROC_THERMAL_TRIP "trip_points" -+#define PROC_TRIP_CRITICAL "critical (S5):" - --typedef struct { -+#define SYSFS_THERMAL_DIRECTORY "/sys/class/thermal/" /* must be slash-terminated */ -+#define SYSFS_THERMAL_SUBDIR_PREFIX "thermal_zone" -+#define SYSFS_THERMAL_TEMPF "temp" -+#define SYSFS_THERMAL_TRIP "trip_point_0_temp" -+ -+ -+typedef struct thermal { - Plugin * plugin; - GtkWidget *main; - GtkWidget *namew; -@@ -45,7 +51,7 @@ typedef struct { - int critical; - int warning1; - int warning2; -- int custom_levels, auto_sensor; -+ int not_custom_levels, auto_sensor; - char *sensor, - *str_cl_normal, - *str_cl_warning1, -@@ -54,17 +60,20 @@ typedef struct { - GdkColor cl_normal, - cl_warning1, - cl_warning2; -+ gint (*get_temperature)(struct thermal *th); -+ gint (*get_critical)(struct thermal *th); - } thermal; - -+ - static gint --get_critical(thermal *th){ -+proc_get_critical(thermal *th){ - FILE *state; - char buf[ 256 ], sstmp [ 100 ]; - char* pstr; - - if(th->sensor == NULL) return -1; - -- sprintf(sstmp,"%s%s",th->sensor,THERMAL_TRIP); -+ sprintf(sstmp,"%s%s",th->sensor,PROC_THERMAL_TRIP); - - if (!(state = fopen( sstmp, "r"))) { - //printf("cannot open %s\n",sstmp); -@@ -72,15 +81,15 @@ get_critical(thermal *th){ - } - - while( fgets(buf, 256, state) && -- ! ( pstr = strstr(buf, TRIP_CRITICAL) ) ); -+ ! ( pstr = strstr(buf, PROC_TRIP_CRITICAL) ) ); - if( pstr ) - { -- pstr += strlen(TRIP_CRITICAL); -+ pstr += strlen(PROC_TRIP_CRITICAL); - while( *pstr && *pstr == ' ' ) - ++pstr; - - pstr[strlen(pstr)-3] = '\0'; -- printf("Critical: [%s]\n",pstr); -+ //printf("Critical: [%s]\n",pstr); - fclose(state); - return atoi(pstr); - } -@@ -90,14 +99,14 @@ get_critical(thermal *th){ - } - - static gint --get_temperature(thermal *th){ -+proc_get_temperature(thermal *th){ - FILE *state; - char buf[ 256 ], sstmp [ 100 ]; - char* pstr; - - if(th->sensor == NULL) return -1; - -- sprintf(sstmp,"%s%s",th->sensor,THERMAL_TEMPF); -+ sprintf(sstmp,"%s%s",th->sensor,PROC_THERMAL_TEMPF); - - if (!(state = fopen( sstmp, "r"))) { - //printf("cannot open %s\n",sstmp); -@@ -122,11 +131,77 @@ get_temperature(thermal *th){ - } - - static gint -+sysfs_get_critical(thermal *th){ -+ FILE *state; -+ char buf[ 256 ], sstmp [ 100 ]; -+ char* pstr; -+ -+ if(th->sensor == NULL) return -1; -+ -+ sprintf(sstmp,"%s%s",th->sensor,SYSFS_THERMAL_TRIP); -+ -+ if (!(state = fopen( sstmp, "r"))) { -+ //printf("cannot open %s\n",sstmp); -+ return -1; -+ } -+ -+ while( fgets(buf, 256, state) && -+ ! ( pstr = buf ) ); -+ if( pstr ) -+ { -+ fclose(state); -+ return atoi(pstr)/1000; -+ } -+ -+ fclose(state); -+ return -1; -+} -+ -+static gint -+sysfs_get_temperature(thermal *th){ -+ FILE *state; -+ char buf[ 256 ], sstmp [ 100 ]; -+ char* pstr; -+ -+ if(th->sensor == NULL) return -1; -+ -+ sprintf(sstmp,"%s%s",th->sensor,SYSFS_THERMAL_TEMPF); -+ -+ if (!(state = fopen( sstmp, "r"))) { -+ //printf("cannot open %s\n",sstmp); -+ return -1; -+ } -+ -+ while (fgets(buf, 256, state) && -+ ! ( pstr = buf ) ); -+ if( pstr ) -+ { -+ fclose(state); -+ return atoi(pstr)/1000; -+ } -+ -+ fclose(state); -+ return -1; -+} -+ -+ -+static void -+set_get_functions(thermal *th) -+{ -+ if (th->sensor && strncmp(th->sensor, "/sys/", 5) == 0){ -+ th->get_temperature = sysfs_get_temperature; -+ th->get_critical = sysfs_get_critical; -+ } else { -+ th->get_temperature = proc_get_temperature; -+ th->get_critical = proc_get_critical; -+ } -+} -+ -+static gint - update_display(thermal *th) - { - char buffer [60]; -- int n; -- int temp = get_temperature(th); -+ int temp = th->get_temperature(th); - GdkColor color; - - if(temp >= th->warning2) -@@ -141,42 +216,92 @@ update_display(thermal *th) - panel_draw_label_text(th->plugin->panel, th->namew, "NA", TRUE, TRUE); - else - { -- n = sprintf(buffer, "%02d", gcolor2rgb24(&color), temp); -+ sprintf(buffer, "%02d", gcolor2rgb24(&color), temp); - gtk_label_set_markup (GTK_LABEL(th->namew), buffer) ; - } - - RET(TRUE); - } - -+ -+/* get_sensor(): -+ * - Get the sensor directory, and store it in '*sensor'. -+ * - It is searched for in 'directory'. -+ * - Only the subdirectories starting with 'subdir_prefix' are accepted as sensors. -+ * - 'subdir_prefix' may be NULL, in which case any subdir is considered a sensor. */ - static void --check_sensors( thermal* th ) -+get_sensor(char** sensor, char const* directory, char const* subdir_prefix) - { - GDir *sensorsDirectory; - const char *sensor_name; - char sensor_path[100]; - -- if (! (sensorsDirectory = g_dir_open(THERMAL_DIRECTORY, 0, NULL))) -+ if (! (sensorsDirectory = g_dir_open(directory, 0, NULL))) - { -- th->sensor = NULL; -+ *sensor = NULL; - return; - } - - /* Scan the thermal_zone directory for available sensors */ - while ((sensor_name = g_dir_read_name(sensorsDirectory))) { - if (sensor_name[0] != '.') { -- sprintf(sensor_path,"%s%s/",THERMAL_DIRECTORY, sensor_name); -- if(th->sensor) { -- g_free(th->sensor); -- th->sensor = NULL; -+ if (subdir_prefix) { -+ if (strncmp(sensor_name, subdir_prefix, strlen(subdir_prefix)) != 0) -+ continue; - } -- th->sensor = strdup(sensor_path); -- //printf("sensor: %s\n", b->sensor); -+ sprintf(sensor_path,"%s%s/", directory, sensor_name); -+ if(*sensor) { -+ g_free(*sensor); -+ *sensor = NULL; -+ } -+ *sensor = strdup(sensor_path); - break; - } - } - g_dir_close(sensorsDirectory); - } - -+static void -+check_sensors( thermal *th ) -+{ -+ if(th->sensor) { -+ g_free(th->sensor); -+ th->sensor = NULL; -+ } -+ -+ get_sensor(&th->sensor, PROC_THERMAL_DIRECTORY, NULL); -+ -+ if (!th->sensor) -+ get_sensor(&th->sensor, SYSFS_THERMAL_DIRECTORY, SYSFS_THERMAL_SUBDIR_PREFIX); -+ -+ //printf("thermal sensor: %s\n", th->sensor); -+} -+ -+ -+static void applyConfig(Plugin* p) -+{ -+ thermal *th = p->priv; -+ ENTER; -+ -+ if (th->str_cl_normal) gdk_color_parse(th->str_cl_normal, &th->cl_normal); -+ if (th->str_cl_warning1) gdk_color_parse(th->str_cl_warning1, &th->cl_warning1); -+ if (th->str_cl_warning2) gdk_color_parse(th->str_cl_warning2, &th->cl_warning2); -+ -+ if(th->sensor == NULL) th->auto_sensor = TRUE; -+ if(th->auto_sensor) check_sensors(th); -+ -+ set_get_functions(th); -+ -+ th->critical = th->get_critical(th); -+ -+ if(th->not_custom_levels){ -+ th->warning1 = th->critical - 10; -+ th->warning2 = th->critical - 5; -+ } -+ -+ RET(); -+} -+ - static int - thermal_constructor(Plugin *p, char** fp) - { -@@ -197,6 +322,11 @@ thermal_constructor(Plugin *p, char** fp) - th->main = p->pwid; - th->tip = gtk_tooltips_new(); - -+ /* By default, use automatic, that is, "not custom" temperature levels. If -+ * we were using custom levels, they would be 0°C at startup, so we would -+ * display in warning colors by default. */ -+ th->not_custom_levels = TRUE; -+ - g_signal_connect (G_OBJECT (p->pwid), "button_press_event", - G_CALLBACK (plugin_button_press_event), (gpointer) p); - -@@ -220,7 +350,7 @@ thermal_constructor(Plugin *p, char** fp) - }else if (!g_ascii_strcasecmp(s.t[0], "AutomaticSensor")){ - th->auto_sensor= atoi(s.t[1]); - }else if (!g_ascii_strcasecmp(s.t[0], "CustomLevels")){ -- th->custom_levels= atoi(s.t[1]); -+ th->not_custom_levels= atoi(s.t[1]); - }else if (!g_ascii_strcasecmp(s.t[0], "Sensor")){ - th->sensor= g_strdup(s.t[1]); - }else if (!g_ascii_strcasecmp(s.t[0], "Warning1Temp")){ -@@ -236,7 +366,6 @@ thermal_constructor(Plugin *p, char** fp) - goto error; - } - } -- - } - - if(!th->str_cl_normal) -@@ -246,20 +375,7 @@ thermal_constructor(Plugin *p, char** fp) - if(!th->str_cl_warning2) - th->str_cl_warning2 = g_strdup("#ff0000"); - -- gdk_color_parse(th->str_cl_normal, &(th->cl_normal)); -- gdk_color_parse(th->str_cl_warning1, &(th->cl_warning1)); -- gdk_color_parse(th->str_cl_warning2, &(th->cl_warning2)); -- -- -- if(th->sensor == NULL) th->auto_sensor = TRUE; -- if(th->auto_sensor) check_sensors(th); -- -- th->critical = get_critical(th); -- -- if(!th->custom_levels){ -- th->warning1 = th->critical - 10; -- th->warning2 = th->critical - 5; -- } -+ applyConfig(p); - - gtk_widget_show(th->namew); - -@@ -272,27 +388,6 @@ error: - RET(FALSE); - } - --static void applyConfig(Plugin* p) --{ -- -- thermal *th = (thermal *)p->priv; -- -- ENTER; -- -- if (th->str_cl_normal) gdk_color_parse(th->str_cl_normal, &th->cl_normal); -- if (th->str_cl_warning1) gdk_color_parse(th->str_cl_warning1, &th->cl_warning1); -- if (th->str_cl_warning2) gdk_color_parse(th->str_cl_warning2, &th->cl_warning2); -- -- if(th->auto_sensor) check_sensors(th); -- -- if(th->custom_levels){ -- th->warning1 = th->critical - 10; -- th->warning2 = th->critical - 5; -- } -- -- RET(); --} -- - static void config(Plugin *p, GtkWindow* parent) { - ENTER; - -@@ -306,7 +401,7 @@ static void config(Plugin *p, GtkWindow* parent) { - _("Warning2"), &th->str_cl_warning2, CONF_TYPE_STR, - _("Automatic sensor location"), &th->auto_sensor, CONF_TYPE_BOOL, - _("Sensor"), &th->sensor, CONF_TYPE_STR, -- _("Automatic temperature levels"), &th->custom_levels, CONF_TYPE_BOOL, -+ _("Automatic temperature levels"), &th->not_custom_levels, CONF_TYPE_BOOL, - _("Warning1 Temperature"), &th->warning1, CONF_TYPE_INT, - _("Warning2 Temperature"), &th->warning2, CONF_TYPE_INT, - NULL); -@@ -338,7 +433,7 @@ static void save_config( Plugin* p, FILE* fp ) - lxpanel_put_str( fp, "NormalColor", th->str_cl_normal ); - lxpanel_put_str( fp, "Warning1Color", th->str_cl_warning1 ); - lxpanel_put_str( fp, "Warning2Color", th->str_cl_warning2 ); -- lxpanel_put_int( fp, "CustomLevels", th->custom_levels ); -+ lxpanel_put_int( fp, "CustomLevels", th->not_custom_levels ); - lxpanel_put_int( fp, "Warning1Temp", th->warning1 ); - lxpanel_put_int( fp, "Warning2Temp", th->warning2 ); - lxpanel_put_int( fp, "AutomaticSensor", th->auto_sensor ); diff --git a/lxde-base/lxpanel/lxpanel-0.5.8-r3.ebuild b/lxde-base/lxpanel/lxpanel-0.5.8-r3.ebuild deleted file mode 100644 index 3d83ca16b464..000000000000 --- a/lxde-base/lxpanel/lxpanel-0.5.8-r3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.8-r3.ebuild,v 1.1 2012/05/07 10:14:24 hwoarang Exp $ - -EAPI="4" - -inherit autotools eutils - -DESCRIPTION="Lightweight X11 desktop panel for LXDE" -HOMEPAGE="http://lxde.org/" -SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="+alsa" -RESTRICT="test" # bug 249598 - -RDEPEND="x11-libs/gtk+:2 - x11-libs/libXmu - x11-libs/libXpm - lxde-base/lxmenu-data - lxde-base/menu-cache - alsa? ( media-libs/alsa-lib )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch - epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch - epatch "${FILESDIR}"/${P}-battery-meter.patch - epatch "${FILESDIR}"/${P}-thermal-plugin.patch - epatch "${FILESDIR}"/${P}-dynamic-width.patch - eautoreconf -} - -src_configure() { - local plugins=all - [[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb - - econf $(use_enable alsa) --with-x --with-plugins=${plugins} - # the gtk+ dep already pulls in libX11, so we might as well hardcode with-x -} - -src_install () { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog README - - # Get rid of the .la files. - find "${D}" -name '*.la' -delete -} - -pkg_postinst() { - elog "If you have problems with broken icons shown in the main panel," - elog "you will have to configure panel settings via its menu." - elog "This will not be an issue with first time installations." -} diff --git a/lxde-base/lxpanel/lxpanel-0.5.8.ebuild b/lxde-base/lxpanel/lxpanel-0.5.8.ebuild deleted file mode 100644 index 094e89d2f4bc..000000000000 --- a/lxde-base/lxpanel/lxpanel-0.5.8.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.8.ebuild,v 1.6 2012/06/05 00:43:59 xmw Exp $ - -EAPI="4" - -inherit autotools eutils - -DESCRIPTION="Lightweight X11 desktop panel for LXDE" -HOMEPAGE="http://lxde.org/" -SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm ppc x86 ~x86-interix ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="+alsa" -RESTRICT="test" # bug 249598 - -RDEPEND="x11-libs/gtk+:2 - x11-libs/libXmu - x11-libs/libXpm - lxde-base/lxmenu-data - lxde-base/menu-cache - alsa? ( media-libs/alsa-lib )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch - epatch "${FILESDIR}"/${PN}-0.5.6-broken-apps.patch - eautoreconf -} - -src_configure() { - local plugins=all - [[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb - - econf $(use_enable alsa) --with-x --with-plugins=${plugins} - # the gtk+ dep already pulls in libX11, so we might as well hardcode with-x -} - -src_install () { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog README - - # Get rid of the .la files. - find "${D}" -name '*.la' -delete -} - -pkg_postinst() { - elog "If you have problems with broken icons shown in the main panel," - elog "you will have to configure panel settings via its menu." - elog "This will not be an issue with first time installations." -} diff --git a/lxde-base/lxpanel/lxpanel-0.5.9.ebuild b/lxde-base/lxpanel/lxpanel-0.5.9.ebuild deleted file mode 100644 index 6c2f0ed22426..000000000000 --- a/lxde-base/lxpanel/lxpanel-0.5.9.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.9.ebuild,v 1.4 2012/06/11 18:40:13 hwoarang Exp $ - -EAPI="4" - -inherit autotools eutils - -DESCRIPTION="Lightweight X11 desktop panel for LXDE" -HOMEPAGE="http://lxde.org/" -SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux" -SLOT="0" -IUSE="+alsa wifi" -RESTRICT="test" # bug 249598 - -RDEPEND="x11-libs/gtk+:2 - x11-libs/libXmu - x11-libs/libXpm - lxde-base/lxmenu-data - lxde-base/menu-cache - alsa? ( media-libs/alsa-lib ) - wifi? ( net-wireless/wireless-tools )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.8-dynamic-width.patch - epatch "${FILESDIR}"/${P}-sandbox.patch - #bug #415595 - epatch "${FILESDIR}"/${P}-libwnck-check.patch - #bug #420583 - sed -i "s:-Werror::" configure.ac || die - eautoreconf -} - -src_configure() { - local plugins="netstatus,volume,cpu deskno,batt, \ - kbled,xkb,thermal,cpufreq,monitors" - # wnckpager disabled per bug #415519 - use wifi && plugins+=",netstat" - use alsa && plugins+=",volumealsa" - [[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb - - econf $(use_enable alsa) --with-x --with-plugins="${plugins}" - # the gtk+ dep already pulls in libX11, so we might as well hardcode with-x -} - -src_install () { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog README - - # Get rid of the .la files. - find "${D}" -name '*.la' -delete -} - -pkg_postinst() { - elog "If you have problems with broken icons shown in the main panel," - elog "you will have to configure panel settings via its menu." - elog "This will not be an issue with first time installations." -} -- cgit v1.2.3-65-gdbad