[arch-commits] Commit in recode/trunk (4 files)
Christian Hesse
eworm at archlinux.org
Sat Feb 3 14:17:26 UTC 2018
Date: Saturday, February 3, 2018 @ 14:17:26
Author: eworm
Revision: 315800
upgpkg: recode 3.7-1
new upstream release
Modified:
recode/trunk/PKGBUILD
Deleted:
recode/trunk/recode-3.6-as-if.patch
recode/trunk/recode-3.6-gcc43.patch
recode/trunk/recode-3.6-gettextfix.diff
----------------------------+
PKGBUILD | 45 +++++++++++++++----------------------------
recode-3.6-as-if.patch | 19 ------------------
recode-3.6-gcc43.patch | 20 -------------------
recode-3.6-gettextfix.diff | 23 ---------------------
4 files changed, 16 insertions(+), 91 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-03 14:05:52 UTC (rev 315799)
+++ PKGBUILD 2018-02-03 14:17:26 UTC (rev 315800)
@@ -3,43 +3,30 @@
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
pkgname=recode
-pkgver=3.6
-pkgrel=10
+pkgver=3.7
+pkgrel=1
pkgdesc="Converts files between various character sets and usages"
arch=('x86_64')
-url="http://recode.progiciels-bpi.ca/index.html"
-license=('GPL' 'LGPL')
+url='https://github.com/rrthomas/recode'
+license=('GPL3' 'LGPL3')
depends=('glibc')
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
- 'http://archive.debian.org/debian/pool/main/r/recode/recode_3.6-17.diff.gz'
- 'recode-3.6-as-if.patch'
- 'recode-3.6-gettextfix.diff')
-sha256sums=('a9beecec22be42b1096de74d4dfb1051fa9cd252e4ae149d8aa6b5243d729e5e'
- '57fefbf3a7b7ba9a1feed7c0749a4415c14d0cfc36d5071f354e3962f87b99c7'
- '9ab5b40dd93461ca95c5f5dd197bbe0767c45fe64fb1898f073a24c5705822b5'
- 'eb080ec09e508f24974d3bed2dc114d2d8c5d69615e98beea67aa07d4a1e076b')
+makedepends=('python')
+source=("https://github.com/rrthomas/recode/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('188ce229f01485ecd847b9c2828615c14611473efffbab04b5e2fe138f839e64')
-prepare() {
- cd pinard-Recode-2127b34
- patch -Np1 -i "${srcdir}/recode-3.6-as-if.patch"
- patch -Np1 -i "${srcdir}/recode-3.6-gettextfix.diff"
- patch -Np1 -i "${srcdir}/recode_3.6-17.diff"
- sed -i '1i#include <stdlib.h>' src/argmatch.c
- sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
- configure.in src/Makefile.am
-}
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
-build() {
- cd pinard-Recode-2127b34
- rm -f acinclude.m4
- autoreconf -fi
- libtoolize
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --infodir=/usr/share/info --without-included-gettext
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --without-included-gettext
make
}
package() {
- cd pinard-Recode-2127b34
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
make DESTDIR="${pkgdir}" install
}
Deleted: recode-3.6-as-if.patch
===================================================================
--- recode-3.6-as-if.patch 2018-02-03 14:05:52 UTC (rev 315799)
+++ recode-3.6-as-if.patch 2018-02-03 14:17:26 UTC (rev 315800)
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/283029
-
---- a/m4/flex.m4
-+++ b/m4/flex.m4
-@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
- dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
- AC_DEFUN(ad_AC_PROG_FLEX,
- [AC_CHECK_PROGS(LEX, flex, missing)
--if test "$LEX" = missing; then
-+AS_IF([test "$LEX" = missing], [dnl
- LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
- LEX_OUTPUT_ROOT=lex.yy
- AC_SUBST(LEX_OUTPUT_ROOT)dnl
--else
-+], [:
- AC_PROG_LEX
- AC_DECL_YYTEXT
--fi])
-+])])
Deleted: recode-3.6-gcc43.patch
===================================================================
--- recode-3.6-gcc43.patch 2018-02-03 14:05:52 UTC (rev 315799)
+++ recode-3.6-gcc43.patch 2018-02-03 14:17:26 UTC (rev 315800)
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/209036
-
-fix building with gcc-4.3
-
---- src/recodext.h 2008-04-03 18:35:42 +0000
-+++ src/recodext.h 2008-04-03 18:36:32 +0000
-@@ -215,10 +215,10 @@
- struct recode_single *unsurfacer;
-
- /* Non zero if this is an acceptable charset (not only a surface). */
-- enum recode_symbol_type type : 3;
-+ enum recode_symbol_type type : 2;
-
- /* Non zero if this one should be ignored. */
-- bool ignore : 2;
-+ bool ignore : 1;
- };
-
- struct recode_surface_list
-
Deleted: recode-3.6-gettextfix.diff
===================================================================
--- recode-3.6-gettextfix.diff 2018-02-03 14:05:52 UTC (rev 315799)
+++ recode-3.6-gettextfix.diff 2018-02-03 14:17:26 UTC (rev 315800)
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/239372
-
-patch by Dmitry Karasik
-
---- recode-3.6/m4/gettext.m4
-+++ recode-3.6/m4/gettext.m4
-@@ -109,12 +109,12 @@
- else
- ac_items="$LINGUAS"
- for ac_item in $ac_items; do
-- case "$ALL_LINGUAS" in
-- *$ac_item*)
-+ for supported_item in $ALL_LINGUAS; do
-+ if test "$ac_item" = "$supported_item"; then
- ac_print="$ac_print $ac_item"
- MOFILES="$MOFILES $ac_item.mo"
-- ;;
-- esac
-+ fi
-+ done
- done
- fi
- AC_SUBST(MOFILES)
More information about the arch-commits
mailing list