desktop/obconf: Updated to git snapshot cc7a188076, new maintainer.

Added patch to fix functionality with openbox-3.5.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>
This commit is contained in:
Robby Workman 2012-02-19 11:53:10 -06:00 committed by Robby Workman
parent 49ecdd0898
commit bdb3f8e316
5 changed files with 67 additions and 18 deletions

View file

@ -1,4 +1,4 @@
ObConf is a GTK+ tool to assist with the configuration of the ObConf is a GTK+ tool to assist with the configuration of the
Openbox window manager. Openbox window manager.
Requires Openbox, which is available on SlackBuilds.org. This requires openbox.

View file

@ -22,9 +22,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Currently maintained by Robby Workman <rw@rlworkman.net>
PRGNAM=obconf PRGNAM=obconf
VERSION=2.0.3 VERSION=git_cc7a188076
BUILD=${BUILD:-2} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on: # Automatically determine the architecture we're building on:
@ -42,7 +44,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp} OUTPUT=${OUTPUT:-/tmp}
DOCS="ABOUT-NLS AUTHORS CHANGELOG COPYING README" DOCS="AUTHORS CHANGELOG COPYING NEWS README TODO"
if [ "$ARCH" = "i486" ]; then if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@ -64,7 +66,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT mkdir -p $TMP $PKG $OUTPUT
cd $TMP cd $TMP
rm -rf $PRGNAM-$VERSION rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION cd $PRGNAM-$VERSION
chown -R root:root . chown -R root:root .
find . \ find . \
@ -73,13 +75,17 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \; -exec chmod 644 {} \;
# Include a patch by Andrew Rowland to fix build errors:
patch -p1 < $CWD/obconf_git_preview.patch
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var --localstatedir=/var \
--build=$ARCH-slackware-linux
make make
make install DESTDIR=$PKG make install DESTDIR=$PKG

View file

@ -1,10 +1,10 @@
PRGNAM="obconf" PRGNAM="obconf"
VERSION="2.0.3" VERSION="git_cc7a188076"
HOMEPAGE="http://icculus.org/openbox/index.php/ObConf:About" HOMEPAGE="http://openbox.org/wiki/ObConf:About"
DOWNLOAD="http://icculus.org/openbox/obconf/obconf-2.0.3.tar.gz" DOWNLOAD="ftp://harrier.slackbuilds.org/misc/obconf-git_cc7a188076.tar.xz"
MD5SUM="b22e273721851dedad72acbc77eefb68" MD5SUM="6423cc63186a386abbd14a221e830f30"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
MAINTAINER="Chess Griffin" MAINTAINER="Robby Workman"
EMAIL="chess@chessgriffin.com" EMAIL="rw@rlworkman.net"
APPROVED="dsomero" APPROVED="Erik Hanson"

View file

@ -0,0 +1,43 @@
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;

View file

@ -1,9 +1,9 @@
# HOW TO EDIT THIS FILE: # HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line # The "handy ruler" below makes it easier to edit a package description.
# up the first '|' above the ':' following the base package name, and the '|' # Line up the first '|' above the ':' following the base package name, and
# on the right side marks the last column you can put a character in. You must # the '|' on the right side marks the last column you can put a character in.
# make exactly 11 lines for the formatting to be correct. It's also # You must make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'. # customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------| |-----handy-ruler------------------------------------------------------|
obconf: ObConf (Openbox preferences manager) obconf: ObConf (Openbox preferences manager)