fribidi: update to 1.0.11 and remove 32-bit binary

OpenIndiana · Sep 24, 2021 · 8ec3cb1 · 8ec3cb1
1 parent d20cd4c
commit 8ec3cb1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/components/library/fribidi/Makefile b/components/library/fribidi/Makefile
@@ -21,17 +21,15 @@ USE_DEFAULT_TEST_TRANSFORMS=yes
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		fribidi
-COMPONENT_VERSION=	1.0.10
+COMPONENT_VERSION=	1.0.11
 COMPONENT_FMRI=		library/fribidi
 COMPONENT_CLASSIFICATION=System/Libraries
 COMPONENT_SUMMARY=	Free Implementation of the Unicode Bidirectional Algorithm
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
-COMPONENT_ARCHIVE_HASH= \
-	sha256:7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01
-COMPONENT_ARCHIVE_URL= \
-	https://github.com/fribidi/fribidi/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH= sha256:30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d
 COMPONENT_PROJECT_URL=	https://github.com/fribidi/fribidi
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/releases/download/v$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 COMPONENT_LICENSE=	LGPLv2.1
 
 include $(WS_MAKE_RULES)/common.mk
@@ -41,6 +39,5 @@ unexport SHELLOPTS
 
 CONFIGURE_OPTIONS+= --disable-dependency-tracking
 
-REQUIRED_PACKAGES += library/glib2
 # Auto-generated dependencies
 REQUIRED_PACKAGES += system/library
diff --git a/components/library/fribidi/fribidi.p5m b/components/library/fribidi/fribidi.p5m
@@ -23,6 +23,9 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
 
+# We don't want 32-bit binaries:
+<transform file path=.*/bin/i86/.+ -> drop>
+
 file path=usr/bin/$(MACH32)/fribidi
 file path=usr/bin/fribidi
 file path=usr/include/fribidi/fribidi-arabic.h

diff --git a/components/library/fribidi/pkg5 b/components/library/fribidi/pkg5
@@ -1,7 +1,7 @@
 {
     "dependencies": [
         "SUNWcs",
-        "library/glib2",
+        "shell/ksh93",
         "system/library"
     ],
     "fmris": [