[arch-commits] Commit in libotf/repos/extra-x86_64 (4 files)

[Allan McRae]

    Date: Thursday, May 7, 2020 @ 00:20:26
  Author: allan
Revision: 382460

archrelease: copy trunk to extra-x86_64

Added:
  libotf/repos/extra-x86_64/PKGBUILD
    (from rev 382459, libotf/trunk/PKGBUILD)
  libotf/repos/extra-x86_64/replace-freetype-config.patch
    (from rev 382459, libotf/trunk/replace-freetype-config.patch)
Deleted:
  libotf/repos/extra-x86_64/PKGBUILD
  libotf/repos/extra-x86_64/replace-freetype-config.patch

-------------------------------+
 PKGBUILD                      |   64 ++++++++++++++++----------------
 replace-freetype-config.patch |   79 ++++++++++++++++------------------------
 2 files changed, 65 insertions(+), 78 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-07 00:19:43 UTC (rev 382459)
+++ PKGBUILD	2020-05-07 00:20:26 UTC (rev 382460)
@@ -1,32 +0,0 @@
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Ashish Shukla <wahjava.ml at gmail.com>
-
-pkgname=libotf
-pkgver=0.9.16
-pkgrel=2
-pkgdesc='OpenType Font library'
-url='https://www.nongnu.org/m17n/'
-license=('LGPL')
-arch=('x86_64')
-depends=('libxaw' 'freetype2')
-source=("https://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz"
-        'replace-freetype-config.patch')
-sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b'
-            '619d1af60f5189543c490976e390e405cd320eb7e52aae670521b9238bff2926')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ${srcdir}/replace-freetype-config.patch
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	autoreconf -i
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: libotf/repos/extra-x86_64/PKGBUILD (from rev 382459, libotf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-07 00:20:26 UTC (rev 382460)
@@ -0,0 +1,32 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Ashish Shukla <wahjava.ml at gmail.com>
+
+pkgname=libotf
+pkgver=0.9.16
+pkgrel=3
+pkgdesc='OpenType Font library'
+url='https://www.nongnu.org/m17n/'
+license=('LGPL')
+arch=('x86_64')
+depends=('libxaw' 'freetype2')
+source=("https://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz"
+        'replace-freetype-config.patch')
+sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b'
+            'edd0f86332f4d809dfb0ab66da547c946e5d79a907a7eaddc4d2166c78205668')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ${srcdir}/replace-freetype-config.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	autoreconf -i
+	./configure --prefix=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Deleted: replace-freetype-config.patch
===================================================================
--- replace-freetype-config.patch	2020-05-07 00:19:43 UTC (rev 382459)
+++ replace-freetype-config.patch	2020-05-07 00:20:26 UTC (rev 382460)
@@ -1,46 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 27 Oct 2018 00:53:35 +0200
-Subject: Use pkg-config for freetype
-
----
- configure.ac | 29 ++++++++---------------------
- 1 file changed, 8 insertions(+), 21 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,27 +48,14 @@
- AC_FUNC_ALLOCA
- AC_FUNC_MALLOC
- 
--# Check for Freetype2 usability.
--AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
--if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
--  FREETYPE_INC=`freetype-config --cflags`
--  CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
--  AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
--  			      HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS)
--  if test "x$HAVE_FREETYPE" = "xyes" ; then
--    FREETYPE_LD_FLAGS=`freetype-config --libs`;
--    LIBS="$LIBS $FREETYPE_LD_FLAGS"
--    AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
--    			   		     HAVE_FREETYPE=no)
--  fi
--fi
--
--if test "x$HAVE_FREETYPE" != "xyes" ; then
--  echo "Freetype library wan't found in your system!"
--  exit 1
--fi
--AC_SUBST(FREETYPE_INC)
--AC_SUBST(FREETYPE_LD_FLAGS)
-+PKG_CHECK_MODULES(
-+        [FREETYPE],
-+        [freetype2],
-+        [
-+                CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
-+                LIBS="$LIBS $FREETYPE_LIBS"
-+        ],
-+        [AC_MSG_ERROR([Can't find Freetype library])])
- 
- if test "x$no_x" != "xyes"; then
-   X11_XT_XAW_XMU="-lX11 -lXt -lXaw -lXmu"

Copied: libotf/repos/extra-x86_64/replace-freetype-config.patch (from rev 382459, libotf/trunk/replace-freetype-config.patch)
===================================================================
--- replace-freetype-config.patch	                        (rev 0)
+++ replace-freetype-config.patch	2020-05-07 00:20:26 UTC (rev 382460)
@@ -0,0 +1,33 @@
+--- libotf-0.9.16/configure.ac
++++ libotf-0.9.16/configure.ac
+@@ -48,23 +48,24 @@
+ AC_FUNC_ALLOCA
+ AC_FUNC_MALLOC
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Check for Freetype2 usability.
+-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+-  FREETYPE_INC=`freetype-config --cflags`
++PKG_CHECK_MODULES(FREETYPE, freetype2, [
++  FREETYPE_INC="$FREETYPE_CFLAGS"
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+   AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
+   			      HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS)
+   if test "x$HAVE_FREETYPE" = "xyes" ; then
+-    FREETYPE_LD_FLAGS=`freetype-config --libs`;
++    FREETYPE_LD_FLAGS="$FREETYPE_LIBS"
+     LIBS="$LIBS $FREETYPE_LD_FLAGS"
+     AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
+     			   		     HAVE_FREETYPE=no)
+   fi
+-fi
++])
+ 
+ if test "x$HAVE_FREETYPE" != "xyes" ; then
+-  echo "Freetype library wan't found in your system!"
++  echo "Freetype library not found in your system!"
+   exit 1
+ fi
+ AC_SUBST(FREETYPE_INC)