From 74cdcb0ef4a47b727da7cc0b3229d6e896e7896c Mon Sep 17 00:00:00 2001
From: Bartlomiej Palmowski <rotwang@crux.org.pl>
Date: Sun, 22 Jul 2012 15:31:54 +0200
Subject: [PATCH] obconf: use obconf from git due to 2.0.3 incompatibility with
 ob 3.5

---
 obconf/.md5sum         |  3 ++-
 obconf/Pkgfile         | 12 ++++++++----
 obconf/preview_c.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 obconf/preview_c.patch

diff --git a/obconf/.md5sum b/obconf/.md5sum
index e52a5cff7..655e05efb 100644
--- a/obconf/.md5sum
+++ b/obconf/.md5sum
@@ -1 +1,2 @@
-b22e273721851dedad72acbc77eefb68  obconf-2.0.3.tar.gz
+aab5ea712814a200f40f56e411cf88f9  obconf-git_master_cc7a18807663313.tar.xz
+ebfba423c13d1f3f5216561b3e7f73f0  preview_c.patch
diff --git a/obconf/Pkgfile b/obconf/Pkgfile
index d8242da19..33fcaaa96 100644
--- a/obconf/Pkgfile
+++ b/obconf/Pkgfile
@@ -1,17 +1,21 @@
 # Description: openbox preferences manager
-# URL:         http://openbox.org/obconf/
+# URL:         http://openbox.org/wiki/Obconf
 # Packager:    Marcin Karpezo <sirmacik@happylinux.pl>
 # Maintainer:  Bartlomiej Palmowski, rotwang at crux dot org dot pl
 # Depends on:  openbox libglade startup-notification
 
 name=obconf
-version=2.0.3
+version=git
 release=1
-source=(http://icculus.org/openbox/$name/$name-$version.tar.gz)
+source=(http://ci.crux.org.pl/userContent/$name-git_master_cc7a18807663313.tar.xz
+    preview_c.patch)
 
 build () {
-	cd $name-$version
+	cd $name
+	patch -p2 -i$SRC/preview_c.patch
+	autoreconf -f -i
 	./configure --prefix=/usr --disable-nls
 	make
 	make DESTDIR=$PKG install
 }
+
diff --git a/obconf/preview_c.patch b/obconf/preview_c.patch
new file mode 100644
index 000000000..af69cb510
--- /dev/null
+++ b/obconf/preview_c.patch
@@ -0,0 +1,41 @@
+--- a/obconf/src/preview.c
++++ b/obconf2/src/preview.c
+@@ -327,28 +327,28 @@ static GdkPixbuf* preview_window(RrTheme *theme, const gchar *titlelayout,
+             switch (*layout) {
+             case 'D':
+                 a = focus ?
+-                    theme->btn_desk->a_focused_unpressed :
+-                    theme->btn_desk->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_desk :
++                    theme->a_unfocused_unpressed_desk;
+                 break;
+             case 'S':
+                 a = focus ?
+-                    theme->btn_shade->a_focused_unpressed :
+-                    theme->btn_shade->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_shade :
++                    theme->a_unfocused_unpressed_shade;
+                 break;
+             case 'I':
+                 a = focus ?
+-                    theme->btn_iconify->a_focused_unpressed :
+-                    theme->btn_iconify->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_iconify :
++                    theme->a_unfocused_unpressed_iconify;
+                 break;
+             case 'M':
+                 a = focus ?
+-                    theme->btn_max->a_focused_unpressed :
+-                    theme->btn_max->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_max :
++                    theme->a_unfocused_unpressed_max;
+                 break;
+             case 'C':
+                 a = focus ?
+-                    theme->btn_close->a_focused_unpressed :
+-                    theme->btn_close->a_unfocused_unpressed;
++                    theme->a_focused_unpressed_close :
++                    theme->a_unfocused_unpressed_close;
+                 break;
+             default:
+                 continue;