[arch-commits] Commit in lib32-freetype2/trunk (3 files)

[Florian Pritz]

    Date: Tuesday, December 3, 2013 @ 23:37:09
  Author: bluewind
Revision: 102012

upgpkg: lib32-freetype2 2.5.1-1

upstream update

Added:
  lib32-freetype2/trunk/freetype-2.5.1-enable-spr.patch
Modified:
  lib32-freetype2/trunk/PKGBUILD
Deleted:
  lib32-freetype2/trunk/freetype-2.3.0-enable-spr.patch

---------------------------------+
 PKGBUILD                        |   20 ++++++++++++--------
 freetype-2.3.0-enable-spr.patch |   11 -----------
 freetype-2.5.1-enable-spr.patch |   13 +++++++++++++
 3 files changed, 25 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-03 22:31:37 UTC (rev 102011)
+++ PKGBUILD	2013-12-03 22:37:09 UTC (rev 102012)
@@ -4,22 +4,28 @@
 
 _pkgbasename=freetype2
 pkgname=lib32-$_pkgbasename
-pkgver=2.5.0.1
+pkgver=2.5.1
 pkgrel=1
 pkgdesc="TrueType font rendering library (32-bit)"
 arch=(x86_64)
 license=('GPL')
 url="http://freetype.sourceforge.net"
-depends=('lib32-zlib' 'lib32-bzip2' $_pkgbasename)
+depends=('lib32-zlib' 'lib32-bzip2' 'lib32-libpng' $_pkgbasename)
 makedepends=(gcc-multilib)
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
-        freetype-2.3.0-enable-spr.patch
+        freetype-2.5.1-enable-spr.patch
         freetype-2.2.1-enable-valid.patch)
-md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a'
-         '816dc8619a6904a7385769433c0a8653'
+md5sums=('93eba7854094f46d7d98a9a2370af4d6'
+         '80a14cce234f3f190cd936ca9060c398'
          '214119610444c9b02766ccee5e220680')
 
+prepare() {
+  cd "${srcdir}/freetype-${pkgver}"
+  patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch"
+  patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
+}
+
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
@@ -26,10 +32,8 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/freetype-${pkgver}"
-  patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
-  patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
 
-  ./configure --prefix=/usr --libdir=/usr/lib32 --without-png
+  ./configure --prefix=/usr --libdir=/usr/lib32
   make
 }
 

Deleted: freetype-2.3.0-enable-spr.patch
===================================================================
--- freetype-2.3.0-enable-spr.patch	2013-12-03 22:31:37 UTC (rev 102011)
+++ freetype-2.3.0-enable-spr.patch	2013-12-03 22:37:09 UTC (rev 102012)
@@ -1,11 +0,0 @@
---- freetype-2.3.0/include/freetype/config/ftoption.h.spf	2007-01-18 14:27:34.000000000 -0500
-+++ freetype-2.3.0/include/freetype/config/ftoption.h	2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
-   /* 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
- 
- 
-   /*************************************************************************/

Added: freetype-2.5.1-enable-spr.patch
===================================================================
--- freetype-2.5.1-enable-spr.patch	                        (rev 0)
+++ freetype-2.5.1-enable-spr.patch	2013-12-03 22:37:09 UTC (rev 102012)
@@ -0,0 +1,13 @@
+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
+ 
+ 
+   /*************************************************************************/