From a831eede3f42c8f511b4c599960baa34c3c4b49a Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Mon, 12 Aug 2013 09:41:21 +0200 Subject: [PATCH] obconf: update to 2.0.4. --- srcpkgs/obconf/patches/config-file.patch | 28 ------------------------ srcpkgs/obconf/template | 23 +++++-------------- 2 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/obconf/patches/config-file.patch diff --git a/srcpkgs/obconf/patches/config-file.patch b/srcpkgs/obconf/patches/config-file.patch deleted file mode 100644 index cdfe23d2f2..0000000000 --- a/srcpkgs/obconf/patches/config-file.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Dana Jansens <danakj@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 ---- src/main.c -+++ 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; diff --git a/srcpkgs/obconf/template b/srcpkgs/obconf/template index 28f4048ec4..d2f9ef5e56 100644 --- a/srcpkgs/obconf/template +++ b/srcpkgs/obconf/template @@ -1,32 +1,21 @@ # Template file for 'obconf' pkgname=obconf -version=2.0.3.git20100309 -revision=2 +version=2.0.4 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config automake libtool gettext-devel bsdtar" +hostmakedepends="pkg-config" makedepends="gtk+-devel libglade-devel libSM-devel imlib2-devel openbox-devel>=3.5.2 startup-notification-devel desktop-file-utils shared-mime-info" short_desc="A GTK2 based configuration tool for the Openbox windowmanager" maintainer="Juan RP <xtraeme@gmail.com>" license="GPL-2" homepage="http://openbox.org/wiki/ObConf:About" -distfiles="ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=54328d05c52e62a90661d99b65038c57f852a474679339614896d7c94599948d - -noextract=yes - -do_extract() { - # WTF .tar.gz extension and is bzip2 compressed. - bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}.tar.gz -C ${XBPS_BUILDDIR} -} - -pre_configure() { - ./bootstrap -} +distfiles="http://openbox.org/dist/obconf/obconf-${version}.tar.gz" +checksum=71a3e5f4ee246a27421ba85044f09d449f8de22680944ece9c471cd46a9356b9 obconf_package() { depends="desktop-file-utils shared-mime-info" pkg_install() { - vmove usr + vmove all } }