Date: Tuesday, December 27, 2022 @ 12:17:47
  Author: felixonmars
Revision: 464876

archrelease: copy trunk to extra-x86_64

Added:
  libwmf/repos/extra-x86_64/PKGBUILD
    (from rev 464875, libwmf/trunk/PKGBUILD)
  libwmf/repos/extra-x86_64/libwmf-freetype.patch
    (from rev 464875, libwmf/trunk/libwmf-freetype.patch)
Deleted:
  libwmf/repos/extra-x86_64/PKGBUILD
  libwmf/repos/extra-x86_64/libwmf-freetype.patch

-----------------------+
 PKGBUILD              |   76 ++++++++++++++--------------
 libwmf-freetype.patch |  130 ++++++++++++++++++++++++------------------------
 2 files changed, 103 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2022-12-27 12:17:33 UTC (rev 464875)
+++ PKGBUILD    2022-12-27 12:17:47 UTC (rev 464876)
@@ -1,38 +0,0 @@
-# Maintainer: Eric Bélanger <[email protected]>
-
-pkgname=libwmf
-pkgver=0.2.12
-pkgrel=2
-pkgdesc="A library for reading vector images in Microsoft's native Windows 
Metafile Format (WMF)"
-arch=('x86_64')
-url="http://wvware.sourceforge.net/libwmf.html";
-license=('LGPL')
-depends=('libx11' 'libjpeg' 'gsfonts' 'freetype2' 'expat')
-makedepends=('gtk2' 'libxt')
-optdepends=('gdk-pixbuf2: for pixbuf loader')
-options=('!docs' '!emptydirs')
-source=($pkgname-$pkgver.tar.gz::https://github.com/caolanm/libwmf/archive/v$pkgver.tar.gz
 libwmf-freetype.patch)
-sha1sums=('490a26175ad667fbc0c009d390bf56644919bed6'
-          'ef4d452cd5e7fcb36751771c6f44b4b7a3f8693a')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ../libwmf-freetype.patch # Port away from freetype-config, 
patch from openembedded.org
-  autoreconf -vif -Ipatches
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --with-gsfontdir=/usr/share/fonts/Type1 \
-             --with-fontdir=/usr/share/fonts/Type1 \
-             
--with-gsfontmap=/usr/share/ghostscript/9.10/Resource/Init/Fontmap.GS
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install -j1
-  #Remove fonts, these are in gsfonts
-  rm -rf "${pkgdir}/usr/share/fonts"
-}

Copied: libwmf/repos/extra-x86_64/PKGBUILD (from rev 464875, 
libwmf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2022-12-27 12:17:47 UTC (rev 464876)
@@ -0,0 +1,38 @@
+# Maintainer: Eric Bélanger <[email protected]>
+
+pkgname=libwmf
+pkgver=0.2.12
+pkgrel=3
+pkgdesc="A library for reading vector images in Microsoft's native Windows 
Metafile Format (WMF)"
+arch=('x86_64')
+url="http://wvware.sourceforge.net/libwmf.html";
+license=('LGPL')
+depends=('libx11' 'libjpeg' 'gsfonts' 'freetype2' 'expat')
+makedepends=('gtk2' 'libxt')
+optdepends=('gdk-pixbuf2: for pixbuf loader')
+options=('!docs' '!emptydirs')
+source=($pkgname-$pkgver.tar.gz::https://github.com/caolanm/libwmf/archive/v$pkgver.tar.gz
 libwmf-freetype.patch)
+sha256sums=('464ff63605d7eaf61a4a12dbd420f7a41a4d854675d8caf37729f5bc744820e2'
+            'c3b25a70ba55893fdd7637893a3852894260ed94c029f2b3916fc3df3fde32b8')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ../libwmf-freetype.patch # Port away from freetype-config, 
patch from openembedded.org
+  autoreconf -vif -Ipatches
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+              --with-gsfontdir=/usr/share/fonts/Type1 \
+             --with-fontdir=/usr/share/fonts/Type1 \
+             
--with-gsfontmap=/usr/share/ghostscript/9.10/Resource/Init/Fontmap.GS
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install -j1
+  #Remove fonts, these are in gsfonts
+  rm -rf "${pkgdir}/usr/share/fonts"
+}

Deleted: libwmf-freetype.patch
===================================================================
--- libwmf-freetype.patch       2022-12-27 12:17:33 UTC (rev 464875)
+++ libwmf-freetype.patch       2022-12-27 12:17:47 UTC (rev 464876)
@@ -1,65 +0,0 @@
-From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <[email protected]>
-Date: Wed, 6 Aug 2014 14:53:03 +0200
-Subject: [PATCH] configure: use pkg-config for freetype
-
-Upstream-status: Pending
-Signed-off-by: Koen Kooi <[email protected]>
----
- configure.ac | 37 ++++++++-----------------------------
- 1 file changed, 8 insertions(+), 29 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3cfe974..0055a8c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[  --with-freetype=DIR     use 
freetype2 in DIR],[
-       fi
- ])
- 
--if [ test -n "$FREETYPE_DIR" ]; then
--      AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, 
,[$FREETYPE_DIR/bin:$PATH])
--else
--      AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
--fi
--
--if [ test -n "$FREETYPE_CONFIG" ]; then
--      if [ test -n "$FREETYPE_DIR" ]; then
--              freetype_cflags="`$FREETYPE_CONFIG --cflags` 
-I$FREETYPE_DIR/include"
--              freetype_libs=`$FREETYPE_CONFIG --libs`
--      else
--              freetype_cflags=`$FREETYPE_CONFIG --cflags`
--              freetype_libs=`$FREETYPE_CONFIG --libs`
--      fi
--else
--      if [ test -n "$FREETYPE_DIR" ]; then
--              freetype_cflags="-I$FREETYPE_DIR/include/freetype2 
-I$FREETYPE_DIR/include"
--              freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
--      else
--              freetype_cflags=""
--              freetype_libs="-lfreetype"
--      fi
--fi
--
--CPPFLAGS="$freetype_cflags $CPPFLAGS"
--LDFLAGS="$LDFLAGS $freetype_libs"
-+PKG_CHECK_MODULES(FREETYPE2, freetype2, 
-+    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+    LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
-+    AC_MSG_ERROR([*** Unable to find FreeType2 library 
(http://www.freetype.org/)])
-+)
- 
- AC_CHECK_LIB(freetype,FT_Init_FreeType,[
--      WMF_FT_LDFLAGS="$freetype_libs"
-+      WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
- ],[   AC_MSG_ERROR([* * * freetype(2) is required * * *])
- ])
- AC_CHECK_HEADER(ft2build.h,[
--      WMF_FT_CFLAGS="$freetype_cflags"
--      WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
-+      WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
-+      WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
- ],[   AC_MSG_ERROR([* * * freetype(2) is required * * *])
- ])
- 
-

Copied: libwmf/repos/extra-x86_64/libwmf-freetype.patch (from rev 464875, 
libwmf/trunk/libwmf-freetype.patch)
===================================================================
--- libwmf-freetype.patch                               (rev 0)
+++ libwmf-freetype.patch       2022-12-27 12:17:47 UTC (rev 464876)
@@ -0,0 +1,65 @@
+From 61655f82224cadb261e81f8bae111eaaa7bdf531 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <[email protected]>
+Date: Wed, 6 Aug 2014 14:53:03 +0200
+Subject: [PATCH] configure: use pkg-config for freetype
+
+Upstream-status: Pending
+Signed-off-by: Koen Kooi <[email protected]>
+---
+ configure.ac | 37 ++++++++-----------------------------
+ 1 file changed, 8 insertions(+), 29 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3cfe974..0055a8c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -399,40 +399,19 @@ AC_ARG_WITH(freetype,[  --with-freetype=DIR     use 
freetype2 in DIR],[
+       fi
+ ])
+ 
+-if [ test -n "$FREETYPE_DIR" ]; then
+-      AC_PATH_PROG(FREETYPE_CONFIG,freetype-config, 
,[$FREETYPE_DIR/bin:$PATH])
+-else
+-      AC_PATH_PROG(FREETYPE_CONFIG,freetype-config)
+-fi
+-
+-if [ test -n "$FREETYPE_CONFIG" ]; then
+-      if [ test -n "$FREETYPE_DIR" ]; then
+-              freetype_cflags="`$FREETYPE_CONFIG --cflags` 
-I$FREETYPE_DIR/include"
+-              freetype_libs=`$FREETYPE_CONFIG --libs`
+-      else
+-              freetype_cflags=`$FREETYPE_CONFIG --cflags`
+-              freetype_libs=`$FREETYPE_CONFIG --libs`
+-      fi
+-else
+-      if [ test -n "$FREETYPE_DIR" ]; then
+-              freetype_cflags="-I$FREETYPE_DIR/include/freetype2 
-I$FREETYPE_DIR/include"
+-              freetype_libs="-L$FREETYPE_DIR/lib -lfreetype"
+-      else
+-              freetype_cflags=""
+-              freetype_libs="-lfreetype"
+-      fi
+-fi
+-
+-CPPFLAGS="$freetype_cflags $CPPFLAGS"
+-LDFLAGS="$LDFLAGS $freetype_libs"
++PKG_CHECK_MODULES(FREETYPE2, freetype2, 
++    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++    LDFLAGS="$LDFLAGS $FREETYPE2_LIBS",
++    AC_MSG_ERROR([*** Unable to find FreeType2 library 
(http://www.freetype.org/)])
++)
+ 
+ AC_CHECK_LIB(freetype,FT_Init_FreeType,[
+-      WMF_FT_LDFLAGS="$freetype_libs"
++      WMF_FT_LDFLAGS="$FREETYPE2_LIBS"
+ ],[   AC_MSG_ERROR([* * * freetype(2) is required * * *])
+ ])
+ AC_CHECK_HEADER(ft2build.h,[
+-      WMF_FT_CFLAGS="$freetype_cflags"
+-      WMF_FT_CONFIG_CFLAGS="$freetype_cflags"
++      WMF_FT_CFLAGS="$FREETYPE2_CFLAGS"
++      WMF_FT_CONFIG_CFLAGS="$FREETYPE2_CFLAGS"
+ ],[   AC_MSG_ERROR([* * * freetype(2) is required * * *])
+ ])
+ 
+

Reply via email to