[arch-commits] Commit in obconf/trunk (PKGBUILD config-file.patch)

[Florian Pritz]

    Date: Monday, August 12, 2013 @ 12:25:36
  Author: bluewind
Revision: 95454

upgpkg: obconf 2.0.4-1

upstream update

Modified:
  obconf/trunk/PKGBUILD
Deleted:
  obconf/trunk/config-file.patch

-------------------+
 PKGBUILD          |   13 +++++--------
 config-file.patch |   28 ----------------------------
 2 files changed, 5 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-12 10:18:33 UTC (rev 95453)
+++ PKGBUILD	2013-08-12 10:25:36 UTC (rev 95454)
@@ -5,24 +5,21 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=obconf
-pkgver=2.0.3.git20100309
-pkgrel=3
+pkgver=2.0.4
+pkgrel=1
 pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager"
 arch=('i686' 'x86_64')
 url="http://openbox.org/wiki/ObConf:About"
 license=('GPL')
 depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'config-file.patch')
-md5sums=('d45a1eab18aa25c18280821118368b97'
-         '51f5f110f8bc4a89dfb460c3dd4a3be8')
+source=("http://openbox.org/dist/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('9271c5d2dc366d61f73665a5e8bceabc')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/config-file.patch
 
-  ./bootstrap
+  #./bootstrap
   ./configure --prefix=/usr
   make
 }

Deleted: config-file.patch
===================================================================
--- config-file.patch	2013-08-12 10:18:33 UTC (rev 95453)
+++ config-file.patch	2013-08-12 10:25:36 UTC (rev 95454)
@@ -1,28 +0,0 @@
-From: Dana Jansens <danakj at orodu.net>
-Date: Fri, 5 Aug 2011 16:05:10 +0000 (-0400)
-Subject: Load the rc.xml config file given on --config-file the same as Openbox (use the whole ...
-X-Git-Url: http://git.openbox.org/?p=dana%2Fobconf.git;a=commitdiff_plain;h=cc7a18807663313ef111d86a75844ded0416a889
-
-Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given).
----
-
-diff --git a/src/main.c b/src/main.c
-index 9035e8d..a576253 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -233,11 +233,10 @@ int main(int argc, char **argv)
-     }
- 
-     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;