[arch-commits] Commit in recode/repos (10 files)
Christian Hesse
eworm at archlinux.org
Sun May 22 18:22:04 UTC 2016
Date: Sunday, May 22, 2016 @ 20:22:04
Author: eworm
Revision: 268487
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
recode/repos/testing-i686/
recode/repos/testing-i686/PKGBUILD
(from rev 268486, recode/trunk/PKGBUILD)
recode/repos/testing-i686/recode-3.6-as-if.patch
(from rev 268486, recode/trunk/recode-3.6-as-if.patch)
recode/repos/testing-i686/recode-3.6-gcc43.patch
(from rev 268486, recode/trunk/recode-3.6-gcc43.patch)
recode/repos/testing-i686/recode-3.6-gettextfix.diff
(from rev 268486, recode/trunk/recode-3.6-gettextfix.diff)
recode/repos/testing-x86_64/
recode/repos/testing-x86_64/PKGBUILD
(from rev 268486, recode/trunk/PKGBUILD)
recode/repos/testing-x86_64/recode-3.6-as-if.patch
(from rev 268486, recode/trunk/recode-3.6-as-if.patch)
recode/repos/testing-x86_64/recode-3.6-gcc43.patch
(from rev 268486, recode/trunk/recode-3.6-gcc43.patch)
recode/repos/testing-x86_64/recode-3.6-gettextfix.diff
(from rev 268486, recode/trunk/recode-3.6-gettextfix.diff)
-------------------------------------------+
testing-i686/PKGBUILD | 44 ++++++++++++++++++++++++++++
testing-i686/recode-3.6-as-if.patch | 19 ++++++++++++
testing-i686/recode-3.6-gcc43.patch | 20 ++++++++++++
testing-i686/recode-3.6-gettextfix.diff | 23 ++++++++++++++
testing-x86_64/PKGBUILD | 44 ++++++++++++++++++++++++++++
testing-x86_64/recode-3.6-as-if.patch | 19 ++++++++++++
testing-x86_64/recode-3.6-gcc43.patch | 20 ++++++++++++
testing-x86_64/recode-3.6-gettextfix.diff | 23 ++++++++++++++
8 files changed, 212 insertions(+)
Copied: recode/repos/testing-i686/PKGBUILD (from rev 268486, recode/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=recode
+pkgver=3.6
+pkgrel=9
+pkgdesc="Converts files between various character sets and usages"
+arch=('i686' 'x86_64')
+url="http://recode.progiciels-bpi.ca/index.html"
+license=('GPL' 'LGPL')
+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')
+md5sums=('f82e9a6ede9119268c13493c9add2809'
+ '3716ae269074e31add3d29387ff09438'
+ 'fca7484ba332c8ad59eb02334883cd92'
+ 'eb602e80a24b5448604bfebeacc55304')
+
+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 pinard-Recode-2127b34
+ rm -f acinclude.m4
+ autoreconf -fi
+ libtoolize
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --infodir=/usr/share/info --without-included-gettext
+ make
+}
+
+package() {
+ cd pinard-Recode-2127b34
+ make DESTDIR="${pkgdir}" install
+}
Copied: recode/repos/testing-i686/recode-3.6-as-if.patch (from rev 268486, recode/trunk/recode-3.6-as-if.patch)
===================================================================
--- testing-i686/recode-3.6-as-if.patch (rev 0)
+++ testing-i686/recode-3.6-as-if.patch 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,19 @@
+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])
++])])
Copied: recode/repos/testing-i686/recode-3.6-gcc43.patch (from rev 268486, recode/trunk/recode-3.6-gcc43.patch)
===================================================================
--- testing-i686/recode-3.6-gcc43.patch (rev 0)
+++ testing-i686/recode-3.6-gcc43.patch 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,20 @@
+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
+
Copied: recode/repos/testing-i686/recode-3.6-gettextfix.diff (from rev 268486, recode/trunk/recode-3.6-gettextfix.diff)
===================================================================
--- testing-i686/recode-3.6-gettextfix.diff (rev 0)
+++ testing-i686/recode-3.6-gettextfix.diff 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,23 @@
+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)
Copied: recode/repos/testing-x86_64/PKGBUILD (from rev 268486, recode/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=recode
+pkgver=3.6
+pkgrel=9
+pkgdesc="Converts files between various character sets and usages"
+arch=('i686' 'x86_64')
+url="http://recode.progiciels-bpi.ca/index.html"
+license=('GPL' 'LGPL')
+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')
+md5sums=('f82e9a6ede9119268c13493c9add2809'
+ '3716ae269074e31add3d29387ff09438'
+ 'fca7484ba332c8ad59eb02334883cd92'
+ 'eb602e80a24b5448604bfebeacc55304')
+
+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 pinard-Recode-2127b34
+ rm -f acinclude.m4
+ autoreconf -fi
+ libtoolize
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --infodir=/usr/share/info --without-included-gettext
+ make
+}
+
+package() {
+ cd pinard-Recode-2127b34
+ make DESTDIR="${pkgdir}" install
+}
Copied: recode/repos/testing-x86_64/recode-3.6-as-if.patch (from rev 268486, recode/trunk/recode-3.6-as-if.patch)
===================================================================
--- testing-x86_64/recode-3.6-as-if.patch (rev 0)
+++ testing-x86_64/recode-3.6-as-if.patch 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,19 @@
+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])
++])])
Copied: recode/repos/testing-x86_64/recode-3.6-gcc43.patch (from rev 268486, recode/trunk/recode-3.6-gcc43.patch)
===================================================================
--- testing-x86_64/recode-3.6-gcc43.patch (rev 0)
+++ testing-x86_64/recode-3.6-gcc43.patch 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,20 @@
+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
+
Copied: recode/repos/testing-x86_64/recode-3.6-gettextfix.diff (from rev 268486, recode/trunk/recode-3.6-gettextfix.diff)
===================================================================
--- testing-x86_64/recode-3.6-gettextfix.diff (rev 0)
+++ testing-x86_64/recode-3.6-gettextfix.diff 2016-05-22 18:22:04 UTC (rev 268487)
@@ -0,0 +1,23 @@
+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