freetype/harfbuzz: merge into single package

2019-08-04 23:53:11 +03:00 · 2019-08-04 23:53:11 +03:00 · ea1e098d97
commit ea1e098d97
parent 232480e99a
16 changed files with 13 additions and 39 deletions
--- a/extra/imlib2/depends
+++ b/extra/imlib2/depends
@ -1,4 +1,4 @@
-freetype
+freetype-harfbuzz
 libXext

 # By default, gif and tiff are commented. You can enable support for
--- a/testing/firefox/depends
+++ b/testing/firefox/depends
@ -3,7 +3,7 @@ cargo         make
 cbindgen      make
 clang         make
 ffmpeg
-freetype      make
+freetype-harfbuzz make
 gtk+2         make
 gtk+3
 libSM         make
--- a/testing/harfbuzz/build
+++ b/testing/harfbuzz/build
@ -1,8 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --with-glib
-
-make
-make DESTDIR="$1" install
--- a/testing/harfbuzz/checksums
+++ b/testing/harfbuzz/checksums
@ -1 +0,0 @@
-fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c  harfbuzz-2.5.3.tar.xz
--- a/testing/harfbuzz/depends
+++ b/testing/harfbuzz/depends
@ -1,2 +0,0 @@
-glib
-freetype
--- a/testing/harfbuzz/sources
+++ b/testing/harfbuzz/sources
@ -1 +0,0 @@
-https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.5.3.tar.xz
--- a/testing/harfbuzz/version
+++ b/testing/harfbuzz/version
@ -1 +0,0 @@
-2.5.3 1
--- a/testing/libass/depends
+++ b/testing/libass/depends
@ -3,4 +3,4 @@ yasm make
 expat
 fribidi
 fontconfig
-freetype
+freetype-harfbuzz
--- a/testing/pango/depends
+++ b/testing/pango/depends
@ -1,5 +1,5 @@
 glib
-harfbuzz
+freetype-harfbuzz
 fontconfig
 fribidi
 cairo
--- a/xorg/fontconfig/depends
+++ b/xorg/fontconfig/depends
@ -1,3 +1,3 @@
 expat
-freetype
+freetype-harfbuzz
 gperf    make
--- a/xorg/freetype/build
+++ b/xorg/freetype/build
@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-CFLAGS="$CFLAGS -DDEFAULT_TT_INTERPRETER_VERSION=TT_INTERPRETER_VERSION_40" \
-./configure \
-    --prefix=/usr \
-    --enable-freetype-config \
-    --with-harfbuzz=no
-
-make
-make DESTDIR="$1" install
--- a/xorg/freetype/checksums
+++ b/xorg/freetype/checksums
@ -1 +0,0 @@
-db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d  freetype-2.9.1.tar.bz2
--- a/xorg/freetype/sources
+++ b/xorg/freetype/sources
@ -1 +0,0 @@
-https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2
--- a/xorg/freetype/version
+++ b/xorg/freetype/version
@ -1 +0,0 @@
-2.9.1 2
--- a/xorg/libXfont2/depends
+++ b/xorg/libXfont2/depends
@ -1,4 +1,4 @@
-freetype   make
-libfontenc make
-xorgproto  make
-xtrans     make
+freetype-harfbuzz make
+libfontenc        make
+xorgproto         make
+xtrans            make
--- a/xorg/libXft/depends
+++ b/xorg/libXft/depends
@ -1,4 +1,4 @@
-fontconfig make
-freetype   make
-libXrender make
-xorgproto  make
+fontconfig        make
+freetype-harfbuzz make
+libXrender        make
+xorgproto         make
				`@ -1 +0,0 @@`
				`fed00dc797b7ba3ca943225f0a854baaed4c1640fff8a31d455cd3b5caec855c harfbuzz-2.5.3.tar.xz`
				`@ -1 +0,0 @@`
				`https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.5.3.tar.xz`
				`@ -1 +0,0 @@`
				`db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d freetype-2.9.1.tar.bz2`
				`@ -1 +0,0 @@`
				`https://download-mirror.savannah.gnu.org/releases/freetype/freetype-2.9.1.tar.bz2`