Revision: 26194
http://sourceforge.net/p/gar/code/26194
Author: dmichelsen
Date: 2017-05-09 22:18:10 +0000 (Tue, 09 May 2017)
Log Message:
-----------
harfbuzz/trunk: Update to 1.4.6 and cleanup
Modified Paths:
--------------
csw/mgar/pkg/harfbuzz/trunk/Makefile
csw/mgar/pkg/harfbuzz/trunk/checksums
Modified: csw/mgar/pkg/harfbuzz/trunk/Makefile
===================================================================
--- csw/mgar/pkg/harfbuzz/trunk/Makefile 2017-05-09 20:23:07 UTC (rev
26193)
+++ csw/mgar/pkg/harfbuzz/trunk/Makefile 2017-05-09 22:18:10 UTC (rev
26194)
@@ -2,7 +2,7 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = harfbuzz
-VERSION = 0.9.23
+VERSION = 1.4.6
GARTYPE = v2
GARCOMPILER = GNU
@@ -17,31 +17,37 @@
DISTFILES = $(DISTNAME).tar.bz2
DISTFILES += changelog.CSW
-PACKAGES = CSWharfbuzz-bin
-SPKG_DESC_CSWharfbuzz-bin = $(DESCRIPTION), utilities
-PKGFILES_CSWharfbuzz-bin = .*/bin/.*
-RUNTIME_DEP_PKGS_CSWharfbuzz-bin += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWharfbuzz-bin += CSWlibharfbuzz0
-RUNTIME_DEP_PKGS_CSWharfbuzz-bin += CSWlibcairo2
-RUNTIME_DEP_PKGS_CSWharfbuzz-bin += CSWlibfreetype6
-RUNTIME_DEP_PKGS_CSWharfbuzz-bin += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWharfbuzz-bin += CSWlibgcc-s1
+BUILD_DEP_PKGS = CSWlibicu-dev
+BUILD_DEP_PKGS += CSWlibglib2-dev
+BUILD_DEP_PKGS += CSWlibcairo-dev
+
+PACKAGES += CSWharfbuzz
+SPKG_DESC_CSWharfbuzz = $(DESCRIPTION), utilities
+PKGFILES_CSWharfbuzz += $(bindir)/.*
+RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibharfbuzz0
+RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWharfbuzz += CSWlibgcc-s1
# remove once ld -z ignore is resolved on sparc
-CHECKPKG_OVERRIDES_CSWharfbuzz-bin += surplus-dependency|CSWlibfreetype6
-CHECKPKG_OVERRIDES_CSWharfbuzz-bin += surplus-dependency|CSWlibintl8
+CHECKPKG_OVERRIDES_CSWharfbuzz += surplus-dependency|CSWlibfreetype6
+CHECKPKG_OVERRIDES_CSWharfbuzz += surplus-dependency|CSWlibintl8
+OBSOLETED_BY_CSWharfbuzz += CSWharfbuzz-bin
PACKAGES += CSWlibharfbuzz-dev
SPKG_DESC_CSWlibharfbuzz-dev = $(DESCRIPTION), development files
-PKGFILES_CSWlibharfbuzz-dev = $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibharfbuzz-dev = CSWlibharfbuzz-icu0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibharfbuzz-dev += CSWlibharfbuzz-icu0
RUNTIME_DEP_PKGS_CSWlibharfbuzz-dev += CSWlibharfbuzz0
+OBSOLETED_BY_CSWharfbuzz-dev += CSWharfbuzz-doc
PACKAGES += CSWlibharfbuzz-icu0
SPKG_DESC_CSWlibharfbuzz-icu0 = $(DESCRIPTION), libharfbuzz-icu.so.0
PKGFILES_CSWlibharfbuzz-icu0 = $(call pkgfiles_lib,libharfbuzz-icu.so.0)
-RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 = CSWlibharfbuzz0
+RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibharfbuzz0
RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibicudata51
-RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibicuuc51
+RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibicuuc57
RUNTIME_DEP_PKGS_CSWlibharfbuzz-icu0 += CSWlibgcc-s1
# remove once ld -z ignore is resolved on sparc
CHECKPKG_OVERRIDES_CSWlibharfbuzz-icu0 += surplus-dependency|CSWlibicudata51
@@ -49,7 +55,7 @@
PACKAGES += CSWlibharfbuzz0
SPKG_DESC_CSWlibharfbuzz0 = $(DESCRIPTION), libharfbuzz.so.0
PKGFILES_CSWlibharfbuzz0 = $(call pkgfiles_lib,libharfbuzz.so.0)
-RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibintl9
RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibglib2-0-0
RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibfreetype6
RUNTIME_DEP_PKGS_CSWlibharfbuzz0 += CSWlibgcc-s1
@@ -56,31 +62,25 @@
# remove once ld -z ignore is resolved on sparc
CHECKPKG_OVERRIDES_CSWlibharfbuzz0 += surplus-dependency|CSWlibintl8
-PACKAGES += CSWharfbuzz-doc
-ARCHALL_CSWharfbuzz-doc = 1
-SPKG_DESC_CSWharfbuzz-doc = $(DESCRIPTION), documentation
-# Catch all
-
BUILD64 = 1
-BUILD_DEP_PKGS = CSWlibicu-dev
-BUILD_DEP_PKGS += CSWlibglib2-dev
-BUILD_DEP_PKGS += CSWlibcairo-dev
+# Testsuite uses bashisms
+REINPLACEMENTS += bash
+REINPLACE_MATCH_bash = \ sh\
+REINPLACE_WITH_bash = \ bash\
+REINPLACE_FILES_bash += test/shaping/Makefile.in
+CONFIGURE_ARGS = $(DIRPATHS)
+
+# We need 'id -u'
+CONFIGURE_ENV_PATH = /usr/xpg4/bin:$(PATH)
+
# There are test scripts in src/ such as check-c-linkage-decls.sh,
# check-symbols.sh, etc. Some of them fail, some do not fail but
# complain objdump hasn't been found.
-#
-# So, I use a custom target in order to cd'ing to test/ and call make
-# check in there.
-TEST_SCRIPTS = custom
+TEST_SCRIPTS = $(WORKSRC)/test/Makefile
-CONFIGURE_ARGS = $(DIRPATHS)
+# We need 'grep -q'
+TEST_ENV_PATH = /opt/csw/gnu:$(PATH)
include gar/category.mk
-
-PATH := /opt/csw/gnu:$(PATH)
-
-test-custom:
- cd $(WORKSRC)/test && env $(BUILD_ENV) $(MAKE) check
- @$(MAKECOOKIE)
Modified: csw/mgar/pkg/harfbuzz/trunk/checksums
===================================================================
--- csw/mgar/pkg/harfbuzz/trunk/checksums 2017-05-09 20:23:07 UTC (rev
26193)
+++ csw/mgar/pkg/harfbuzz/trunk/checksums 2017-05-09 22:18:10 UTC (rev
26194)
@@ -1 +1 @@
-a4a9b548577e2ee22f0887937da5fd6c harfbuzz-0.9.23.tar.bz2
+e246c08a3bac98e31e731b2a1bf97edf harfbuzz-1.4.6.tar.bz2
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
