[csw-devel] SF.net SVN: gar:[18054] csw/mgar/pkg/openbox/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sat May 19 23:17:00 CEST 2012
Revision: 18054
http://gar.svn.sourceforge.net/gar/?rev=18054&view=rev
Author: wahwah
Date: 2012-05-19 21:17:00 +0000 (Sat, 19 May 2012)
Log Message:
-----------
openbox/trunk: package split
Modified Paths:
--------------
csw/mgar/pkg/openbox/trunk/Makefile
csw/mgar/pkg/openbox/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/openbox/trunk/files/patchfile.preconf
Modified: csw/mgar/pkg/openbox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openbox/trunk/Makefile 2012-05-19 19:38:34 UTC (rev 18053)
+++ csw/mgar/pkg/openbox/trunk/Makefile 2012-05-19 21:17:00 UTC (rev 18054)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = openbox
-VERSION = 3.5.0
+VERSION = 3.4.11.2
GARTYPE = v2
CATEGORIES = apps
@@ -16,6 +16,64 @@
MASTER_SITES = http://openbox.org/dist/openbox/
DISTFILES = $(DISTNAME).tar.gz
+PATCHFILES = patchfile.preconf
+
+EXTRA_INC = /usr/X11/include
+
CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += LIBS=-lsocket
+CONFIGURE_ARGS += X_CFLAGS=-I/opt/csw/include
+CONFIGURE_ARGS += --enable-static=no
+PACKAGES += CSWlibobparser21
+PKGFILES_CSWlibobparser21 += $(call baseisadirs,$(libdir),libobparser\.so\.21(\.\d+)*)
+SPKG_DESC_CSWlibobparser21 += $(DESCRIPTION), libobparser.so.21
+
+PACKAGES += CSWlibobrender21
+PKGFILES_CSWlibobrender21 += $(call baseisadirs,$(libdir),libobrender\.so\.21(\.\d+)*)
+SPKG_DESC_CSWlibobrender21 += $(DESCRIPTION), libobrender.so.21
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibobparser21
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWpango
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibobrender21 += CSWfconfig
+RUNTIME_DEP_PKGS_CSWlibobparser21 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibobparser21 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibobparser21 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibobparser21 += CSWlibxml2-2
+
+PACKAGES += CSWopenbox-dev
+SPKG_DESC_CSWopenbox-dev += $(DESCRIPTION), development files
+PKGFILES_CSWopenbox-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWopenbox-dev += CSWlibobparser21
+RUNTIME_DEP_PKGS_CSWopenbox-dev += CSWlibobrender21
+
+# Catch-all package
+PACKAGES += CSWopenbox
+SPKG_DESC_CSWopenbox = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWopenbox += CSWfconfig
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibobparser21
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibobrender21
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibxft2
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWopenbox += CSWlibxrender
+RUNTIME_DEP_PKGS_CSWopenbox += CSWpango
+RUNTIME_DEP_PKGS_CSWopenbox += CSWstartupnotif
+
+CHECKPKG_OVERRIDES_CSWopenbox += file-with-bad-content|/usr/share|root/opt/csw/share/doc/openbox/CHANGELOG
+
include gar/category.mk
Modified: csw/mgar/pkg/openbox/trunk/checksums
===================================================================
--- csw/mgar/pkg/openbox/trunk/checksums 2012-05-19 19:38:34 UTC (rev 18053)
+++ csw/mgar/pkg/openbox/trunk/checksums 2012-05-19 21:17:00 UTC (rev 18054)
@@ -1 +1 @@
-00441b53cf14c03566c8e82643544ff9 openbox-3.5.0.tar.gz
+30e669134fa81df810fe7d1dc59cd931 openbox-3.4.11.2.tar.gz
Copied: csw/mgar/pkg/openbox/trunk/files/patchfile.preconf (from rev 18049, csw/mgar/pkg/openbox-old/tags/manual/patchfile.preconf)
===================================================================
--- csw/mgar/pkg/openbox/trunk/files/patchfile.preconf (rev 0)
+++ csw/mgar/pkg/openbox/trunk/files/patchfile.preconf 2012-05-19 21:17:00 UTC (rev 18054)
@@ -0,0 +1,118 @@
+--- a/openbox/event.c.orig Tue Jun 22 00:02:57 2010
++++ a/openbox/event.c Tue Jun 22 00:12:38 2010
+@@ -1593,10 +1593,12 @@
+ client->shaped = ((XShapeEvent*)e)->shaped;
+ kind = ShapeBounding;
+ break;
++#ifdef ShapeInput
+ case ShapeInput:
+ client->shaped_input = ((XShapeEvent*)e)->shaped;
+ kind = ShapeInput;
+ break;
++#endif
+ }
+ frame_adjust_shape_kind(client->frame, kind);
+ }
+--- a/openbox/openbox.c.orig Fri May 14 15:59:05 2010
++++ a/openbox/openbox.c Tue Jun 22 00:34:00 2010
+@@ -202,7 +202,7 @@
+
+ /* set the DISPLAY environment variable for any lauched children, to the
+ display we're using, so they open in the right place. */
+- setenv("DISPLAY", DisplayString(ob_display), TRUE);
++ g_setenv("DISPLAY", DisplayString(ob_display), TRUE);
+
+ /* create available cursors */
+ cursors[OB_CURSOR_NONE] = None;
+@@ -585,12 +585,12 @@
+ const gchar *id;
+
+ /* unset this so we don't pass it on unknowingly */
+- unsetenv("DESKTOP_STARTUP_ID");
++ g_unsetenv("DESKTOP_STARTUP_ID");
+
+ /* this is how gnome-session passes in a session client id */
+ id = g_getenv("DESKTOP_AUTOSTART_ID");
+ if (id) {
+- unsetenv("DESKTOP_AUTOSTART_ID");
++ g_unsetenv("DESKTOP_AUTOSTART_ID");
+ if (ob_sm_id) g_free(ob_sm_id);
+ ob_sm_id = g_strdup(id);
+ ob_debug_type(OB_DEBUG_SM,
+--- a/openbox/frame.c.orig Fri May 14 15:59:05 2010
++++ a/openbox/frame.c Tue Jun 22 00:13:55 2010
+@@ -274,8 +274,11 @@
+ gint num;
+ XRectangle xrect[2];
+
+- if (!((kind == ShapeBounding && self->client->shaped) ||
+- (kind == ShapeInput && self->client->shaped_input))) {
++ if (!( (kind == ShapeBounding && self->client->shaped)
++#ifdef ShapeInput
++ || (kind == ShapeInput && self->client->shaped_input)
++#endif
++ )) {
+ /* clear the shape on the frame window */
+ XShapeCombineMask(ob_display, self->window, kind,
+ self->size.left,
+@@ -320,8 +323,10 @@
+ {
+ #ifdef SHAPE
+ frame_adjust_shape_kind(self, ShapeBounding);
++#ifdef ShapeInput
+ frame_adjust_shape_kind(self, ShapeInput);
+ #endif
++#endif
+ }
+
+ void frame_adjust_area(ObFrame *self, gboolean moved,
+--- a/openbox/startupnotify.c.orig Fri May 14 15:59:05 2010
++++ a/openbox/startupnotify.c Tue Jun 22 00:34:13 2010
+@@ -266,7 +266,7 @@
+ g_direct_equal,
+ (GDestroyNotify)sn_launcher_context_unref);
+
+- setenv("DESKTOP_STARTUP_ID", id, TRUE);
++ g_setenv("DESKTOP_STARTUP_ID", id, TRUE);
+
+ g_free(desc);
+ }
+--- a/openbox/actions/execute.c.orig Fri May 14 15:59:05 2010
++++ a/openbox/actions/execute.c Tue Jun 22 00:34:37 2010
+@@ -196,7 +196,7 @@
+ sn_spawn_cancel();
+ }
+ if (o->sn)
+- unsetenv("DESKTOP_STARTUP_ID");
++ g_unsetenv("DESKTOP_STARTUP_ID");
+
+ g_free(program);
+ g_strfreev(argv);
+--- a/parser/parse.c.orig Fri Jul 2 19:59:36 2010
++++ a/parser/parse.c Fri Jul 2 20:09:11 2010
+@@ -415,6 +415,7 @@
+ xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
+ g_build_filename
+ (G_DIR_SEPARATOR_S,
++ "opt","csw",
+ "etc", "xdg", NULL),
+ (GSListFunc) g_slist_append);
+ }
+@@ -429,16 +430,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.
More information about the devel
mailing list