[csw-devel] SF.net SVN: gar:[10403] csw/mgar/pkg/openbox/trunk

[theferret at users.sourceforge.net]

Revision: 10403
          http://gar.svn.sourceforge.net/gar/?rev=10403&view=rev
Author:   theferret
Date:     2010-07-02 18:03:22 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
openbox: added patch to remove /usr/share, and tweaked README a bit

Modified Paths:
--------------
    csw/mgar/pkg/openbox/trunk/README
    csw/mgar/pkg/openbox/trunk/patchfile.preconf

Modified: csw/mgar/pkg/openbox/trunk/README
===================================================================
--- csw/mgar/pkg/openbox/trunk/README	2010-07-02 08:10:46 UTC (rev 10402)
+++ csw/mgar/pkg/openbox/trunk/README	2010-07-02 18:03:22 UTC (rev 10403)
@@ -1,20 +1,19 @@
+Random notes for compilation and patching...
+
 This compile  is a bit odd.
 It is "intelligent" and adds -I/usr/openwin/include, but that actually
-breaks us.
-make sure to REMOVE it.
+breaks us. make sure to REMOVE it.
+ Turns out we can deal with it by setting X_CFLAGS on config line.
 
-it also "helpfully" adds a buncha junk such as -L /usr/openwin/lib.
-kill it
-
-
 Note that this package will benefit by having "obconf", and
 "openbox_themes" installed as well
 
-
-
 This thing passes in defines on the COMMAND LINE  (-Dxxx) 
 instead of having a civilized config.h file
 
 
+The "ShapeInput" ifdefs, are inspired by sawfish ifdefs that I saw.
 
-the "ShapeInput" ifdefs, are inspired by sawfish ifdefs that I saw.
+See also
+http://openbox.org/wiki/Help:Contents#Cool_programs_to_run_with_Openbox
+

Modified: csw/mgar/pkg/openbox/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/openbox/trunk/patchfile.preconf	2010-07-02 08:10:46 UTC (rev 10402)
+++ csw/mgar/pkg/openbox/trunk/patchfile.preconf	2010-07-02 18:03:22 UTC (rev 10403)
@@ -88,3 +88,23 @@
  
          g_free(program);
          g_strfreev(argv);
+--- parser/parse.c.orig	Fri Jul  2 19:59:36 2010
++++ parser/parse.c	Fri Jul  2 20:00:14 2010
+@@ -429,16 +429,7 @@
+         xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+                                             g_strdup(DATADIR),
+                                             (GSListFunc) g_slist_append);
+-        xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+-                                            g_build_filename
+-                                            (G_DIR_SEPARATOR_S,
+-                                             "usr", "local", "share", NULL),
+-                                            (GSListFunc) g_slist_append);
+-        xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+-                                            g_build_filename
+-                                            (G_DIR_SEPARATOR_S,
+-                                             "usr", "share", NULL),
+-                                            (GSListFunc) g_slist_append);
++	/* opencsw: removed /usr/share hardcodes. badbadbad */
+     }
+     xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+                                         g_strdup(xdg_data_home_path),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.