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

theferret at users.sourceforge.net theferret at users.sourceforge.net
Tue Jun 22 19:32:55 CEST 2010


Revision: 10282
          http://gar.svn.sourceforge.net/gar/?rev=10282&view=rev
Author:   theferret
Date:     2010-06-22 17:32:55 +0000 (Tue, 22 Jun 2010)

Log Message:
-----------
openbox: file rename

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

Removed Paths:
-------------
    csw/mgar/pkg/openbox/trunk/patches.pre-conf

Deleted: csw/mgar/pkg/openbox/trunk/patches.pre-conf
===================================================================
--- csw/mgar/pkg/openbox/trunk/patches.pre-conf	2010-06-22 17:03:29 UTC (rev 10281)
+++ csw/mgar/pkg/openbox/trunk/patches.pre-conf	2010-06-22 17:32:55 UTC (rev 10282)
@@ -1,90 +0,0 @@
---- ./openbox/event.c.orig	Tue Jun 22 00:02:57 2010
-+++ ./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);
-             }
---- ./openbox/openbox.c.orig	Fri May 14 15:59:05 2010
-+++ ./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,
---- ./openbox/frame.c.orig	Fri May 14 15:59:05 2010
-+++ ./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,
---- ./openbox/startupnotify.c.orig	Fri May 14 15:59:05 2010
-+++ ./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);
- }
---- ./openbox/actions/execute.c.orig	Fri May 14 15:59:05 2010
-+++ ./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);

Copied: csw/mgar/pkg/openbox/trunk/patchfile.preconf (from rev 10281, csw/mgar/pkg/openbox/trunk/patches.pre-conf)
===================================================================
--- csw/mgar/pkg/openbox/trunk/patchfile.preconf	                        (rev 0)
+++ csw/mgar/pkg/openbox/trunk/patchfile.preconf	2010-06-22 17:32:55 UTC (rev 10282)
@@ -0,0 +1,90 @@
+--- ./openbox/event.c.orig	Tue Jun 22 00:02:57 2010
++++ ./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);
+             }
+--- ./openbox/openbox.c.orig	Fri May 14 15:59:05 2010
++++ ./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,
+--- ./openbox/frame.c.orig	Fri May 14 15:59:05 2010
++++ ./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,
+--- ./openbox/startupnotify.c.orig	Fri May 14 15:59:05 2010
++++ ./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);
+ }
+--- ./openbox/actions/execute.c.orig	Fri May 14 15:59:05 2010
++++ ./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);


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