diff options
-rw-r--r-- | desktop/obconf/obconf.SlackBuild | 9 | ||||
-rw-r--r-- | desktop/obconf/obconf.info | 6 | ||||
-rw-r--r-- | desktop/obconf/obconf_git_preview.patch | 43 |
3 files changed, 5 insertions, 53 deletions
diff --git a/desktop/obconf/obconf.SlackBuild b/desktop/obconf/obconf.SlackBuild index e64378486017f..6f1a319d74812 100644 --- a/desktop/obconf/obconf.SlackBuild +++ b/desktop/obconf/obconf.SlackBuild @@ -25,7 +25,7 @@ # Currently maintained by Robby Workman <rw@rlworkman.net> PRGNAM=obconf -VERSION=git_85e3e6ef +VERSION=${VERSION:-2.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,7 +64,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -73,11 +73,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Include a patch by Andrew Rowland to fix build errors: -patch -p1 < $CWD/obconf_git_preview.patch - -./bootstrap - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/obconf/obconf.info b/desktop/obconf/obconf.info index 66a5960573e6b..c6aa4f7f56636 100644 --- a/desktop/obconf/obconf.info +++ b/desktop/obconf/obconf.info @@ -1,8 +1,8 @@ PRGNAM="obconf" -VERSION="git_85e3e6ef" +VERSION="2.0.4" HOMEPAGE="http://openbox.org/wiki/ObConf:About" -DOWNLOAD="ftp://harrier.slackbuilds.org/misc/obconf-git_85e3e6ef.tar.xz" -MD5SUM="f1dff81386c1c3910db1aa4b4ca7f814" +DOWNLOAD="http://openbox.org/dist/obconf/obconf-2.0.4.tar.gz" +MD5SUM="9271c5d2dc366d61f73665a5e8bceabc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="openbox" diff --git a/desktop/obconf/obconf_git_preview.patch b/desktop/obconf/obconf_git_preview.patch deleted file mode 100644 index 3eec5f671c61e..0000000000000 --- a/desktop/obconf/obconf_git_preview.patch +++ /dev/null @@ -1,43 +0,0 @@ -Patch by Andrew Rowland <darowland@ieee.org> - ---- obconf-orig/src/preview.c 2012-01-13 15:51:59.000000000 -0500 -+++ obconf/src/preview.c 2012-01-13 15:53:39.000000000 -0500 -@@ -327,28 +327,28 @@ - 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; |