cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge upstream fix for config path handling bug for obconf invoked with

Browse Source 
--config-file argument.

Reported by:		Tom Abate Jr. <tom.abate@comcast.net>
Obtained from:		obconf git repository
This commit is contained in:
Roman Bogorodskiy 2011-09-24 01:06:01 +00:00
parent 0d1b6f4bb8
commit 72714a886a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=282289
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-wm/obconf/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= obconf
PORTVERSION= 2.0.3
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= x11-wm
MASTER_SITES= http://openbox.org/dist/obconf/

18
x11-wm/obconf/files/patch-src-main.c Normal file
View File

@ -0,0 +1,18 @@
--- src/main.c.orig
+++ 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;