diff options
Diffstat (limited to 'package/lxpanel')
| -rw-r--r-- | package/lxpanel/Makefile | 30 | ||||
| -rw-r--r-- | package/lxpanel/patches/patch-src_plugins_batt_batt_c | 29 |
2 files changed, 59 insertions, 0 deletions
diff --git a/package/lxpanel/Makefile b/package/lxpanel/Makefile new file mode 100644 index 000000000..51f5275d1 --- /dev/null +++ b/package/lxpanel/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= lxpanel +PKG_VERSION:= 0.5.6 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 4c51dfdc0d15851d331905cfa00cc025 +PKG_DESCR:= graphical panel +PKG_SECTION:= x11/lxde +PKG_URL:= http://lxde.org/ +PKG_SITES:= http://openadk.org/distfiles/ + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LXPANEL,lxpanel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +lxpanel-install: + $(INSTALL_DIR) $(IDIR_LXPANEL)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/lxpanel* \ + $(IDIR_LXPANEL)/usr/bin + $(INSTALL_DIR) $(IDIR_LXPANEL)/usr/share/lxpanel + $(CP) $(WRKINST)/usr/share/lxpanel/* \ + $(IDIR_LXPANEL)/usr/share/lxpanel + $(INSTALL_DIR) $(IDIR_LXPANEL)/usr/lib/lxpanel + $(CP) $(WRKINST)/usr/lib/lxpanel/* \ + $(IDIR_LXPANEL)/usr/lib/lxpanel + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lxpanel/patches/patch-src_plugins_batt_batt_c b/package/lxpanel/patches/patch-src_plugins_batt_batt_c new file mode 100644 index 000000000..33467abc1 --- /dev/null +++ b/package/lxpanel/patches/patch-src_plugins_batt_batt_c @@ -0,0 +1,29 @@ +--- lxpanel-0.5.6.orig/src/plugins/batt/batt.c 2010-02-08 07:37:52.000000000 +0100 ++++ lxpanel-0.5.6/src/plugins/batt/batt.c 2011-04-14 22:05:34.617672290 +0200 +@@ -95,7 +95,7 @@ typedef struct { + typedef struct { + char *command; + sem_t *lock; +-} alarm; ++} alarms; + + 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 *l + /* 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; ++ alarms *a = (alarms *) arg; + + sem_wait(a->lock); + system(a->command); +@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gb + /* Run the alarm command if it isn't already running */ + if (alarmCanRun) { + +- alarm *a = (alarm *) malloc(sizeof(alarm)); ++ alarms *a = (alarms *) malloc(sizeof(alarms)); + a->command = lx_b->alarmCommand; + a->lock = &(lx_b->alarmProcessLock); + |