[arch-commits] Commit in xfce4-timer-plugin/trunk (PKGBUILD panel48.patch)

[andyrtr at archlinux.org]

    Date: Saturday, January 29, 2011 @ 07:51:59
  Author: andyrtr
Revision: 108093

upgpkg: xfce4-timer-plugin 0.6.1-1
upstream update and add a fix for panel 4.8 from git

Added:
  xfce4-timer-plugin/trunk/panel48.patch
Modified:
  xfce4-timer-plugin/trunk/PKGBUILD

---------------+
 PKGBUILD      |   10 +++++++---
 panel48.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-29 12:34:48 UTC (rev 108092)
+++ PKGBUILD	2011-01-29 12:51:59 UTC (rev 108093)
@@ -8,16 +8,20 @@
 pkgdesc="plugin to track time for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('GPL2')
-url="http://xfce-goodies.berlios.de/"
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ba5ae0e25f69517338f74a27fbaf4ca2')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2
+	panel48.patch)
+md5sums=('ba5ae0e25f69517338f74a27fbaf4ca2'
+         'fc9444aa98d7ef9c61d97dbd9f47e082')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  # patch from git master
+  patch -Np1 -i ${srcdir}/panel48.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/ \

Added: panel48.patch
===================================================================
--- panel48.patch	                        (rev 0)
+++ panel48.patch	2011-01-29 12:51:59 UTC (rev 108093)
@@ -0,0 +1,39 @@
+From 03ff202f818fe3f075a6c864ab688b57b1bb1cb4 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Thu, 27 Jan 2011 21:18:45 +0000
+Subject: Fix segfault when creating plugin in 4.8 panel.
+
+Used invalid function type to construct the plugin.
+---
+diff --git a/src/xfcetimer.c b/src/xfcetimer.c
+index c27d37a..de7bd2b 100644
+--- a/src/xfcetimer.c
++++ b/src/xfcetimer.c
+@@ -42,7 +42,7 @@
+ 
+ #include "xfcetimer.h"
+ 
+-static gboolean create_plugin_control (XfcePanelPlugin *plugin);
++static void create_plugin_control (XfcePanelPlugin *plugin);
+ XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(create_plugin_control);
+ 
+ void make_menu(plugin_data *pd);
+@@ -1366,7 +1366,7 @@ static void plugin_create_options (XfcePanelPlugin *plugin,plugin_data *pd) {
+  *
+  * Returns %TRUE on success, %FALSE on failure.
+  **/
+-static gboolean
++static void
+ create_plugin_control (XfcePanelPlugin *plugin)
+ {
+ 
+@@ -1461,7 +1461,6 @@ create_plugin_control (XfcePanelPlugin *plugin)
+   xfce_panel_plugin_menu_show_configure (plugin);
+   g_signal_connect (plugin, "configure-plugin",
+                       G_CALLBACK (plugin_create_options), pd);
+-  return(TRUE);
+ }
+ 
+ 
+--
+cgit v0.8.3.4