summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO31
-rw-r--r--.gitignore1
-rw-r--r--0001-Enable-table-validation-modules.patch34
-rw-r--r--0002-Enable-subpixel-rendering.patch25
-rw-r--r--0003-Enable-subpixel-hinting.patch25
-rw-r--r--0004-Mask-subpixel-hinting-with-an-env-var.patch31
-rw-r--r--PKGBUILD63
-rw-r--r--env_FT2_SUBPIXEL_HINTING.diff18
-rw-r--r--freetype-2.2.1-enable-valid.patch20
-rw-r--r--freetype-2.5.1-enable-sph.patch13
-rw-r--r--freetype-2.5.1-enable-spr.patch13
-rw-r--r--libreoffice-uglyfix-noautohint.patch (renamed from libreoffice-uglyfix.patch)6
12 files changed, 168 insertions, 112 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 691f154e97b0..47b9e43c24ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libreoffice-uglyfix-freetype2
pkgdesc = Installs freetype2 .so files in the LibreOffice directory to fix font ugliness
- pkgver = 2.6
- pkgrel = 2
+ pkgver = 2.6.1
+ pkgrel = 1
url = http://freetype.sourceforge.net
arch = i686
arch = x86_64
@@ -10,20 +10,23 @@ pkgbase = libreoffice-uglyfix-freetype2
depends = bzip2
depends = sh
depends = libpng
+ depends = harfbuzz
depends = libreoffice
options = !docs
- source = http://downloads.sourceforge.net/sourceforge/freetype/freetype-2.6.tar.bz2
- source = libreoffice-uglyfix.patch
- source = freetype-2.2.1-enable-valid.patch
- source = freetype-2.5.1-enable-spr.patch
- source = freetype-2.5.1-enable-sph.patch
- source = env_FT2_SUBPIXEL_HINTING.diff
- sha256sums = 8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e
- sha256sums = 78932b6044c92367bf1eca07910b1c533ce6a0e721233feaeb27e6019adc3b81
- sha256sums = 54c83a91b0b2ad7edad7df00a2c26a11ca18431a8e323db9471268a139c46f7e
- sha256sums = 1c9a03e4cf07799deb7983b47b15f7557a8dbf9b8a7690910d017b6fd6804a23
- sha256sums = ae89da5ce6d196abd5fe44dfbec16e731d7045c0cdc043a503ed3f120663bcfd
- sha256sums = 4b0a220ea989da35fc40f58c20bed092a901ecc35f28c45b02da38c96c470855
+ source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.bz2
+ source = http://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.bz2.sig
+ source = libreoffice-uglyfix-noautohint.patch
+ source = 0001-Enable-table-validation-modules.patch
+ source = 0002-Enable-subpixel-rendering.patch
+ source = 0003-Enable-subpixel-hinting.patch
+ source = 0004-Mask-subpixel-hinting-with-an-env-var.patch
+ sha256sums = 2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17
+ sha256sums = SKIP
+ sha256sums = 65915726ba3adfc5903ddd6b706ce91751994e7635ea6111e33e5939c674496b
+ sha256sums = 9de28c1156c0a5edff1b3860ad44f4cc2494fc5663bd40c3914fdd64e8ee0724
+ sha256sums = 60e767ccee37939bfea73fa86229108c51b665713a89fbda5506759af2e7d629
+ sha256sums = 78aba5d04418952cf4a29351420fc82c5830616d221e95a21a0c8e3da827d681
+ sha256sums = 3672ef244d6c455623bd0ddecde46bd3758152713a03d475f91aaccfa1a2e0f4
pkgname = libreoffice-uglyfix-freetype2
diff --git a/.gitignore b/.gitignore
index fa9b07747604..5843d8ef21c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*~
pkg/
src/
+*.sig
*.gz
*.bz2
*.xz
diff --git a/0001-Enable-table-validation-modules.patch b/0001-Enable-table-validation-modules.patch
new file mode 100644
index 000000000000..4ed7dd81b173
--- /dev/null
+++ b/0001-Enable-table-validation-modules.patch
@@ -0,0 +1,34 @@
+From 27f765b5f41638de36de728e9018a1400b0be615 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH 1/4] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index 2984e51..a5db21d 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -110,7 +110,7 @@ RASTER_MODULES += smooth
+ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -129,7 +129,7 @@ AUX_MODULES += bzip2
+
+ # OpenType table validation. Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
+--
+2.6.0
+
diff --git a/0002-Enable-subpixel-rendering.patch b/0002-Enable-subpixel-rendering.patch
new file mode 100644
index 000000000000..acc0475c0bd7
--- /dev/null
+++ b/0002-Enable-subpixel-rendering.patch
@@ -0,0 +1,25 @@
+From 27d96091b2bb0a825cbd62a332ef918f39c6126f Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH 2/4] Enable subpixel rendering
+
+---
+ 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 4970945..ab407e3 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
+ /* This is done to allow FreeType clients to run unmodified, forcing */
+ /* them to display normal gray-level anti-aliased glyphs. */
+ /* */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /*************************************************************************/
+--
+2.6.0
+
diff --git a/0003-Enable-subpixel-hinting.patch b/0003-Enable-subpixel-hinting.patch
new file mode 100644
index 000000000000..00a5c2f79f3b
--- /dev/null
+++ b/0003-Enable-subpixel-hinting.patch
@@ -0,0 +1,25 @@
+From f96a1d21d787b173d6293330fbf782b977194aa7 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 23 Jun 2015 08:43:57 +0200
+Subject: [PATCH 3/4] Enable subpixel hinting
+
+---
+ 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 ab407e3..a2eab6a 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -602,7 +602,7 @@ FT_BEGIN_HEADER
+ /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
+ /* defined. */
+ /* */
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
+
+
+ /*************************************************************************/
+--
+2.6.0
+
diff --git a/0004-Mask-subpixel-hinting-with-an-env-var.patch b/0004-Mask-subpixel-hinting-with-an-env-var.patch
new file mode 100644
index 000000000000..ec8910488cb3
--- /dev/null
+++ b/0004-Mask-subpixel-hinting-with-an-env-var.patch
@@ -0,0 +1,31 @@
+From bb5ece9c6773145c8342107bd32fcacbc4b212ab Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Tue, 23 Jun 2015 08:34:54 +0200
+Subject: [PATCH 4/4] Mask subpixel hinting with an env var
+
+---
+ src/truetype/ttobjs.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
+index 6060d6f..3fa98e7 100644
+--- a/src/truetype/ttobjs.c
++++ b/src/truetype/ttobjs.c
+@@ -1302,10 +1302,11 @@
+ TT_Driver driver = (TT_Driver)ttdriver;
+
+ #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
+- driver->interpreter_version = TT_INTERPRETER_VERSION_38;
+-#else
+- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
++ if ( getenv( "FT2_SUBPIXEL_HINTING" ) )
++ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
++ else
+ #endif
++ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
+
+ #else /* !TT_USE_BYTECODE_INTERPRETER */
+
+--
+2.6.0
+
diff --git a/PKGBUILD b/PKGBUILD
index eb924251de0d..02559c1867c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,54 @@
# See AUR interface to contact current maintainer.
+# Do note that this PKGBUILD follows closely the PKGBUILD provided by
+# Arch extra repository, for obvious reasons.
+
pkgname=libreoffice-uglyfix-freetype2
-pkgver=2.6
-pkgrel=2
+pkgver=2.6.1
+pkgrel=1
pkgdesc="Installs freetype2 .so files in the LibreOffice directory to fix font ugliness"
arch=(i686 x86_64)
license=('GPL')
url="http://freetype.sourceforge.net"
-depends=('zlib' 'bzip2' 'sh' 'libpng' 'libreoffice')
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz' 'libreoffice')
options=(!docs)
source=(
- "http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2"
- 'libreoffice-uglyfix.patch'
- 'freetype-2.2.1-enable-valid.patch'
- 'freetype-2.5.1-enable-spr.patch'
- 'freetype-2.5.1-enable-sph.patch'
- 'env_FT2_SUBPIXEL_HINTING.diff')
-sha256sums=('8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e'
- '78932b6044c92367bf1eca07910b1c533ce6a0e721233feaeb27e6019adc3b81'
- '54c83a91b0b2ad7edad7df00a2c26a11ca18431a8e323db9471268a139c46f7e'
- '1c9a03e4cf07799deb7983b47b15f7557a8dbf9b8a7690910d017b6fd6804a23'
- 'ae89da5ce6d196abd5fe44dfbec16e731d7045c0cdc043a503ed3f120663bcfd'
- '4b0a220ea989da35fc40f58c20bed092a901ecc35f28c45b02da38c96c470855')
+ http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+ libreoffice-uglyfix-noautohint.patch
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-subpixel-hinting.patch
+ 0004-Mask-subpixel-hinting-with-an-env-var.patch)
+sha256sums=('2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17'
+ 'SKIP'
+ '65915726ba3adfc5903ddd6b706ce91751994e7635ea6111e33e5939c674496b'
+ '9de28c1156c0a5edff1b3860ad44f4cc2494fc5663bd40c3914fdd64e8ee0724'
+ '60e767ccee37939bfea73fa86229108c51b665713a89fbda5506759af2e7d629'
+ '78aba5d04418952cf4a29351420fc82c5830616d221e95a21a0c8e3da827d681'
+ '3672ef244d6c455623bd0ddecde46bd3758152713a03d475f91aaccfa1a2e0f4')
+validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
prepare()
{
cd "$srcdir/freetype-$pkgver"
- patch -Np1 -i "$srcdir/libreoffice-uglyfix.patch"
+ patch -Np1 -i "$srcdir/libreoffice-uglyfix-noautohint.patch"
- # Arch patches
- #
- # Enable font validity checking (bad fonts can crash your
- # whole graphics stack)
#
- patch -Np1 -i "$srcdir/freetype-2.2.1-enable-valid.patch"
- #
- # Enable subpixel rendering
+ # Arch patches
#
- patch -Np1 -i "$srcdir/freetype-2.5.1-enable-spr.patch"
- # Disabled for now due to resistance
- # Kept here for easier rebuilds via ABS
- # https://bugs.archlinux.org/task/35274
- #
- # Enable subpixel hinting.
- #
- #patch -Np1 -i "$srcdir/freetype-2.5.1-enable-sph.patch"
+ patch -Np1 -i "${srcdir}/0001-Enable-table-validation-modules.patch"
+ patch -Np1 -i "${srcdir}/0002-Enable-subpixel-rendering.patch"
+ # https://bugs.archlinux.org/task/35274
+ patch -Np1 -i "${srcdir}/0003-Enable-subpixel-hinting.patch"
+ # Provide a way to enable the above patch at runtime.
+ # Hopefully just a temporary measure until fontconfig picks up
+ # the necessary configurables.
+ patch -Np1 -i "${srcdir}/0004-Mask-subpixel-hinting-with-an-env-var.patch"
}
build()
diff --git a/env_FT2_SUBPIXEL_HINTING.diff b/env_FT2_SUBPIXEL_HINTING.diff
deleted file mode 100644
index 3187ca0988cb..000000000000
--- a/env_FT2_SUBPIXEL_HINTING.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -u -r freetype-2.5.4/src/truetype/ttobjs.c freetype-2.5.4-env/src/truetype/ttobjs.c
---- freetype-2.5.4/src/truetype/ttobjs.c 2014-12-06 18:52:13.098214719 +0100
-+++ freetype-2.5.4-env/src/truetype/ttobjs.c 2014-12-10 09:13:04.418886699 +0100
-@@ -1264,10 +1264,11 @@
- return FT_THROW( Could_Not_Find_Context );
-
- #ifdef TT_CONFIG_OPTION_SUBPIXEL_HINTING
-- driver->interpreter_version = TT_INTERPRETER_VERSION_38;
--#else
-- driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-+ if ( getenv( "FT2_SUBPIXEL_HINTING" ) )
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_38;
-+ else
- #endif
-+ driver->interpreter_version = TT_INTERPRETER_VERSION_35;
-
- #else /* !TT_USE_BYTECODE_INTERPRETER */
-
diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch
deleted file mode 100644
index c78b6b70f6f5..000000000000
--- a/freetype-2.2.1-enable-valid.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
-
- # TrueType GX/AAT table validation. Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
-
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
-
- # OpenType table validation. Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
-
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/freetype-2.5.1-enable-sph.patch b/freetype-2.5.1-enable-sph.patch
deleted file mode 100644
index 69f73b7e36dc..000000000000
--- a/freetype-2.5.1-enable-sph.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/include/config/ftoption.h w/include/config/ftoption.h
-index fe2ba15..1ab4226 100644
---- i/include/config/ftoption.h
-+++ w/include/config/ftoption.h
-@@ -591,7 +591,7 @@ FT_BEGIN_HEADER
- /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
- /* defined. */
- /* */
--/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */
-+#define TT_CONFIG_OPTION_SUBPIXEL_HINTING
-
-
- /*************************************************************************/
diff --git a/freetype-2.5.1-enable-spr.patch b/freetype-2.5.1-enable-spr.patch
deleted file mode 100644
index 0d300a8dfcb0..000000000000
--- a/freetype-2.5.1-enable-spr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/include/config/ftoption.h w/include/config/ftoption.h
-index fe2ba15..22ce1a3 100644
---- i/include/config/ftoption.h
-+++ w/include/config/ftoption.h
-@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
- /* This is done to allow FreeType clients to run unmodified, forcing */
- /* them to display normal gray-level anti-aliased glyphs. */
- /* */
--/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
-+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
-
-
- /*************************************************************************/
diff --git a/libreoffice-uglyfix.patch b/libreoffice-uglyfix-noautohint.patch
index ae077d40aa7a..e08df761b4f3 100644
--- a/libreoffice-uglyfix.patch
+++ b/libreoffice-uglyfix-noautohint.patch
@@ -1,6 +1,6 @@
-diff -urN a/include/freetype.h b/include/freetype.h
---- a/include/freetype.h 2013-06-19 00:21:31.000000000 -0500
-+++ b/include/freetype.h 2013-08-25 16:23:40.602691844 -0500
+diff -urN a/include/freetype/freetype.h b/include/freetype/freetype.h
+--- a/include/freetype/freetype.h 2013-06-19 00:21:31.000000000 -0500
++++ b/include/freetype/freetype.h 2013-08-25 16:23:40.602691844 -0500
@@ -2568,7 +2568,7 @@
#define FT_LOAD_RENDER ( 1L << 2 )
#define FT_LOAD_NO_BITMAP ( 1L << 3 )