[arch-commits] Commit in libotf/trunk (PKGBUILD replace-freetype-config.patch)

2020-05-06 Thread Allan McRae via arch-commits 
Date: Thursday, May 7, 2020 @ 00:19:43
  Author: allan
Revision: 382459

upgpkg: libotf 0.9.16-3: Better freetype patch that keeps some variables needed 
elsewhere

Modified:
  libotf/trunk/PKGBUILD
  libotf/trunk/replace-freetype-config.patch

---+
 PKGBUILD  |4 +-
 replace-freetype-config.patch |   61 +++-
 2 files changed, 26 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-06 22:34:15 UTC (rev 382458)
+++ PKGBUILD2020-05-07 00:19:43 UTC (rev 382459)
@@ -3,7 +3,7 @@
 
 pkgname=libotf
 pkgver=0.9.16
-pkgrel=2
+pkgrel=3
 pkgdesc='OpenType Font library'
 url='https://www.nongnu.org/m17n/'
 license=('LGPL')
@@ -12,7 +12,7 @@
 
source=("https://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz";
 'replace-freetype-config.patch')
 sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b'
-'619d1af60f5189543c490976e390e405cd320eb7e52aae670521b9238bff2926')
+'edd0f86332f4d809dfb0ab66da547c946e5d79a907a7eaddc4d2166c78205668')
 
 prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"

Modified: replace-freetype-config.patch
===
--- replace-freetype-config.patch   2020-05-06 22:34:15 UTC (rev 382458)
+++ replace-freetype-config.patch   2020-05-07 00:19:43 UTC (rev 382459)
@@ -1,46 +1,33 @@
-From: Hilko Bengen 
-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 @@
+--- libotf-0.9.16/configure.ac
 libotf-0.9.16/configure.ac
+@@ -48,23 +48,24 @@
  AC_FUNC_ALLOCA
  AC_FUNC_MALLOC
  
--# Check for Freetype2 usability.
++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`
--  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
++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`;
--LIBS="$LIBS $FREETYPE_LD_FLAGS"
--AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
--   HAVE_FREETYPE=no)
--  fi
++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
++])
+ 
+ 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"
++  echo "Freetype library not found in your system!"
+   exit 1
+ fi
+ AC_SUBST(FREETYPE_INC)

[arch-commits] Commit in libotf/trunk (PKGBUILD replace-freetype-config.patch)

2020-05-06 Thread Allan McRae via arch-commits 
Date: Wednesday, May 6, 2020 @ 16:07:43
  Author: allan
Revision: 382416

upgpkg: libotf 0.9.16-2: fix FTBFS

Added:
  libotf/trunk/replace-freetype-config.patch
Modified:
  libotf/trunk/PKGBUILD

---+
 PKGBUILD  |   14 +---
 replace-freetype-config.patch |   46 
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-06 15:46:29 UTC (rev 382415)
+++ PKGBUILD2020-05-06 16:07:43 UTC (rev 382416)
@@ -3,17 +3,25 @@
 
 pkgname=libotf
 pkgver=0.9.16
-pkgrel=1
+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";)
-sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b')
+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
 }

Added: replace-freetype-config.patch
===
--- replace-freetype-config.patch   (rev 0)
+++ replace-freetype-config.patch   2020-05-06 16:07:43 UTC (rev 382416)
@@ -0,0 +1,46 @@
+From: Hilko Bengen 
+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"

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2019-05-06 Thread Antonio Rojas via arch-commits 
Date: Monday, May 6, 2019 @ 20:21:53
  Author: arojas
Revision: 352611

https

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-06 20:21:18 UTC (rev 352610)
+++ PKGBUILD2019-05-06 20:21:53 UTC (rev 352611)
@@ -5,11 +5,11 @@
 pkgver=0.9.16
 pkgrel=1
 pkgdesc='OpenType Font library'
-url='http://www.nongnu.org/m17n/'
+url='https://www.nongnu.org/m17n/'
 license=('LGPL')
 arch=('x86_64')
 depends=('libxaw' 'freetype2')
-source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz";)
+source=("https://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz";)
 sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b')
 
 build() {

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2018-02-08 Thread Gaëtan Bisson via arch-commits 
Date: Thursday, February 8, 2018 @ 23:00:31
  Author: bisson
Revision: 316488

upstream update

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-08 21:53:08 UTC (rev 316487)
+++ PKGBUILD2018-02-08 23:00:31 UTC (rev 316488)
@@ -3,15 +3,15 @@
 # Contributor: Ashish Shukla 
 
 pkgname=libotf
-pkgver=0.9.13
-pkgrel=2
+pkgver=0.9.16
+pkgrel=1
 pkgdesc='OpenType Font library'
 url='http://www.nongnu.org/m17n/'
 license=('LGPL')
 arch=('x86_64')
 depends=('libxaw' 'freetype2')
-source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz";)
-sha256sums=('7bc466ba50425f95b52de12b4ad35320acefcef13ce67bf33edc14abdcfe6908')
+source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz";)
+sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2017-03-01 Thread Gaëtan Bisson 
Date: Thursday, March 2, 2017 @ 01:33:47
  Author: bisson
Revision: 289813

switch to sha256sum

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-02 01:33:31 UTC (rev 289812)
+++ PKGBUILD2017-03-02 01:33:47 UTC (rev 289813)
@@ -11,7 +11,7 @@
 arch=('i686' 'x86_64')
 depends=('libxaw' 'freetype2')
 
source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz";)
-sha1sums=('66bb81958f5f07ee1f8917d3cb7e359ae559d873')
+sha256sums=('7bc466ba50425f95b52de12b4ad35320acefcef13ce67bf33edc14abdcfe6908')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2014-06-30 Thread Gaetan Bisson 
Date: Monday, June 30, 2014 @ 12:40:06
  Author: bisson
Revision: 215721

rebuild for mtree support

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-30 10:39:24 UTC (rev 215720)
+++ PKGBUILD2014-06-30 10:40:06 UTC (rev 215721)
@@ -4,7 +4,7 @@
 
 pkgname=libotf
 pkgver=0.9.13
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenType Font library'
 url='http://www.nongnu.org/m17n/'
 license=('LGPL')

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2013-10-26 Thread Gaetan Bisson 
Date: Saturday, October 26, 2013 @ 09:50:46
  Author: bisson
Revision: 197480

remove options enforced by newer pacman

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 07:50:41 UTC (rev 197479)
+++ PKGBUILD2013-10-26 07:50:46 UTC (rev 197480)
@@ -8,7 +8,6 @@
 pkgdesc='OpenType Font library'
 url='http://www.nongnu.org/m17n/'
 license=('LGPL')
-options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('libxaw' 'freetype2')
 
source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz";)
@@ -16,7 +15,7 @@
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure --prefix=/usr --disable-static
+   ./configure --prefix=/usr
make
 }

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2012-11-27 Thread Gaetan Bisson 
Date: Wednesday, November 28, 2012 @ 01:09:32
  Author: bisson
Revision: 172089

upstream update

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-27 19:16:47 UTC (rev 172088)
+++ PKGBUILD2012-11-28 06:09:32 UTC (rev 172089)
@@ -1,17 +1,18 @@
 # $Id$
+# Maintainer: Gaetan Bisson 
 # Contributor: Ashish Shukla 
 
 pkgname=libotf
-pkgver=0.9.12
-pkgrel=2
+pkgver=0.9.13
+pkgrel=1
 pkgdesc='OpenType Font library'
-url='http://www.m17n.org/libotf/'
+url='http://www.nongnu.org/m17n/'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('libxaw' 'freetype2')
-source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz";)
-sha1sums=('47872f696a62e8f111960143f3f36b5366398e20')
+source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz";)
+sha1sums=('66bb81958f5f07ee1f8917d3cb7e359ae559d873')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2012-02-05 Thread Gaetan Bisson 
Date: Sunday, February 5, 2012 @ 10:12:30
  Author: bisson
Revision: 149037

signed rebuild for free

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-05 15:10:20 UTC (rev 149036)
+++ PKGBUILD2012-02-05 15:12:30 UTC (rev 149037)
@@ -3,19 +3,19 @@
 
 pkgname=libotf
 pkgver=0.9.12
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenType Font library'
 url='http://www.m17n.org/libotf/'
+license=('LGPL')
+options=('!libtool')
 arch=('i686' 'x86_64')
-license=('LGPL')
 depends=('libxaw' 'freetype2')
-options=('!libtool')
 source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz";)
 sha1sums=('47872f696a62e8f111960143f3f36b5366398e20')
 
 build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure --prefix=/usr
+   ./configure --prefix=/usr --disable-static
make
 }

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2010-11-26 Thread Gaetan Bisson 
Date: Friday, November 26, 2010 @ 12:51:11
  Author: bisson
Revision: 100934

minor upstream update

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-26 17:44:13 UTC (rev 100933)
+++ PKGBUILD2010-11-26 17:51:11 UTC (rev 100934)
@@ -2,7 +2,7 @@
 # Contributor: Ashish Shukla 
 
 pkgname=libotf
-pkgver=0.9.11
+pkgver=0.9.12
 pkgrel=1
 pkgdesc='OpenType Font library'
 url='http://www.m17n.org/libotf/'
@@ -11,15 +11,15 @@
 depends=('libxaw' 'freetype2')
 options=('!libtool')
 source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz";)
-sha1sums=('e20889a163ecb336ddc827814a21a3ba76dbc1fc')
+sha1sums=('47872f696a62e8f111960143f3f36b5366398e20')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   ./configure --prefix=/usr
+   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make DESTDIR="${pkgdir}" install
 }

[arch-commits] Commit in libotf/trunk (PKGBUILD)

2010-08-19 Thread Gaetan Bisson 
Date: Thursday, August 19, 2010 @ 09:03:17
  Author: bisson
Revision: 88090

minor upstream update

Modified:
  libotf/trunk/PKGBUILD

--+
 PKGBUILD |   21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-19 13:00:48 UTC (rev 88089)
+++ PKGBUILD2010-08-19 13:03:17 UTC (rev 88090)
@@ -2,21 +2,24 @@
 # Contributor: Ashish Shukla 
 
 pkgname=libotf
-pkgver=0.9.9
+pkgver=0.9.11
 pkgrel=1
-pkgdesc="OpenType Font library"
-url="http://www.m17n.org/libotf/";
+pkgdesc='OpenType Font library'
+url='http://www.m17n.org/libotf/'
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('libxaw' 'freetype2')
 options=('!libtool')
-source=(http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz)
-md5sums=('95e5452263bf8e75ece988e6d827b55c')
-sha1sums=('b0135fc55e599bf2fcecd7ff440e155511166e4f')
+source=("http://www.m17n.org/libotf/${pkgname}-${pkgver}.tar.gz";)
+sha1sums=('e20889a163ecb336ddc827814a21a3ba76dbc1fc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}