* [gentoo-commits] dev/hwoarang:master commit in: x11-misc/obconf/files/, x11-misc/obconf/
@ 2011-06-17 21:17 Markos Chandras
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras @ 2011-06-17 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 0794d8ee887b9bf919a21e90d7c6f04cd39f583a
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 21:16:13 2011 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 21:16:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=0794d8ee
First attemp to make obconf compatible with LXDE ;)
---
x11-misc/obconf/Manifest | 3 +
.../files/obconf-2.0.3_p20110314-config-path.patch | 14 +++++
x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild | 60 ++++++++++++++++++++
3 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
new file mode 100644
index 0000000..23c7dc9
--- /dev/null
+++ b/x11-misc/obconf/Manifest
@@ -0,0 +1,3 @@
+AUX obconf-2.0.3_p20110314-config-path.patch 512 RMD160 d57184f08fcdd67ada28e918a5ab321b5503ffc8 SHA1 ad5f8eb9900606de45b57eddfe46994467ec271c SHA256 d4e17234a29e133ac6cecc63cd56fb26e494ecd544ab12c0069dda1ab6e49f0b
+DIST obconf-2.0.3_p20110314.tar.gz 109522 RMD160 95e41bd1d4004f9860644a6dbae9d21dcaa44f8a SHA1 5732647bbc78f3cf24741c340446176f98514a2a SHA256 3de18f493bcb05e95a8e26fb6cc4fb195932c742f22093240311b127d6114554
+EBUILD obconf-2.0.3_p20110314-r1.ebuild 1522 RMD160 2318052e827d8a13d0c8536957f14aab042fb582 SHA1 31538877d6e0e4a98390b1b48732521a826cff4d SHA256 05e79f761845e81964e51366eaee3294baf9ef3734bf187b6d422b544ea7d0fc
diff --git a/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch b/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
new file mode 100644
index 0000000..cc98160
--- /dev/null
+++ b/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
@@ -0,0 +1,14 @@
+Index: work/src/tree.c
+===================================================================
+--- work.orig/src/tree.c
++++ work/src/tree.c
+@@ -91,7 +91,8 @@ void tree_apply()
+ gboolean err;
+
+ if (obc_config_file)
+- p = g_strdup(obc_config_file);
++ p = g_build_filename(obt_paths_config_home(paths), "openbox",
++ obc_config_file, NULL);
+ else
+ p = g_build_filename(obt_paths_config_home(paths), "openbox",
+ "rc.xml", NULL);
diff --git a/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild b/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
new file mode 100644
index 0000000..2a53711
--- /dev/null
+++ b/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild,v 1.7 2011/06/17 17:37:18 hwoarang Exp $
+
+EAPI=2
+inherit autotools fdo-mime eutils
+
+DESCRIPTION="ObConf is a tool for configuring the Openbox window manager."
+HOMEPAGE="http://icculus.org/openbox/index.php/ObConf:About"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lxde nls"
+
+RDEPEND="gnome-base/libglade:2.0
+ x11-libs/gtk+:2
+ x11-libs/startup-notification
+ >=x11-wm/openbox-3.5.0_pre20110313"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}
+
+src_prepare() {
+ # need --config-file switch when used on LXDE environment
+ if use lxde; then
+ sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
+ fi
+ # Make sure the correct path is appended to the config file
+ epatch "${FILESDIR}"/${P}-config-path.patch
+ eautopoint
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ # add wrapper for lxde environment. Bug #369555
+ if use lxde; then
+ dobin ${FILESDIR}/${PN}-lxde || die
+ fi
+ dodoc AUTHORS CHANGELOG README || die "dodoc failed"
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/hwoarang:master commit in: x11-misc/obconf/files/, x11-misc/obconf/
@ 2011-06-18 10:19 Markos Chandras
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras @ 2011-06-18 10:19 UTC (permalink / raw
To: gentoo-commits
commit: 144476b651f16bf8893e2980c576fd4cf0d85aad
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 10:18:09 2011 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 10:18:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=144476b6
Add missing patch
---
x11-misc/obconf/Manifest | 1 +
x11-misc/obconf/files/obconf-lxde | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 23c7dc9..d6ab485 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,3 +1,4 @@
AUX obconf-2.0.3_p20110314-config-path.patch 512 RMD160 d57184f08fcdd67ada28e918a5ab321b5503ffc8 SHA1 ad5f8eb9900606de45b57eddfe46994467ec271c SHA256 d4e17234a29e133ac6cecc63cd56fb26e494ecd544ab12c0069dda1ab6e49f0b
+AUX obconf-lxde 65 RMD160 55efc54f0330401ba162218161862c23d43f9bf0 SHA1 4fb55d21b39081857e6511dc78d030a32ed3f5a0 SHA256 1aabcf2066aabbfa052672979504d3eb99b56b9e5bcc959f07dca308bfe9ef2d
DIST obconf-2.0.3_p20110314.tar.gz 109522 RMD160 95e41bd1d4004f9860644a6dbae9d21dcaa44f8a SHA1 5732647bbc78f3cf24741c340446176f98514a2a SHA256 3de18f493bcb05e95a8e26fb6cc4fb195932c742f22093240311b127d6114554
EBUILD obconf-2.0.3_p20110314-r1.ebuild 1522 RMD160 2318052e827d8a13d0c8536957f14aab042fb582 SHA1 31538877d6e0e4a98390b1b48732521a826cff4d SHA256 05e79f761845e81964e51366eaee3294baf9ef3734bf187b6d422b544ea7d0fc
diff --git a/x11-misc/obconf/files/obconf-lxde b/x11-misc/obconf/files/obconf-lxde
new file mode 100644
index 0000000..949f54c
--- /dev/null
+++ b/x11-misc/obconf/files/obconf-lxde
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Gentoo bug: 369555
+obconf --config-file lxde-rc.xml
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/hwoarang:master commit in: x11-misc/obconf/files/, x11-misc/obconf/
@ 2011-06-18 10:47 Markos Chandras
0 siblings, 0 replies; 3+ messages in thread
From: Markos Chandras @ 2011-06-18 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 24e7a629952e8d879c2441d1e7229c63d80e59d0
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 10:45:43 2011 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 10:45:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=24e7a629
moved to gx86
---
x11-misc/obconf/Manifest | 4 -
.../files/obconf-2.0.3_p20110314-config-path.patch | 14 -----
x11-misc/obconf/files/obconf-lxde | 3 -
x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild | 60 --------------------
4 files changed, 0 insertions(+), 81 deletions(-)
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
deleted file mode 100644
index d6ab485..0000000
--- a/x11-misc/obconf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX obconf-2.0.3_p20110314-config-path.patch 512 RMD160 d57184f08fcdd67ada28e918a5ab321b5503ffc8 SHA1 ad5f8eb9900606de45b57eddfe46994467ec271c SHA256 d4e17234a29e133ac6cecc63cd56fb26e494ecd544ab12c0069dda1ab6e49f0b
-AUX obconf-lxde 65 RMD160 55efc54f0330401ba162218161862c23d43f9bf0 SHA1 4fb55d21b39081857e6511dc78d030a32ed3f5a0 SHA256 1aabcf2066aabbfa052672979504d3eb99b56b9e5bcc959f07dca308bfe9ef2d
-DIST obconf-2.0.3_p20110314.tar.gz 109522 RMD160 95e41bd1d4004f9860644a6dbae9d21dcaa44f8a SHA1 5732647bbc78f3cf24741c340446176f98514a2a SHA256 3de18f493bcb05e95a8e26fb6cc4fb195932c742f22093240311b127d6114554
-EBUILD obconf-2.0.3_p20110314-r1.ebuild 1522 RMD160 2318052e827d8a13d0c8536957f14aab042fb582 SHA1 31538877d6e0e4a98390b1b48732521a826cff4d SHA256 05e79f761845e81964e51366eaee3294baf9ef3734bf187b6d422b544ea7d0fc
diff --git a/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch b/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
deleted file mode 100644
index cc98160..0000000
--- a/x11-misc/obconf/files/obconf-2.0.3_p20110314-config-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: work/src/tree.c
-===================================================================
---- work.orig/src/tree.c
-+++ work/src/tree.c
-@@ -91,7 +91,8 @@ void tree_apply()
- gboolean err;
-
- if (obc_config_file)
-- p = g_strdup(obc_config_file);
-+ p = g_build_filename(obt_paths_config_home(paths), "openbox",
-+ obc_config_file, NULL);
- else
- p = g_build_filename(obt_paths_config_home(paths), "openbox",
- "rc.xml", NULL);
diff --git a/x11-misc/obconf/files/obconf-lxde b/x11-misc/obconf/files/obconf-lxde
deleted file mode 100644
index 949f54c..0000000
--- a/x11-misc/obconf/files/obconf-lxde
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# Gentoo bug: 369555
-obconf --config-file lxde-rc.xml
diff --git a/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild b/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
deleted file mode 100644
index 2a53711..0000000
--- a/x11-misc/obconf/obconf-2.0.3_p20110314-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/obconf/obconf-2.0.3_p20110314.ebuild,v 1.7 2011/06/17 17:37:18 hwoarang Exp $
-
-EAPI=2
-inherit autotools fdo-mime eutils
-
-DESCRIPTION="ObConf is a tool for configuring the Openbox window manager."
-HOMEPAGE="http://icculus.org/openbox/index.php/ObConf:About"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="lxde nls"
-
-RDEPEND="gnome-base/libglade:2.0
- x11-libs/gtk+:2
- x11-libs/startup-notification
- >=x11-wm/openbox-3.5.0_pre20110313"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}
-
-src_prepare() {
- # need --config-file switch when used on LXDE environment
- if use lxde; then
- sed -i -e "/^Exec/s:obconf.*$:obconf-lxde:" ${PN}.desktop || die
- fi
- # Make sure the correct path is appended to the config file
- epatch "${FILESDIR}"/${P}-config-path.patch
- eautopoint
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable nls)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- # add wrapper for lxde environment. Bug #369555
- if use lxde; then
- dobin ${FILESDIR}/${PN}-lxde || die
- fi
- dodoc AUTHORS CHANGELOG README || die "dodoc failed"
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-18 10:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-18 10:19 [gentoo-commits] dev/hwoarang:master commit in: x11-misc/obconf/files/, x11-misc/obconf/ Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2011-06-18 10:47 Markos Chandras
2011-06-17 21:17 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox