Drop upstreamed patch

3 files changed, 23 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8706c9b6ae1e..b19f0864868a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freetype2-git
 	pkgdesc = Font rasterization library (from git)
-	pkgver = 2.10.2+p7+ge13391333
+	pkgver = 2.10.2+p23+ga44347475
 	pkgrel = 1
 	epoch = 1
 	url = https://www.freetype.org/
@@ -23,24 +23,22 @@ pkgbase = freetype2-git
 	source = 0004-Enable-long-PCF-family-names.patch
 	source = 0005-Enable-old-engines-but-keep-adobe-as-default.patch
 	source = freetype-2.5.2-more-demos.patch
-	source = cflags-order.patch
 	source = freetype2.sh
 	validpgpkeys = 58E0C111E39F5408C5D3EC76C1A60EACE707FDA5
-	sha1sums = SKIP
-	sha1sums = SKIP
-	sha1sums = 07aecf77659ff956270c042990a013552b826e5e
-	sha1sums = f03de1bd288de5251710a7d9b05a7aec9ebb4445
-	sha1sums = 6a47234d60eeec766fd2b00d18bab18cf06eb651
-	sha1sums = 82e08f0f4f6f5454d9706d24d45824b5ed412a37
-	sha1sums = 9ad5cbe34209ed2cd36687971dac7ba92688b774
-	sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
-	sha1sums = 6b93645ff0bf25fcc67a01f764f884c9791bf09f
-	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = 44395c31c36255ea0e5c96c03df92cc975e55e28b0c80fbb0da3d9f05e50a150
+	sha256sums = 67abb3c86fa9a72c5f78bb390c6e09f4277a76e84a2a291798ed6b5362c2fcf7
+	sha256sums = b92a8421ea4ab3e7ee7173f7de51d98bff376663662772a952e7a4cad4bf10f3
+	sha256sums = df0c73f02040c64bed479e41b86da7a4890d1ab31eab20c75e850aab1b86250b
+	sha256sums = 1b7d38b082d32b19d5fd21c17c9ae187ada00f9c978dc2877edebbe19a9da9ed
+	sha256sums = 36484db4b926ed026e7f32570573493b5a9793a129f08d54383a26d65a6af89b
+	sha256sums = f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467
 
 pkgname = freetype2-git
 	install = freetype2.install
 	provides = libfreetype.so
-	provides = freetype2=2.10.2+p7+ge13391333
+	provides = freetype2=2.10.2+p23+ga44347475
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
 
@@ -48,12 +46,12 @@ pkgname = freetype2-demos-git
 	pkgdesc = Freetype tools and demos (from git)
 	depends = freetype2-git
 	depends = libx11
-	provides = freetype2-demos=2.10.2+p7+ge13391333
+	provides = freetype2-demos=2.10.2+p23+ga44347475
 	conflicts = freetype2-demos
 
 pkgname = freetype2-docs-git
 	pkgdesc = Freetype documentation (from git)
 	depends = freetype2-git
-	provides = freetype2-docs=2.10.2+p7+ge13391333
+	provides = freetype2-docs=2.10.2+p23+ga44347475
 	conflicts = freetype2-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index 83d34bcb08a6..df8dc4ee8ea1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=freetype2-git
 pkgname=('freetype2-git' 'freetype2-demos-git' 'freetype2-docs-git')
-pkgver=2.10.2+p7+ge13391333
+pkgver=2.10.2+p23+ga44347475
 pkgrel=1
 epoch=1
 pkgdesc="Font rasterization library (from git)"
@@ -22,18 +22,16 @@ source=(git://git.sv.gnu.org/freetype/freetype2.git
         0004-Enable-long-PCF-family-names.patch
         0005-Enable-old-engines-but-keep-adobe-as-default.patch
         freetype-2.5.2-more-demos.patch
-        cflags-order.patch
         freetype2.sh)
-sha1sums=('SKIP'
-          'SKIP'
-          '07aecf77659ff956270c042990a013552b826e5e'
-          'f03de1bd288de5251710a7d9b05a7aec9ebb4445'
-          '6a47234d60eeec766fd2b00d18bab18cf06eb651'
-          '82e08f0f4f6f5454d9706d24d45824b5ed412a37'
-          '9ad5cbe34209ed2cd36687971dac7ba92688b774'
-          '72cfecbe738085eec475e012617661ad0cc9b76f'
-          '6b93645ff0bf25fcc67a01f764f884c9791bf09f'
-          'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
+sha256sums=('SKIP'
+            'SKIP'
+            '44395c31c36255ea0e5c96c03df92cc975e55e28b0c80fbb0da3d9f05e50a150'
+            '67abb3c86fa9a72c5f78bb390c6e09f4277a76e84a2a291798ed6b5362c2fcf7'
+            'b92a8421ea4ab3e7ee7173f7de51d98bff376663662772a952e7a4cad4bf10f3'
+            'df0c73f02040c64bed479e41b86da7a4890d1ab31eab20c75e850aab1b86250b'
+            '1b7d38b082d32b19d5fd21c17c9ae187ada00f9c978dc2877edebbe19a9da9ed'
+            '36484db4b926ed026e7f32570573493b5a9793a129f08d54383a26d65a6af89b'
+            'f7f8e09c44f7552c883846e9a6a1efc50377c4932234e74adc4a8ff750606467')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
 pkgver() {
@@ -63,9 +61,6 @@ prepare() {
   # enable more demos
   patch -Np1 -i ../freetype-2.5.2-more-demos.patch
 
-  # ensure include dirs of built freetype come first
-  patch -Np1 -i ../cflags-order.patch
-
   # Suppress RPATH
   sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
 }
diff --git a/cflags-order.patch b/cflags-order.patch
deleted file mode 100644
index 4a07647d3732..000000000000
--- a/cflags-order.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- Makefile | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git c/Makefile i/Makefile
-index 8e4ca56..e6ad0af 100644
---- c/Makefile
-+++ i/Makefile
-@@ -130,10 +130,10 @@ else
-                  $(TOP_DIR)/include \
-                  $(SRC_DIR)
- 
--  COMPILE = $(CC) $(CPPFLAGS) \
--                  $(CFLAGS) \
--                  $(ANSIFLAGS) \
--                  $(INCLUDES:%=$I%)
-+  COMPILE = $(CC) $(ANSIFLAGS) \
-+                  $(INCLUDES:%=$I%) \
-+                  $(CPPFLAGS) \
-+                  $(CFLAGS)
- 
-   # Enable C99 for gcc to avoid warnings.
-   # Note that clang++ aborts with an error if we use `-std=C99',