freetype2-old-hinting-2.7.1-1

3 files changed, 15 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b206d594c65e..78c1f3893dd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freetype2-old-hinting
 	pkgdesc = TrueType font rendering library (including old hinting engine)
-	pkgver = 2.7
-	pkgrel = 2
+	pkgver = 2.7.1
+	pkgrel = 1
 	url = http://www.freetype.org/
 	install = freetype2.install
 	arch = i686
@@ -13,32 +13,25 @@ pkgbase = freetype2-old-hinting
 	depends = sh
 	depends = libpng
 	depends = harfbuzz
-	optdepends = libx11: Some demo programs
 	provides = libfreetype.so
-	provides = freetype2=2.7-2
+	provides = freetype2=2.7.1-1
 	conflicts = freetype2
 	backup = etc/profile.d/freetype2.sh
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-2.7.tar.bz2.sig
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.tar.bz2.sig
-	source = http://download.savannah.gnu.org/releases/freetype/ft2demos-2.7.tar.bz2
-	source = http://download.savannah.gnu.org/releases/freetype/ft2demos-2.7.tar.bz2.sig
+	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2
+	source = https://download.savannah.gnu.org/releases/freetype/freetype-2.7.1.tar.bz2.sig
+	source = https://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.1.tar.bz2
+	source = https://download.savannah.gnu.org/releases/freetype/freetype-doc-2.7.1.tar.bz2.sig
 	source = 0001-Enable-table-validation-modules.patch
 	source = 0002-Enable-subpixel-rendering.patch
 	source = 0003-Enable-infinality-subpixel-hinting.patch
-	source = 0005-freetype-2.5.2-more-demos.patch
 	source = freetype2.sh
-	sha1sums = f251029d5ab542a96dd4531605fe577185077560
+	sha1sums = 4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789
 	sha1sums = SKIP
-	sha1sums = 22949e7c809d7d5931331ca54da30e4d195669ea
-	sha1sums = SKIP
-	sha1sums = b7f7633ca0b828ca319afdd09a81b42592685d9c
+	sha1sums = d8ce472cd775b8ce50d127689acab59181e72ecf
 	sha1sums = SKIP
 	sha1sums = b31882ef5e8447e761acee1c4a44c0630cd4d465
 	sha1sums = b1494810ed3aca25cdd8e8cedf634e5adfe6c09e
 	sha1sums = 41d27140fd590945e22e012c9dce62de3d6f11e6
-	sha1sums = 72cfecbe738085eec475e012617661ad0cc9b76f
 	sha1sums = bc6df1661c4c33e20f5ce30c2da8ad3c2083665f
 
 pkgname = freetype2-old-hinting
diff --git a/0005-freetype-2.5.2-more-demos.patch b/0005-freetype-2.5.2-more-demos.patch
deleted file mode 100644
index e737cb7dafe7..000000000000
--- a/0005-freetype-2.5.2-more-demos.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ft2demos-2.5.2/Makefile
-+++ ft2demos-2.5.2/Makefile
-@@ -296,10 +296,10 @@ else
-   # The following programs are not compiled automatically; either comment
-   # out the affected line or use the program name as a Makefile target.
-   #
--  # EXES += ftchkwd
--  # EXES += ftmemchk
--  # EXES += ftpatchk
--  # EXES += fttimer
-+  EXES += ftchkwd
-+  EXES += ftmemchk
-+  EXES += ftpatchk
-+  EXES += fttimer
-   # EXES += testname
- 
-   exes: $(EXES:%=$(BIN_DIR_2)/%$E)
diff --git a/PKGBUILD b/PKGBUILD
index 55954091a5de..f8605cf3e8fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 _origpkgname=freetype2
 pkgname=$_origpkgname-old-hinting
-pkgver=2.7
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
 pkgdesc="TrueType font rendering library (including old hinting engine)"
 arch=(i686 x86_64)
 license=('GPL')
@@ -14,29 +14,23 @@ url="http://www.freetype.org/"
 # introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
 depends=('zlib' 'bzip2' 'sh' 'libpng' 'harfbuzz')
 makedepends=('libx11')
-optdepends=('libx11: Some demo programs')
 provides=('libfreetype.so' $_origpkgname=$pkgver-$pkgrel)
 conflicts=($_origpkgname)
 install=freetype2.install
 backup=('etc/profile.d/freetype2.sh')
-source=(http://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
-        http://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
-        http://download.savannah.gnu.org/releases/freetype/ft2demos-${pkgver}.tar.bz2{,.sig}
+source=(https://download.savannah.gnu.org/releases/freetype/freetype-${pkgver}.tar.bz2{,.sig}
+        https://download.savannah.gnu.org/releases/freetype/freetype-doc-${pkgver}.tar.bz2{,.sig}
         0001-Enable-table-validation-modules.patch
         0002-Enable-subpixel-rendering.patch
         0003-Enable-infinality-subpixel-hinting.patch
-        0005-freetype-2.5.2-more-demos.patch
         freetype2.sh)
-sha1sums=('f251029d5ab542a96dd4531605fe577185077560'
+sha1sums=('4d08a9a6567c6332d58e9a5f9a7e9e3fbce66789'
           'SKIP'
-          '22949e7c809d7d5931331ca54da30e4d195669ea'
-          'SKIP'
-          'b7f7633ca0b828ca319afdd09a81b42592685d9c'
+          'd8ce472cd775b8ce50d127689acab59181e72ecf'
           'SKIP'
           'b31882ef5e8447e761acee1c4a44c0630cd4d465'
           'b1494810ed3aca25cdd8e8cedf634e5adfe6c09e'
           '41d27140fd590945e22e012c9dce62de3d6f11e6'
-          '72cfecbe738085eec475e012617661ad0cc9b76f'
           'bc6df1661c4c33e20f5ce30c2da8ad3c2083665f')
 validpgpkeys=('58E0C111E39F5408C5D3EC76C1A60EACE707FDA5')
 
@@ -50,23 +44,12 @@ prepare() {
   patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
 
   sed -ri 's|/\* +(#define +CFF_CONFIG_OPTION_OLD_ENGINE) +\*/|\1|' include/freetype/config/ftoption.h
-
-  cd ../ft2demos-${pkgver}
-  # enable more demos
-  patch -Np1 -i ../0005-freetype-2.5.2-more-demos.patch
-
-  # Suppress RPATH
-  sed -i '/X11_LIB:%=-R%/d' graph/x11/rules.mk
 }
 
 build() {
   cd freetype2
   ./configure --prefix=/usr --disable-static
   make
-
-  # Build demos
-  cd ../ft2demos-${pkgver}
-  make
 }
 
 check() {
@@ -82,10 +65,4 @@ package() {
   # Package docs
   install -dm755 "${pkgdir}/usr/share/doc"
   cp -a docs "${pkgdir}/usr/share/doc/${_origpkgname}"
-
-  # Package demos
-  cd ../ft2demos-${pkgver}
-  for _i in bin/{f,t}t*; do
-    libtool --mode=install install $_i "$pkgdir/usr/bin/"
-  done
 }