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

[Eric Bélanger]

    Date: Tuesday, February 7, 2012 @ 22:29:10
  Author: eric
Revision: 149456

upgpkg: xfce4-timer-plugin 0.6.2-1

Upstream update, Remove old patch

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

---------------+
 PKGBUILD      |   23 +++++++++--------------
 panel48.patch |   39 ---------------------------------------
 2 files changed, 9 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-08 03:17:17 UTC (rev 149455)
+++ PKGBUILD	2012-02-08 03:29:10 UTC (rev 149456)
@@ -3,35 +3,30 @@
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-timer-plugin
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.6.2
+pkgrel=1
 pkgdesc="plugin to track time for the Xfce4 panel"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 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
-	panel48.patch)
-md5sums=('ba5ae0e25f69517338f74a27fbaf4ca2'
-         'fc9444aa98d7ef9c61d97dbd9f47e082')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('688fe2dde9645bee1855e6a6c9579161')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # patch from git master
-  patch -Np1 -i ${srcdir}/panel48.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/ \
 	--localstatedir=/var \
-	--disable-static \
-	--disable-debug
+	--disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Deleted: panel48.patch
===================================================================
--- panel48.patch	2012-02-08 03:17:17 UTC (rev 149455)
+++ panel48.patch	2012-02-08 03:29:10 UTC (rev 149456)
@@ -1,39 +0,0 @@
-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