SF.net SVN: gar:[23559] csw/mgar/pkg/glib2/trunk/Makefile

[slowfranklin at users.sourceforge.net]

Revision: 23559
          http://sourceforge.net/p/gar/code/23559
Author:   slowfranklin
Date:     2014-05-06 11:12:39 +0000 (Tue, 06 May 2014)
Log Message:
-----------
glib2/trunk: Fix remaining overrides and move gsettings binary to CSWglib2 package

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2014-05-06 09:23:34 UTC (rev 23558)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2014-05-06 11:12:39 UTC (rev 23559)
@@ -45,8 +45,6 @@
 PATCHFILES_5.11 += 0020-Adjust-path-to-zoneinfo-database.patch
 PATCHFILES += 0022-Change-shell-to-bash-in-test-shell-scripts.patch
 PATCHFILES += 0029-Don-t-undefine-_XOPEN_SOURCE.patch
-# Seems to be fixed in 2.40.0
-# PATCHFILES += 0030-Move-around-statfs_result.patch
 
 #
 # Until someone invests some real resources into checking all test patches,
@@ -102,7 +100,7 @@
 #PATCHFILES += 0037-Remove-failing-tests-linking-is-broken.patch
 #PATCHFILES_5.11 += 0038-Disable-appinfo-launch-test-fails-on-s11x86.patch
 
-PATCHFILES += $(PATCHFILES_$(GAROSREL))
+# PATCHFILES += $(PATCHFILES_$(GAROSREL))
 
 # Solaris 11 specific package for FEN support
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -112,7 +110,6 @@
 PACKAGES += CSWglib2
 SPKG_DESC_CSWglib2 = Low level core compatibility library for GTK+ and GNOME
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWglib2 += CSWgio-fam-backend
 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWglib2 += CSWlibgmodule2-0-0
@@ -186,11 +183,6 @@
 RUNTIME_DEP_PKGS_CSWlibglib2-0-0 += CSWlibgcc-s1
 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.4000.0
 CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libglib-2.0.so.0.4000.0
-# checkpkg doesn't take the solaris version into account and that this symbol version is okay to be used in solaris 11
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libglib-2.0.so.0.4000.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libglib-2.0.so.0.4000.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libglib-2.0.so.0.4000.0|requires|forbidden|interface|version|SUNW_1.23|in|library|libc.so.1
-CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += $(CHECKPKG_OVERRIDES_CSWlibglib2-0-0_$(GAROSREL))
 
 
 PACKAGES += CSWlibgmodule2-0-0
@@ -243,7 +235,7 @@
 RUNTIME_DEP_PKGS_CSWlibglib2-dev += CSWgio-fam-backend
 CHECKPKG_OVERRIDES_CSWlibglib2-dev += surplus-dependency|CSWgio-fam-backend
 PKGFILES_CSWlibglib2-dev += $(PKGFILES_DEVEL)
-# FIXME: at least glib-compile-schemas and gsettings should be moved to CSWglib2
+# FIXME: glib-compile-schemas should possibly be moved to CSWglib2
 PKGFILES_CSWlibglib2-dev += .*/glib-2.0/include/.*
 PKGFILES_CSWlibglib2-dev += .*/gdbus-2.0.*
 PKGFILES_CSWlibglib2-dev += .*/bash-completion.*
@@ -251,7 +243,6 @@
 PKGFILES_CSWlibglib2-dev += .*/bin.*/glib.*
 PKGFILES_CSWlibglib2-dev += .*/bin.*/gobject-query
 PKGFILES_CSWlibglib2-dev += .*/bin.*/gresource
-PKGFILES_CSWlibglib2-dev += .*/bin.*/gsettings
 PKGFILES_CSWlibglib2-dev += .*/bin.*/gtester.*
 PKGFILES_CSWlibglib2-dev += .*/man1/gdbus.*
 PKGFILES_CSWlibglib2-dev += .*/man1/glib.*

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