[csw-devel] SF.net SVN: gar:[5269] csw/mgar/pkg/xfce/xfconf/trunk

[wbonnet at users.sourceforge.net]

Revision: 5269
          http://gar.svn.sourceforge.net/gar/?rev=5269&view=rev
Author:   wbonnet
Date:     2009-06-15 23:06:34 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
Add patch for sun studio compilation

Modified Paths:
--------------
    csw/mgar/pkg/xfce/xfconf/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/xfce/xfconf/trunk/files/xf-conf-locking-utils.h.diff
    csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff

Modified: csw/mgar/pkg/xfce/xfconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xfce/xfconf/trunk/Makefile	2009-06-15 22:06:02 UTC (rev 5268)
+++ csw/mgar/pkg/xfce/xfconf/trunk/Makefile	2009-06-15 23:06:34 UTC (rev 5269)
@@ -30,26 +30,20 @@
 PKGFILES_CSWxfconfdevel += /opt/csw/include/xfce4/xfconf/.*
 PKGFILES_CSWxfconfdoc    = /opt/csw/share/gtk-doc/.*
 
+# Required packages for compilation
+PREREQUISITE_PKGS_CSWxfconf    = CSWpmglib
+
 # Defines dependencies
-REQUIRED_PKGS_CSWxfconf      = 
+REQUIRED_PKGS_CSWxfconf      = CSWpmglib
 REQUIRED_PKGS_CSWxfconfdevel = 
 REQUIRED_PKGS_CSWxfconfdoc   = 
 
+PATCHFILES = xf-conf-locking-utils.h.diff xfconf-gvaluefuncs.h.diff
+
 # BUILD64 = 1
 # NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --enable-xinerama
 
 TEST_SCRIPTS = 
 
-MSGFMT= /opt/csw/bin/gmsgfmt
-MSGMERGE= /opt/csw/bin/gmsgmerge
-XGETTEXT = /opt/csw/bin/gxgettext
-GETTEXT = /opt/csw/bin/ggettext
-export MSGMERGE
-export MSGFMT
-export XGETTEXT
-export GETTEXT
-
 include gar/category.mk
-

Added: csw/mgar/pkg/xfce/xfconf/trunk/files/xf-conf-locking-utils.h.diff
===================================================================
--- csw/mgar/pkg/xfce/xfconf/trunk/files/xf-conf-locking-utils.h.diff	                        (rev 0)
+++ csw/mgar/pkg/xfce/xfconf/trunk/files/xf-conf-locking-utils.h.diff	2009-06-15 23:06:34 UTC (rev 5269)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru xfconf-4.6.1.orig/xfconfd/xfconf-locking-utils.h xfconf-4.6.1/xfconfd/xfconf-locking-utils.h
+--- xfconf-4.6.1.orig/xfconfd/xfconf-locking-utils.h 2009-06-16 00:35:04.485540690 +0200
++++ xfconf-4.6.1/xfconfd/xfconf-locking-utils.h      2009-06-16 00:35:22.046862635 +0200
+@@ -26,7 +26,7 @@
+
+ #define  XFCONF_DBUS_TYPE_G_DOUBLE_ARRAY  (dbus_g_type_get_collection("GArray", G_TYPE_DOUBLE))
+
+-gboolean xfconf_user_is_in_list(const gchar *list) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL gboolean xfconf_user_is_in_list(const gchar *list);
+
+ G_END_DECLS
+

Added: csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff
===================================================================
--- csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff	                        (rev 0)
+++ csw/mgar/pkg/xfce/xfconf/trunk/files/xfconf-gvaluefuncs.h.diff	2009-06-15 23:06:34 UTC (rev 5269)
@@ -0,0 +1,30 @@
+diff --speed-large-files --minimal -Nru xfconf-4.6.1.orig/common/xfconf-gvaluefuncs.h xfconf-4.6.1/common/xfconf-gvaluefuncs.h
+--- xfconf-4.6.1.orig/common/xfconf-gvaluefuncs.h   2009-06-16 00:54:52.856392628 +0200
++++ xfconf-4.6.1/common/xfconf-gvaluefuncs.h        2009-06-16 00:56:11.753049677 +0200
+@@ -24,18 +24,18 @@
+
+ G_BEGIN_DECLS
+
+-GType _xfconf_gtype_from_string(const gchar *type) G_GNUC_INTERNAL;
+-G_CONST_RETURN gchar *_xfconf_string_from_gtype(GType gtype) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL GType _xfconf_gtype_from_string(const gchar *type);
++G_GNUC_INTERNAL G_CONST_RETURN gchar *_xfconf_string_from_gtype(GType gtype);
+
+-gboolean _xfconf_gvalue_from_string(GValue *value,
+-                                    const gchar *str) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL gboolean _xfconf_gvalue_from_string(GValue *value,
++                                    const gchar *str);
+
+-gchar *_xfconf_string_from_gvalue(GValue *value) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL gchar *_xfconf_string_from_gvalue(GValue *value);
+
+-gboolean _xfconf_gvalue_is_equal(const GValue *value1,
+-                                 const GValue *value2) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL gboolean _xfconf_gvalue_is_equal(const GValue *value1,
++                                 const GValue *value2);
+
+-void _xfconf_gvalue_free(GValue *value) G_GNUC_INTERNAL;
++G_GNUC_INTERNAL void _xfconf_gvalue_free(GValue *value);
+
+ G_END_DECLS
+


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