[arch-commits] Commit in xfce4-smartbookmark-plugin/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, January 29, 2011 @ 08:18:03
  Author: andyrtr
Revision: 108103

upgpkg: xfce4-smartbookmark-plugin 0.4.2-9
add a fix for panel 4.8 from xfce bugtracker

Added:
  xfce4-smartbookmark-plugin/trunk/0001-Fix-problems-with-plugin-and-4.8-panel.patch
Modified:
  xfce4-smartbookmark-plugin/trunk/PKGBUILD
Deleted:
  xfce4-smartbookmark-plugin/trunk/xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch

-----------------------------------------------------+
 0001-Fix-problems-with-plugin-and-4.8-panel.patch   |   37 ++++++++++++++++++
 PKGBUILD                                            |   17 ++++----
 xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch |   12 -----
 3 files changed, 46 insertions(+), 20 deletions(-)

Added: 0001-Fix-problems-with-plugin-and-4.8-panel.patch
===================================================================
--- 0001-Fix-problems-with-plugin-and-4.8-panel.patch	                        (rev 0)
+++ 0001-Fix-problems-with-plugin-and-4.8-panel.patch	2011-01-29 13:18:03 UTC (rev 108103)
@@ -0,0 +1,37 @@
+From b1922538b26f9929bcd43df8728bf33afe06fbef Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Thu, 27 Jan 2011 22:29:16 +0100
+Subject: [PATCH] Fix problems with plugin and 4.8 panel.
+
+---
+ configure.ac                    |    2 +-
+ src/smartbookmark.desktop.in.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1ba88d4..cb344f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW])
+ dnl Check for required packages
+ XDT_CHECK_LIBX11_REQUIRE()
+ XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2])
++XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20])
+ 
+ XDT_FEATURE_DEBUG()
+diff --git a/src/smartbookmark.desktop.in.in b/src/smartbookmark.desktop.in.in
+index 83464ff..7bafece 100644
+--- a/src/smartbookmark.desktop.in.in
++++ b/src/smartbookmark.desktop.in.in
+@@ -4,5 +4,5 @@ Encoding=UTF-8
+ _Name=SmartBookmark
+ _Comment=Query websites from the Xfce panel
+ Icon=gtk-preferences
+-X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
++X-XFCE-Module=smartbookmark
+ X-XFCE-Unique=false
+-- 
+1.7.3.5
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-29 13:17:22 UTC (rev 108102)
+++ PKGBUILD	2011-01-29 13:18:03 UTC (rev 108103)
@@ -11,20 +11,21 @@
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
-makedepends=('intltool' 'libxt')
+makedepends=('intltool' 'libxt' 'xfce4-dev-tools')
 options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.gz
-	xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch
-	xfce4-smartbookmark-plugin-archlinux.patch)
+	xfce4-smartbookmark-plugin-archlinux.patch
+	0001-Fix-problems-with-plugin-and-4.8-panel.patch)
 md5sums=('284e26595637dd2e900b75534372496b'
-         'ca6ecc8ff90cc13ef81d6412978dfac7'
-         '323ac898cfcfdb078f67f9ecd1905aec')
+         '323ac898cfcfdb078f67f9ecd1905aec'
+         '6dc220fc41cd21678aad62c80a4c622f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  # fix path, taken from Fedora
-  patch -Np0 -i ${srcdir}/xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch || return 1
-  patch -Np0 -i ${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch || return 1
+  # fix panel4.8  http://bugzilla.xfce.org/show_bug.cgi
+  patch -Np1 -i ${srcdir}/0001-Fix-problems-with-plugin-and-4.8-panel.patch
+  patch -Np0 -i ${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch
+  xdt-autogen
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \

Deleted: xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch
===================================================================
--- xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch	2011-01-29 13:17:22 UTC (rev 108102)
+++ xfce4-smartbookmark-plugin-0.4.2-desktop-file.patch	2011-01-29 13:18:03 UTC (rev 108103)
@@ -1,12 +0,0 @@
---- src/smartbookmark.desktop.in.in.orig	2009-07-04 00:28:14.000000000 +0200
-+++ src/smartbookmark.desktop.in.in	2009-07-04 00:34:09.000000000 +0200
-@@ -3,6 +3,7 @@
- Encoding=UTF-8
- _Name=SmartBookmark
- _Comment=Query websites from the Xfce panel
--Icon=gtk-preferences
--X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so
-+Icon=gtk-find
-+X-XFCE-Module=smartbookmark
-+X-XFCE-Module-Path=@INTERNAL_PLUGIN_PATH@
- X-XFCE-Unique=false