[arch-commits] Commit in recode/repos (20 files)

Pierre Schmitz pierre at archlinux.org
Sat Feb 25 03:32:19 EST 2012


    Date: Saturday, February 25, 2012 @ 03:32:19
  Author: pierre
Revision: 151217

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  recode/repos/extra-i686/PKGBUILD
    (from rev 151216, recode/trunk/PKGBUILD)
  recode/repos/extra-i686/recode-3.6-as-if.patch
    (from rev 151216, recode/trunk/recode-3.6-as-if.patch)
  recode/repos/extra-i686/recode-3.6-gcc43.patch
    (from rev 151216, recode/trunk/recode-3.6-gcc43.patch)
  recode/repos/extra-i686/recode-3.6-gettextfix.diff
    (from rev 151216, recode/trunk/recode-3.6-gettextfix.diff)
  recode/repos/extra-i686/recode.install
    (from rev 151216, recode/trunk/recode.install)
  recode/repos/extra-x86_64/PKGBUILD
    (from rev 151216, recode/trunk/PKGBUILD)
  recode/repos/extra-x86_64/recode-3.6-as-if.patch
    (from rev 151216, recode/trunk/recode-3.6-as-if.patch)
  recode/repos/extra-x86_64/recode-3.6-gcc43.patch
    (from rev 151216, recode/trunk/recode-3.6-gcc43.patch)
  recode/repos/extra-x86_64/recode-3.6-gettextfix.diff
    (from rev 151216, recode/trunk/recode-3.6-gettextfix.diff)
  recode/repos/extra-x86_64/recode.install
    (from rev 151216, recode/trunk/recode.install)
Deleted:
  recode/repos/extra-i686/PKGBUILD
  recode/repos/extra-i686/recode-3.6-as-if.patch
  recode/repos/extra-i686/recode-3.6-gcc43.patch
  recode/repos/extra-i686/recode-3.6-gettextfix.diff
  recode/repos/extra-i686/recode.install
  recode/repos/extra-x86_64/PKGBUILD
  recode/repos/extra-x86_64/recode-3.6-as-if.patch
  recode/repos/extra-x86_64/recode-3.6-gcc43.patch
  recode/repos/extra-x86_64/recode-3.6-gettextfix.diff
  recode/repos/extra-x86_64/recode.install

-----------------------------------------+
 extra-i686/PKGBUILD                     |   86 +++++++++++++++---------------
 extra-i686/recode-3.6-as-if.patch       |   38 ++++++-------
 extra-i686/recode-3.6-gcc43.patch       |   40 ++++++-------
 extra-i686/recode-3.6-gettextfix.diff   |   46 ++++++++--------
 extra-i686/recode.install               |   40 ++++++-------
 extra-x86_64/PKGBUILD                   |   86 +++++++++++++++---------------
 extra-x86_64/recode-3.6-as-if.patch     |   38 ++++++-------
 extra-x86_64/recode-3.6-gcc43.patch     |   40 ++++++-------
 extra-x86_64/recode-3.6-gettextfix.diff |   46 ++++++++--------
 extra-x86_64/recode.install             |   40 ++++++-------
 10 files changed, 250 insertions(+), 250 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-i686/PKGBUILD	2012-02-25 08:32:19 UTC (rev 151217)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=recode
-pkgver=3.6
-pkgrel=6
-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' 'texinfo')
-options=('!libtool')
-install=recode.install
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
-        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=('f82e9a6ede9119268c13493c9add2809'
-         '95ca772e367a7ef56d3f46d724b6f86e'
-         'fca7484ba332c8ad59eb02334883cd92'
-         'eb602e80a24b5448604bfebeacc55304')
-
-build() {
-  cd ${srcdir}/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-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 --without-included-gettext
-  make
-}
-
-package() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  make DESTDIR=${pkgdir} install
-
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
-}

Copied: recode/repos/extra-i686/PKGBUILD (from rev 151216, recode/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-25 08:32:19 UTC (rev 151217)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=recode
+pkgver=3.6
+pkgrel=6
+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' 'texinfo')
+options=('!libtool')
+install=recode.install
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
+        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=('f82e9a6ede9119268c13493c9add2809'
+         '95ca772e367a7ef56d3f46d724b6f86e'
+         'fca7484ba332c8ad59eb02334883cd92'
+         'eb602e80a24b5448604bfebeacc55304')
+
+build() {
+  cd ${srcdir}/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-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 --without-included-gettext
+  make
+}
+
+package() {
+  cd ${srcdir}/pinard-Recode-2127b34
+  make DESTDIR=${pkgdir} install
+
+  rm ${pkgdir}/usr/share/info/dir
+  gzip ${pkgdir}/usr/share/info/*
+}

Deleted: extra-i686/recode-3.6-as-if.patch
===================================================================
--- extra-i686/recode-3.6-as-if.patch	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-i686/recode-3.6-as-if.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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])
-+])])

Copied: recode/repos/extra-i686/recode-3.6-as-if.patch (from rev 151216, recode/trunk/recode-3.6-as-if.patch)
===================================================================
--- extra-i686/recode-3.6-as-if.patch	                        (rev 0)
+++ extra-i686/recode-3.6-as-if.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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])
++])])

Deleted: extra-i686/recode-3.6-gcc43.patch
===================================================================
--- extra-i686/recode-3.6-gcc43.patch	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-i686/recode-3.6-gcc43.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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
-

Copied: recode/repos/extra-i686/recode-3.6-gcc43.patch (from rev 151216, recode/trunk/recode-3.6-gcc43.patch)
===================================================================
--- extra-i686/recode-3.6-gcc43.patch	                        (rev 0)
+++ extra-i686/recode-3.6-gcc43.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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
+

Deleted: extra-i686/recode-3.6-gettextfix.diff
===================================================================
--- extra-i686/recode-3.6-gettextfix.diff	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-i686/recode-3.6-gettextfix.diff	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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)

Copied: recode/repos/extra-i686/recode-3.6-gettextfix.diff (from rev 151216, recode/trunk/recode-3.6-gettextfix.diff)
===================================================================
--- extra-i686/recode-3.6-gettextfix.diff	                        (rev 0)
+++ extra-i686/recode-3.6-gettextfix.diff	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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)

Deleted: extra-i686/recode.install
===================================================================
--- extra-i686/recode.install	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-i686/recode.install	2012-02-25 08:32:19 UTC (rev 151217)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(recode.info-5.gz recode.info-3.gz recode.info-7.gz recode.info-6.gz recode.info-2.gz recode.info-4.gz recode.info.gz recode.info-1.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: recode/repos/extra-i686/recode.install (from rev 151216, recode/trunk/recode.install)
===================================================================
--- extra-i686/recode.install	                        (rev 0)
+++ extra-i686/recode.install	2012-02-25 08:32:19 UTC (rev 151217)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(recode.info-5.gz recode.info-3.gz recode.info-7.gz recode.info-6.gz recode.info-2.gz recode.info-4.gz recode.info.gz recode.info-1.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-x86_64/PKGBUILD	2012-02-25 08:32:19 UTC (rev 151217)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=recode
-pkgver=3.6
-pkgrel=6
-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' 'texinfo')
-options=('!libtool')
-install=recode.install
-source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
-        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=('f82e9a6ede9119268c13493c9add2809'
-         '95ca772e367a7ef56d3f46d724b6f86e'
-         'fca7484ba332c8ad59eb02334883cd92'
-         'eb602e80a24b5448604bfebeacc55304')
-
-build() {
-  cd ${srcdir}/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-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 --without-included-gettext
-  make
-}
-
-package() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  make DESTDIR=${pkgdir} install
-
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
-}

Copied: recode/repos/extra-x86_64/PKGBUILD (from rev 151216, recode/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-25 08:32:19 UTC (rev 151217)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Kevin Piche <kevin at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=recode
+pkgver=3.6
+pkgrel=6
+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' 'texinfo')
+options=('!libtool')
+install=recode.install
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
+        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=('f82e9a6ede9119268c13493c9add2809'
+         '95ca772e367a7ef56d3f46d724b6f86e'
+         'fca7484ba332c8ad59eb02334883cd92'
+         'eb602e80a24b5448604bfebeacc55304')
+
+build() {
+  cd ${srcdir}/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-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 --without-included-gettext
+  make
+}
+
+package() {
+  cd ${srcdir}/pinard-Recode-2127b34
+  make DESTDIR=${pkgdir} install
+
+  rm ${pkgdir}/usr/share/info/dir
+  gzip ${pkgdir}/usr/share/info/*
+}

Deleted: extra-x86_64/recode-3.6-as-if.patch
===================================================================
--- extra-x86_64/recode-3.6-as-if.patch	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-x86_64/recode-3.6-as-if.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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])
-+])])

Copied: recode/repos/extra-x86_64/recode-3.6-as-if.patch (from rev 151216, recode/trunk/recode-3.6-as-if.patch)
===================================================================
--- extra-x86_64/recode-3.6-as-if.patch	                        (rev 0)
+++ extra-x86_64/recode-3.6-as-if.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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])
++])])

Deleted: extra-x86_64/recode-3.6-gcc43.patch
===================================================================
--- extra-x86_64/recode-3.6-gcc43.patch	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-x86_64/recode-3.6-gcc43.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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
-

Copied: recode/repos/extra-x86_64/recode-3.6-gcc43.patch (from rev 151216, recode/trunk/recode-3.6-gcc43.patch)
===================================================================
--- extra-x86_64/recode-3.6-gcc43.patch	                        (rev 0)
+++ extra-x86_64/recode-3.6-gcc43.patch	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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
+

Deleted: extra-x86_64/recode-3.6-gettextfix.diff
===================================================================
--- extra-x86_64/recode-3.6-gettextfix.diff	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-x86_64/recode-3.6-gettextfix.diff	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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)

Copied: recode/repos/extra-x86_64/recode-3.6-gettextfix.diff (from rev 151216, recode/trunk/recode-3.6-gettextfix.diff)
===================================================================
--- extra-x86_64/recode-3.6-gettextfix.diff	                        (rev 0)
+++ extra-x86_64/recode-3.6-gettextfix.diff	2012-02-25 08:32:19 UTC (rev 151217)
@@ -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)

Deleted: extra-x86_64/recode.install
===================================================================
--- extra-x86_64/recode.install	2012-02-25 08:28:41 UTC (rev 151216)
+++ extra-x86_64/recode.install	2012-02-25 08:32:19 UTC (rev 151217)
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(recode.info-5.gz recode.info-3.gz recode.info-7.gz recode.info-6.gz recode.info-2.gz recode.info-4.gz recode.info.gz recode.info-1.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: recode/repos/extra-x86_64/recode.install (from rev 151216, recode/trunk/recode.install)
===================================================================
--- extra-x86_64/recode.install	                        (rev 0)
+++ extra-x86_64/recode.install	2012-02-25 08:32:19 UTC (rev 151217)
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(recode.info-5.gz recode.info-3.gz recode.info-7.gz recode.info-6.gz recode.info-2.gz recode.info-4.gz recode.info.gz recode.info-1.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}



More information about the arch-commits mailing list