[arch-commits] Commit in recode/trunk (3 files)

Ionut Biru ibiru at archlinux.org
Sat Jul 3 12:15:26 EDT 2010


    Date: Saturday, July 3, 2010 @ 12:15:25
  Author: ibiru
Revision: 84687

upgpkg: recode 3.6-5 using debian and gentoo patches to fix FS#15297

Added:
  recode/trunk/recode-3.6-as-if.patch
  recode/trunk/recode-3.6-gettextfix.diff
Modified:
  recode/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   22 +++++++++++++++++-----
 recode-3.6-as-if.patch     |   19 +++++++++++++++++++
 recode-3.6-gettextfix.diff |   23 +++++++++++++++++++++++
 3 files changed, 59 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-03 15:36:30 UTC (rev 84686)
+++ PKGBUILD	2010-07-03 16:15:25 UTC (rev 84687)
@@ -3,7 +3,7 @@
 
 pkgname=recode
 pkgver=3.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Converts files between various character sets and usages"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/recode/recode.html"
@@ -11,14 +11,26 @@
 depends=('glibc' 'texinfo')
 options=('!libtool')
 install=recode.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz recode-3.6-gcc43.patch)
-md5sums=('be3f40ad2e93dae5cd5f628264bf1877' '47b62d7031d208180552174f9e223e9d')
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz
+        recode-3.6-as-if.patch recode-3.6-gettextfix.diff)
+md5sums=('be3f40ad2e93dae5cd5f628264bf1877'
+         '95ca772e367a7ef56d3f46d724b6f86e'
+         'fca7484ba332c8ad59eb02334883cd92'
+         'eb602e80a24b5448604bfebeacc55304')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p0 < ../recode-3.6-gcc43.patch || return 1
+  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-15.diff
+  sed -i '1i#include <stdlib.h>' src/argmatch.c
+  rm -f acinclude.m4
+  autoreconf -fi
+  libtoolize
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --infodir=/usr/share/info --host=i686-pc-linux-gnu || return 1
+    --infodir=/usr/share/info --host=i686-pc-linux-gnu \
+    --without-included-gettext
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
   rm ${pkgdir}/usr/share/info/dir

Added: recode-3.6-as-if.patch
===================================================================
--- recode-3.6-as-if.patch	                        (rev 0)
+++ recode-3.6-as-if.patch	2010-07-03 16:15:25 UTC (rev 84687)
@@ -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])
++])])

Added: recode-3.6-gettextfix.diff
===================================================================
--- recode-3.6-gettextfix.diff	                        (rev 0)
+++ recode-3.6-gettextfix.diff	2010-07-03 16:15:25 UTC (rev 84687)
@@ -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