[arch-commits] Commit in lxappearance-obconf/trunk (PKGBUILD obconf-rrbutton.patch)

[Balló György]

    Date: Tuesday, September 3, 2013 @ 03:00:07
  Author: bgyorgy
Revision: 96675

upgpkg: lxappearance-obconf 0.2.0-2

Fix building with openbox-3.5.2

Added:
  lxappearance-obconf/trunk/obconf-rrbutton.patch
Modified:
  lxappearance-obconf/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   18 +++++++++++++----
 obconf-rrbutton.patch |   49 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-02 21:31:14 UTC (rev 96674)
+++ PKGBUILD	2013-09-03 01:00:07 UTC (rev 96675)
@@ -3,7 +3,7 @@
 
 pkgname=lxappearance-obconf
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A plugin for LXAppearance to configure Openbox'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -11,12 +11,22 @@
 groups=('lxde')
 depends=('lxappearance' 'openbox')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz)
-md5sums=('8bf23c90febe6a655e0f86c80e44725d')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
+        obconf-rrbutton.patch)
+md5sums=('8bf23c90febe6a655e0f86c80e44725d'
+         '73cd418ff8dc68a76538fc829d6260c7')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+
+  # Fix building with openbox-3.5.2
+  patch -Np1 -i ../obconf-rrbutton.patch
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 

Added: obconf-rrbutton.patch
===================================================================
--- obconf-rrbutton.patch	                        (rev 0)
+++ obconf-rrbutton.patch	2013-09-03 01:00:07 UTC (rev 96675)
@@ -0,0 +1,49 @@
+commit 9cffa6a9ddfc4074f3de8d0302404d70c2818d8f
+Author: Markos Chandras <hwoarang at gentoo.org>
+Date:   Fri Aug 5 16:24:57 2011 +0100
+
+    Use new RrButton structure
+
+diff --git a/src/preview.c b/src/preview.c
+index a82cf15..320e7ac 100644
+--- a/src/preview.c
++++ b/src/preview.c
+@@ -327,28 +327,28 @@ static GdkPixbuf* preview_window(RrTheme *theme, const gchar *titlelayout,
+             switch (*layout) {
+             case 'D':
+                 a = focus ?
+-                    theme->a_focused_unpressed_desk :
+-                    theme->a_unfocused_unpressed_desk;
++                    theme->btn_desk->a_focused_unpressed :
++                    theme->btn_desk->a_unfocused_unpressed;
+                 break;
+             case 'S':
+                 a = focus ?
+-                    theme->a_focused_unpressed_shade :
+-                    theme->a_unfocused_unpressed_shade;
++                    theme->btn_shade->a_focused_unpressed :
++                    theme->btn_shade->a_unfocused_unpressed;
+                 break;
+             case 'I':
+                 a = focus ?
+-                    theme->a_focused_unpressed_iconify :
+-                    theme->a_unfocused_unpressed_iconify;
++                    theme->btn_iconify->a_focused_unpressed :
++                    theme->btn_iconify->a_unfocused_unpressed;
+                 break;
+             case 'M':
+                 a = focus ?
+-                    theme->a_focused_unpressed_max :
+-                    theme->a_unfocused_unpressed_max;
++                    theme->btn_max->a_focused_unpressed :
++                    theme->btn_max->a_unfocused_unpressed;
+                 break;
+             case 'C':
+                 a = focus ?
+-                    theme->a_focused_unpressed_close :
+-                    theme->a_unfocused_unpressed_close;
++                    theme->btn_close->a_focused_unpressed :
++                    theme->btn_close->a_unfocused_unpressed;
+                 break;
+             default:
+                 continue;