[arch-commits] Commit in lib32-sdl2_ttf/trunk (PKGBUILD freetype-pkgconfig.patch)

[Levente Polyak]

    Date: Wednesday, March 6, 2019 @ 23:15:54
  Author: anthraxx
Revision: 437955

upgpkg: lib32-sdl2_ttf 2.0.15-1

Modified:
  lib32-sdl2_ttf/trunk/PKGBUILD
Deleted:
  lib32-sdl2_ttf/trunk/freetype-pkgconfig.patch

--------------------------+
 PKGBUILD                 |   14 +++----------
 freetype-pkgconfig.patch |   46 ---------------------------------------------
 2 files changed, 4 insertions(+), 56 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-06 23:11:03 UTC (rev 437954)
+++ PKGBUILD	2019-03-06 23:15:54 UTC (rev 437955)
@@ -3,24 +3,18 @@
 # Contributor: carstene1ns <arch carsten-teibes de>
 
 pkgname=lib32-sdl2_ttf
-pkgver=2.0.14
-pkgrel=3
+pkgver=2.0.15
+pkgrel=1
 pkgdesc='Library that allows you to use TrueType fonts in your SDL applications (Version 2) (32-bit)'
 url='https://www.libsdl.org/projects/SDL_ttf'
 arch=('x86_64')
 license=('MIT')
 depends=('lib32-sdl2' 'lib32-freetype2')
-source=(https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz
-        freetype-pkgconfig.patch)
-sha512sums=('4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099'
-            'abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937')
+source=(https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz)
+sha512sums=('30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd')
 
 prepare() {
   cd SDL2_ttf-${pkgver}
-
-  # Fix build with FreeType 2.9.1
-  patch -Np1 -i ../freetype-pkgconfig.patch
-
   touch NEWS README AUTHORS ChangeLog
   autoreconf -vi
 }

Deleted: freetype-pkgconfig.patch
===================================================================
--- freetype-pkgconfig.patch	2019-03-06 23:11:03 UTC (rev 437954)
+++ freetype-pkgconfig.patch	2019-03-06 23:15:54 UTC (rev 437955)
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/654758
-
---- SDL_ttf-2.0.11/configure.in
-+++ SDL_ttf-2.0.11/configure.in
-@@ -64,6 +64,7 @@
- 	;;
- esac
- 
-+PKG_PROG_PKG_CONFIG
- 
- dnl Check for iconv (character conversion library; see iconv.m4)
- dnl This isn't available on many systems
-@@ -94,6 +95,17 @@
- dnl
- dnl Get the cflags and libraries from the freetype-config script
- dnl
-+PKG_CHECK_MODULES(
-+	FREETYPE2,
-+	freetype2,
-+	[
-+		ft_found=yes
-+		CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+		LIBS="$LIBS $FREETYPE2_LIBS"
-+	],
-+	ft_found=no
-+)
-+
- AC_ARG_WITH(freetype-prefix,[  --with-freetype-prefix=PFX   Prefix where FREETYPE is 
- installed (optional)],
-             freetype_prefix="$withval", freetype_prefix="")
-@@ -101,6 +113,7 @@
- where FREETYPE is installed (optional)],
-             freetype_exec_prefix="$withval", freetype_exec_prefix="")
- 
-+if test "x$ft_found" != "xyes" ; then
- if test x$freetype_exec_prefix != x ; then
-      freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
-      if test x${FREETYPE_CONFIG+set} != xset ; then
-@@ -123,6 +136,7 @@
-     CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
-     LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
- fi
-+fi
- 
- dnl Check for SDL
- SDL_VERSION=1.2.4