Add missing changes for 'Update mingw-w64-freetype2 to 2.9'
This commit is contained in:
parent
a8c33b0f70
commit
96053307f7
|
@ -1,4 +1,5 @@
|
||||||
From 17dd2751813c3c8b37dac474cc5024473eb9bece Mon Sep 17 00:00:00 2001
|
From c7a6a2312313a971089fb592deb8c476be4dca0f Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
|
||||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||||
Date: Tue, 23 Jun 2015 08:40:29 +0200
|
Date: Tue, 23 Jun 2015 08:40:29 +0200
|
||||||
Subject: [PATCH 1/4] Enable table validation modules
|
Subject: [PATCH 1/4] Enable table validation modules
|
||||||
|
@ -8,7 +9,7 @@ Subject: [PATCH 1/4] Enable table validation modules
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/modules.cfg b/modules.cfg
|
diff --git a/modules.cfg b/modules.cfg
|
||||||
index 517111efeb642459..64b2a34d510ce8f7 100644
|
index 56a2340e56d187aa..3a028329187275df 100644
|
||||||
--- a/modules.cfg
|
--- a/modules.cfg
|
||||||
+++ b/modules.cfg
|
+++ b/modules.cfg
|
||||||
@@ -120,30 +120,30 @@ AUX_MODULES += cache
|
@@ -120,30 +120,30 @@ AUX_MODULES += cache
|
||||||
|
@ -45,5 +46,5 @@ index 517111efeb642459..64b2a34d510ce8f7 100644
|
||||||
# Auxiliary PostScript driver component to share common code.
|
# Auxiliary PostScript driver component to share common code.
|
||||||
#
|
#
|
||||||
--
|
--
|
||||||
2.13.0
|
2.15.1
|
||||||
|
|
||||||
|
|
|
@ -1,18 +1,21 @@
|
||||||
From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001
|
From 438b8c65e900d4c28db9eeb2a45e5998048eb471 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <438b8c65e900d4c28db9eeb2a45e5998048eb471.1513462508.git.jan.steffens@gmail.com>
|
||||||
|
In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
|
||||||
|
References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
|
||||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||||
Date: Mon, 29 Aug 2016 08:43:10 +0200
|
Date: Mon, 29 Aug 2016 08:43:10 +0200
|
||||||
Subject: [PATCH 3/4] Enable infinality subpixel hinting
|
Subject: [PATCH 2/4] Enable infinality subpixel hinting
|
||||||
|
|
||||||
---
|
---
|
||||||
include/freetype/config/ftoption.h | 4 ++--
|
include/freetype/config/ftoption.h | 4 ++--
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
|
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
|
||||||
index 1126716626b570df..ebb44acdbbef9a47 100644
|
index 06f3d50bb02fb5ac..e6f9720df9b5d004 100644
|
||||||
--- a/include/freetype/config/ftoption.h
|
--- a/include/freetype/config/ftoption.h
|
||||||
+++ b/include/freetype/config/ftoption.h
|
+++ b/include/freetype/config/ftoption.h
|
||||||
@@ -684,8 +684,8 @@ FT_BEGIN_HEADER
|
@@ -654,8 +654,8 @@ FT_BEGIN_HEADER
|
||||||
/* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
|
/* [1] https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
|
||||||
/* */
|
/* */
|
||||||
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
|
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
|
||||||
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
|
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
|
||||||
|
@ -23,5 +26,5 @@ index 1126716626b570df..ebb44acdbbef9a47 100644
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
--
|
--
|
||||||
2.13.0
|
2.15.1
|
||||||
|
|
|
@ -1,17 +1,20 @@
|
||||||
From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
|
From 7e262bff01573c67432f8b8fd879bf858e1611b3 Mon Sep 17 00:00:00 2001
|
||||||
|
Message-Id: <7e262bff01573c67432f8b8fd879bf858e1611b3.1513462508.git.jan.steffens@gmail.com>
|
||||||
|
In-Reply-To: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
|
||||||
|
References: <c7a6a2312313a971089fb592deb8c476be4dca0f.1513462508.git.jan.steffens@gmail.com>
|
||||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||||
Date: Sun, 14 May 2017 18:09:31 +0200
|
Date: Sun, 14 May 2017 18:09:31 +0200
|
||||||
Subject: [PATCH 4/4] Enable long PCF family names
|
Subject: [PATCH 3/4] Enable long PCF family names
|
||||||
|
|
||||||
---
|
---
|
||||||
include/freetype/config/ftoption.h | 2 +-
|
include/freetype/config/ftoption.h | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
|
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
|
||||||
index ebb44acdbbef9a47..0b39b417162707e4 100644
|
index e6f9720df9b5d004..832c9c3cd200f91a 100644
|
||||||
--- a/include/freetype/config/ftoption.h
|
--- a/include/freetype/config/ftoption.h
|
||||||
+++ b/include/freetype/config/ftoption.h
|
+++ b/include/freetype/config/ftoption.h
|
||||||
@@ -865,7 +865,7 @@ FT_BEGIN_HEADER
|
@@ -845,7 +845,7 @@ FT_BEGIN_HEADER
|
||||||
/* If this option is activated, it can be controlled with the */
|
/* If this option is activated, it can be controlled with the */
|
||||||
/* `no-long-family-names' property of the pcf driver module. */
|
/* `no-long-family-names' property of the pcf driver module. */
|
||||||
/* */
|
/* */
|
||||||
|
@ -21,5 +24,5 @@ index ebb44acdbbef9a47..0b39b417162707e4 100644
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
--
|
--
|
||||||
2.13.0
|
2.15.1
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# you also find the URL of a binary repository.
|
# you also find the URL of a binary repository.
|
||||||
|
|
||||||
pkgname=mingw-w64-freetype2-bootstrap
|
pkgname=mingw-w64-freetype2-bootstrap
|
||||||
pkgver=2.8.1
|
pkgver=2.9
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='Font rasterization library (mingw-w64)'
|
pkgdesc='Font rasterization library (mingw-w64)'
|
||||||
arch=('any')
|
arch=('any')
|
||||||
|
@ -17,14 +17,14 @@ replaces=(mingw-w64-freetype)
|
||||||
conflicts=(mingw-w64-freetype)
|
conflicts=(mingw-w64-freetype)
|
||||||
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
|
source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
|
||||||
0001-Enable-table-validation-modules.patch
|
0001-Enable-table-validation-modules.patch
|
||||||
0003-Enable-infinality-subpixel-hinting.patch
|
0002-Enable-infinality-subpixel-hinting.patch
|
||||||
0004-Enable-long-PCF-family-names.patch)
|
0003-Enable-long-PCF-family-names.patch)
|
||||||
options=(!strip !buildflags !libtool staticlibs)
|
options=(!strip !buildflags !libtool staticlibs)
|
||||||
sha1sums=('417bb3747c4ac95b6f2652024a53fad45581fa1c'
|
sha1sums=('94c4399b1a55c5892812e732843fcb4a7c2fe657'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'c3e91e668936206d3c158bffde0f69788a086a5b'
|
'b69531770c343d403be294b7e4d25ac45738c833'
|
||||||
'81586014ea44375ddc85dd9dbcabae6e91c34d62'
|
'3d26a569f0cb94c28a550577f5dcaadb4e193d91'
|
||||||
'334f229875039794adeb574e27d365bb445fb314')
|
'770f1981734a837bcf065564c91644b4cc5e256a')
|
||||||
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
|
validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
|
||||||
|
|
||||||
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
|
if [[ $pkgname = 'mingw-w64-freetype2-bootstrap' ]]; then
|
||||||
|
@ -45,8 +45,8 @@ prepare() {
|
||||||
cd "${srcdir}/freetype-${pkgver}"
|
cd "${srcdir}/freetype-${pkgver}"
|
||||||
|
|
||||||
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
|
patch -Np1 -i ../0001-Enable-table-validation-modules.patch
|
||||||
patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
|
patch -Np1 -i ../0002-Enable-infinality-subpixel-hinting.patch
|
||||||
patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
|
patch -Np1 -i ../0003-Enable-long-PCF-family-names.patch
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
From 239cd8209c8d15a641d4548d386aeae4853b7d23 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
|
||||||
Date: Mon, 29 Aug 2016 08:43:10 +0200
|
|
||||||
Subject: [PATCH 3/4] Enable infinality subpixel hinting
|
|
||||||
|
|
||||||
---
|
|
||||||
include/freetype/config/ftoption.h | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
|
|
||||||
index 1126716626b570df..ebb44acdbbef9a47 100644
|
|
||||||
--- a/include/freetype/config/ftoption.h
|
|
||||||
+++ b/include/freetype/config/ftoption.h
|
|
||||||
@@ -684,8 +684,8 @@ FT_BEGIN_HEADER
|
|
||||||
/* [1] http://www.microsoft.com/typography/cleartype/truetypecleartype.aspx */
|
|
||||||
/* */
|
|
||||||
/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
|
|
||||||
-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
|
|
||||||
-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
|
|
||||||
+/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
|
|
||||||
+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
|
||||||
--
|
|
||||||
2.13.0
|
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
From 62da6a0f7f5cb77859a793863c386c452411e2a6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
|
||||||
Date: Sun, 14 May 2017 18:09:31 +0200
|
|
||||||
Subject: [PATCH 4/4] Enable long PCF family names
|
|
||||||
|
|
||||||
---
|
|
||||||
include/freetype/config/ftoption.h | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
|
|
||||||
index ebb44acdbbef9a47..0b39b417162707e4 100644
|
|
||||||
--- a/include/freetype/config/ftoption.h
|
|
||||||
+++ b/include/freetype/config/ftoption.h
|
|
||||||
@@ -865,7 +865,7 @@ FT_BEGIN_HEADER
|
|
||||||
/* If this option is activated, it can be controlled with the */
|
|
||||||
/* `no-long-family-names' property of the pcf driver module. */
|
|
||||||
/* */
|
|
||||||
-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
|
|
||||||
+#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
|
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
|
||||||
--
|
|
||||||
2.13.0
|
|
||||||
|
|
|
@ -3,13 +3,9 @@
|
||||||
# Syncs the different variants of mingw-w64-qt5-base
|
# Syncs the different variants of mingw-w64-qt5-base
|
||||||
|
|
||||||
set -e # abort on first error
|
set -e # abort on first error
|
||||||
master="$1"
|
master="${1:-mingw-w64}"
|
||||||
|
|
||||||
if [[ ! $master ]]; then
|
if [ $# -gt 1 ]; then
|
||||||
# no default here to prevent unintented use
|
|
||||||
echo "Error: no master specified"
|
|
||||||
exit -1
|
|
||||||
elif [ $# -gt 1 ]; then
|
|
||||||
echo "Error: too many arguments specified"
|
echo "Error: too many arguments specified"
|
||||||
echo "Usage: $0 master_dir"
|
echo "Usage: $0 master_dir"
|
||||||
exit -2
|
exit -2
|
||||||
|
|
Loading…
Reference in New Issue