Revision: 24592
http://sourceforge.net/p/gar/code/24592
Author: rmottola
Date: 2015-01-23 23:15:02 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
upgraded ICU dependency, added certain overrides and patch timezone to avoid
/usr/local references (backport from upstream)
Modified Paths:
--------------
csw/mgar/pkg/gnustep-base/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch
Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnustep-base/trunk/Makefile 2015-01-23 21:05:41 UTC (rev
24591)
+++ csw/mgar/pkg/gnustep-base/trunk/Makefile 2015-01-23 23:15:02 UTC (rev
24592)
@@ -26,25 +26,45 @@
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibz1
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibxslt1
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibxml2-2
-RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicuuc52
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicuuc54
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgnutls28
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgmp10
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibobjc4
-RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicudata52
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicudata54
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibffi5
-RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicui18n52
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicui18n54
RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibiconv2
#overrides
CHECKPKG_OVERRIDES_CSWgnustep-base += surplus-dependency|CSWgnustep-make
CHECKPKG_OVERRIDES_CSWgnustep-base +=
file-with-bad-content|/usr/local|root/opt/csw/GNUstep/System/Library/Libraries/gnustep-base/Versions/1.24/Resources/NSTimeZones/README
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
binary-architecture-does-not-match-placement|file=opt/csw/GNUstep/System/Tools/autogsdoc|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
file-with-bad-content|/usr/share|root/opt/csw/GNUstep/System/Library/Libraries/libgnustep-base.so.1.24.7
+#overrides for binaries on own package, these are expected:
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plget
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/xmlparse
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/pl2link
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plmerge
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/sfparse
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plparse
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/pldes
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/cvtenc
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/gspath
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/HTMLLinker
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/autogsdoc
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/pl
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/defaults
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/make_strings
+CHECKPKG_OVERRIDES_CSWgnustep-base +=
soname-not-found|libgnustep-base.so.1.24|is|needed|by|opt/csw/GNUstep/System/Tools/plser
+
#where can we build?
PACKAGING_PLATFORMS += solaris9-sparc
PACKAGING_PLATFORMS += solaris10-sparc
#PATCHFILES += 0001-configure-tweak-align.patch
+PATCHFILES += 0002-timezone.patch
#we absolutely need GCC for Objective-C support. The only alternative in the
future would be clang
GARCOMPILER = GNU
Added: csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch
===================================================================
--- csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch
(rev 0)
+++ csw/mgar/pkg/gnustep-base/trunk/files/0002-timezone.patch 2015-01-23
23:15:02 UTC (rev 24592)
@@ -0,0 +1,40 @@
+Index: Source/NSTimeZone.m
+===================================================================
+--- a/Source/NSTimeZone.m (revision 38165)
++++ b/Source/NSTimeZone.m (working copy)
+@@ -112,7 +112,6 @@
+ #ifdef HAVE_TZHEAD
+ #include <tzfile.h>
+ #else
+-#define NOID
+ #include "nstzfile.h"
+ #endif
+
+Index: Source/nstzfile.h
+===================================================================
+--- a/Source/nstzfile.h (revision 38165)
++++ b/Source/nstzfile.h (working copy)
+@@ -16,23 +16,9 @@
+ */
+
+ /*
+-** ID
+-*/
+-
+-#ifndef lint
+-#ifndef NOID
+-static char tzfilehid[] = "@(#)tzfile.h 7.14";
+-#endif /* !defined NOID */
+-#endif /* !defined lint */
+-
+-/*
+ ** Information about time zone files.
+ */
+
+-#ifndef TZDIR
+-#define TZDIR "/usr/local/etc/zoneinfo" /* Time zone object file directory */
+-#endif /* !defined TZDIR */
+-
+ #ifndef TZDEFAULT
+ #define TZDEFAULT "localtime"
+ #endif /* !defined TZDEFAULT */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
