Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3a957d7c2119eedace0f05c8023bc1fc98346467
commit 3a957d7c2119eedace0f05c8023bc1fc98346467 Author: Pingax <pin...@frugalware.fr> Date: Tue Oct 25 14:17:35 2011 +0200 obconf-20100212-1-i686 * Fixed build with openbox-3.5.0 * Thanks bouleetbil \o/ diff --git a/source/xlib/obconf/FrugalBuild b/source/xlib/obconf/FrugalBuild index d3e01b0..b0bdb8a 100644 --- a/source/xlib/obconf/FrugalBuild +++ b/source/xlib/obconf/FrugalBuild @@ -3,17 +3,18 @@ # Maintainer: Pingax <pin...@frugalware.fr> pkgname=obconf -pkgver=2.0.3 -pkgrel=5 +pkgver=20100212 +pkgrel=1 pkgdesc="OpenBox's Configuration utility." url="http://icculus.org/openbox"; -depends=('libxml2>=2.7.8' 'openbox>=3.4.11.1-2' 'gtk+2>=2.20.0-2' 'libglade>=2.6.4-3') +depends=('libxml2>=2.7.8' 'openbox>=3.5.0-1' 'gtk+2>=2.20.0-2' 'libglade>=2.6.4-3') groups=('xlib') archs=('i686' 'x86_64' 'arm') options=('scriptlet') -up2date="lynx -dump $url/$pkgname | Flasttar" -source=($url/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('40c22a2b0e884016592558b9119afcafcac674ec') +up2date="Flasttar http://ftp.frugalware.org/pub/other/people/pingax/snapshots/$pkgname/"; +source=("http://ftp.frugalware.org/pub/other/people/pingax/snapshots/$pkgname/$pkgname-$pkgver.tar.gz"; config-file.patch) +sha1sums=('9e9343f60375dfdd255c634ef9b4978ca5622299' \ + '86e419a833040f9d912b01cafafd92d941d9d964') _F_gnome_mime=1 _F_gnome_desktop=1 Finclude gnome-scriptlet @@ -21,4 +22,13 @@ Finclude gnome-scriptlet conflicts=('firebox-tools') replaces=('firebox-tools') +_F_cd_path=$pkgname + +build() +{ + Fcd + ./bootstrap + Fbuild --prefix=/usr || Fdie +} + # optimization OK diff --git a/source/xlib/obconf/config-file.patch b/source/xlib/obconf/config-file.patch new file mode 100644 index 0000000..ec1d50f --- /dev/null +++ b/source/xlib/obconf/config-file.patch @@ -0,0 +1,18 @@ +--- src/main.c.orig 2011-10-25 14:09:57.161042945 +0200 ++++ src/main.c 2011-10-25 14:14:21.961042330 +0200 +@@ -233,11 +233,10 @@ + } + + xmlIndentTreeOutput = 1; +- if (!obt_xml_load_config_file(parse_i, +- "openbox", +- (obc_config_file ? +- obc_config_file : "rc.xml"), +- "openbox_config")) ++ if (!((obc_config_file && ++ obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) || ++ obt_xml_load_config_file(parse_i, "openbox", "rc.xml", ++ "openbox_config"))) + { + obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE); + exit_with_error = TRUE; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
