[arch-commits] Commit in indent/repos (16 files)
Stéphane Gaudreault
stephane at archlinux.org
Tue Mar 6 21:03:48 UTC 2012
Date: Tuesday, March 6, 2012 @ 16:03:48
Author: stephane
Revision: 152433
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
indent/repos/extra-i686/PKGBUILD
(from rev 152432, indent/trunk/PKGBUILD)
indent/repos/extra-i686/indent-2.2.11-LC_ALL.patch
(from rev 152432, indent/trunk/indent-2.2.11-LC_ALL.patch)
indent/repos/extra-i686/indent-2.2.11-decimal_format.patch
(from rev 152432, indent/trunk/indent-2.2.11-decimal_format.patch)
indent/repos/extra-i686/indent-2.2.11-segfault.patch
(from rev 152432, indent/trunk/indent-2.2.11-segfault.patch)
indent/repos/extra-i686/indent.install
(from rev 152432, indent/trunk/indent.install)
indent/repos/extra-x86_64/PKGBUILD
(from rev 152432, indent/trunk/PKGBUILD)
indent/repos/extra-x86_64/indent-2.2.11-LC_ALL.patch
(from rev 152432, indent/trunk/indent-2.2.11-LC_ALL.patch)
indent/repos/extra-x86_64/indent-2.2.11-decimal_format.patch
(from rev 152432, indent/trunk/indent-2.2.11-decimal_format.patch)
indent/repos/extra-x86_64/indent-2.2.11-segfault.patch
(from rev 152432, indent/trunk/indent-2.2.11-segfault.patch)
indent/repos/extra-x86_64/indent.install
(from rev 152432, indent/trunk/indent.install)
Deleted:
indent/repos/extra-i686/PKGBUILD
indent/repos/extra-i686/indent-2.2.11-segfault.patch
indent/repos/extra-i686/indent.install
indent/repos/extra-x86_64/PKGBUILD
indent/repos/extra-x86_64/indent-2.2.11-segfault.patch
indent/repos/extra-x86_64/indent.install
-------------------------------------------------+
extra-i686/PKGBUILD | 77 +++++++++--------
extra-i686/indent-2.2.11-LC_ALL.patch | 17 +++
extra-i686/indent-2.2.11-decimal_format.patch | 98 ++++++++++++++++++++++
extra-i686/indent-2.2.11-segfault.patch | 32 +++----
extra-i686/indent.install | 32 +++----
extra-x86_64/PKGBUILD | 77 +++++++++--------
extra-x86_64/indent-2.2.11-LC_ALL.patch | 17 +++
extra-x86_64/indent-2.2.11-decimal_format.patch | 98 ++++++++++++++++++++++
extra-x86_64/indent-2.2.11-segfault.patch | 32 +++----
extra-x86_64/indent.install | 32 +++----
10 files changed, 382 insertions(+), 130 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-03-06 21:03:33 UTC (rev 152432)
+++ extra-i686/PKGBUILD 2012-03-06 21:03:48 UTC (rev 152433)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
-# Contributor: aurelien <aurelien at archlinux.org>
-# Contributor: Herb Rose (hrose56 at yahoo.com)
-
-pkgname=indent
-pkgver=2.2.11
-pkgrel=1
-pkgdesc="A tool to change the appearance of a C program by inserting or deleting whitespace"
-arch=('i686' 'x86_64')
-url="http://indent.isidore-it.eu/beautify.html"
-depends=('glibc')
-makedepends=('texi2html')
-license=('GPL3')
-install=indent.install
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz indent-2.2.11-segfault.patch)
-md5sums=('98beafca62472805a3739d3867d5d70f'
- 'e5ded8513547ff4555dec2bb805dd2ab')
-sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
- '31a6dcd5edcac4decac81dbb52bc9415b8b148e4')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i ../indent-2.2.11-segfault.patch
- sed -i 's/-number/-number-sections/' doc/Makefile.in
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" docdir=/usr/share/doc/indent install
-}
Copied: indent/repos/extra-i686/PKGBUILD (from rev 152432, indent/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Contributor: aurelien <aurelien at archlinux.org>
+# Contributor: Herb Rose (hrose56 at yahoo.com)
+
+pkgname=indent
+pkgver=2.2.11
+pkgrel=2
+pkgdesc="C language source code formatting program"
+arch=('i686' 'x86_64')
+url="http://indent.isidore-it.eu/beautify.html"
+depends=('glibc')
+makedepends=('texi2html')
+license=('GPL3')
+install=indent.install
+source=(http://indent.isidore-it.eu/${pkgname}-${pkgver}.tar.gz
+ indent-2.2.11-segfault.patch
+ indent-2.2.11-LC_ALL.patch
+ indent-2.2.11-decimal_format.patch)
+sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
+ '31a6dcd5edcac4decac81dbb52bc9415b8b148e4'
+ '91b210b666de59ca44524288a4c1ebd213570daa'
+ '2b7d5a725fe307ce81565f920a0a66b319b50c91')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i ../indent-2.2.11-segfault.patch
+
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692
+ patch -Np1 -i ../indent-2.2.11-LC_ALL.patch
+
+ # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html
+ patch -Np1 -i ../indent-2.2.11-decimal_format.patch
+
+ sed -i 's/-number/-number-sections/' doc/Makefile.in
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install
+}
Copied: indent/repos/extra-i686/indent-2.2.11-LC_ALL.patch (from rev 152432, indent/trunk/indent-2.2.11-LC_ALL.patch)
===================================================================
--- extra-i686/indent-2.2.11-LC_ALL.patch (rev 0)
+++ extra-i686/indent-2.2.11-LC_ALL.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,17 @@
+From: Santiago Vila <sanvila at debian.org>
+Subject: setlocale using LC_ALL, not LC_MESSAGES
+Bug-Debian: http://bugs.debian.org/205692
+
+--- a/src/indent.c
++++ b/src/indent.c
+@@ -1008,8 +1008,8 @@
+ BOOLEAN using_stdin = false;
+ exit_values_ty exit_status;
+
+-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES)
+- setlocale(LC_MESSAGES, "");
++#if defined (HAVE_SETLOCALE)
++ setlocale(LC_ALL, "");
+ #endif
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
Copied: indent/repos/extra-i686/indent-2.2.11-decimal_format.patch (from rev 152432, indent/trunk/indent-2.2.11-decimal_format.patch)
===================================================================
--- extra-i686/indent-2.2.11-decimal_format.patch (rev 0)
+++ extra-i686/indent-2.2.11-decimal_format.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,98 @@
+From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 25 Aug 2011 11:26:24 +0200
+Subject: [PATCH] Do not split decimal float suffix from constant
+
+N1312 draft of ISO/IEC WDTR24732 defines additional floating types
+with given suffixes:
+
+_Decimal32 DF, df
+_Decimal64 DD, dd
+_Decimal128 DL, dl
+
+These suffixes must stick on numeric part of the constant as classic
+float or long float does.
+---
+ regression/TEST | 3 ++-
+ regression/input/float-constant-suffix.c | 13 +++++++++++++
+ regression/standard/float-constant-suffix.c | 13 +++++++++++++
+ src/lexi.c | 9 +++++++++
+ 4 files changed, 37 insertions(+), 1 deletions(-)
+ create mode 100644 regression/input/float-constant-suffix.c
+ create mode 100644 regression/standard/float-constant-suffix.c
+
+diff --git a/regression/TEST b/regression/TEST
+index c860ef2..1402ddf 100755
+--- a/regression/TEST
++++ b/regression/TEST
+@@ -35,7 +35,8 @@ EXAMPLES="do.c else.c for.c func-def.c lshift.c ncs.c \
+
+ BUGS="case-label.c one-line-1.c one-line-2.c one-line-3.c \
+ one-line-4.c struct-decl.c sizeof-in-while.c line-break-comment.c \
+- macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c"
++ macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c \
++ float-constant-suffix.c"
+
+ INDENTSRC="args.c backup.h backup.c dirent_def.h globs.c indent.h \
+ indent.c indent_globs.h io.c lexi.c memcpy.c parse.c pr_comment.c \
+diff --git a/regression/input/float-constant-suffix.c b/regression/input/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/input/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/regression/standard/float-constant-suffix.c b/regression/standard/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/standard/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/src/lexi.c b/src/lexi.c
+index abc2bfa..eafb65e 100644
+--- a/src/lexi.c
++++ b/src/lexi.c
+@@ -330,6 +330,15 @@ extern codes_ty lexi(void)
+ {
+ buf_ptr++;
+ }
++ else if (*buf_ptr == 'D' || *buf_ptr == 'd')
++ {
++ if (buf_ptr[1] == 'F' || buf_ptr[1] == 'f' ||
++ buf_ptr[1] == 'D' || buf_ptr[1] == 'd' ||
++ buf_ptr[1] == 'L' || buf_ptr[1] == 'l')
++ {
++ buf_ptr+=2;
++ }
++ }
+ else
+ {
+ while (*buf_ptr == 'U' || *buf_ptr == 'u' || *buf_ptr == 'L' || *buf_ptr == 'l')
+--
+1.7.6
+
Deleted: extra-i686/indent-2.2.11-segfault.patch
===================================================================
--- extra-i686/indent-2.2.11-segfault.patch 2012-03-06 21:03:33 UTC (rev 152432)
+++ extra-i686/indent-2.2.11-segfault.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -1,16 +0,0 @@
---- a/man/texinfo2man.c
-+++ b/man/texinfo2man.c
-@@ -287,6 +287,13 @@
- char buf[1024];
- int line_no = 0;
-
-+ if (argc != 3)
-+ {
-+ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
-+ fprintf(stderr, " The man page will be written to stdout.\n");
-+ return -1;
-+ }
-+
- texinfoname = argv[2];
-
- in = fopen (argv[2], "r");
Copied: indent/repos/extra-i686/indent-2.2.11-segfault.patch (from rev 152432, indent/trunk/indent-2.2.11-segfault.patch)
===================================================================
--- extra-i686/indent-2.2.11-segfault.patch (rev 0)
+++ extra-i686/indent-2.2.11-segfault.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
++++ b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+ char buf[1024];
+ int line_no = 0;
+
++ if (argc != 3)
++ {
++ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++ fprintf(stderr, " The man page will be written to stdout.\n");
++ return -1;
++ }
++
+ texinfoname = argv[2];
+
+ in = fopen (argv[2], "r");
Deleted: extra-i686/indent.install
===================================================================
--- extra-i686/indent.install 2012-03-06 21:03:33 UTC (rev 152432)
+++ extra-i686/indent.install 2012-03-06 21:03:48 UTC (rev 152433)
@@ -1,16 +0,0 @@
-info_dir=usr/share/info
-info_file=indent.info.gz
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
-}
Copied: indent/repos/extra-i686/indent.install (from rev 152432, indent/trunk/indent.install)
===================================================================
--- extra-i686/indent.install (rev 0)
+++ extra-i686/indent.install 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,16 @@
+info_dir=usr/share/info
+info_file=indent.info.gz
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-03-06 21:03:33 UTC (rev 152432)
+++ extra-x86_64/PKGBUILD 2012-03-06 21:03:48 UTC (rev 152433)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin <aaron at archlinux.org>
-# Contributor: aurelien <aurelien at archlinux.org>
-# Contributor: Herb Rose (hrose56 at yahoo.com)
-
-pkgname=indent
-pkgver=2.2.11
-pkgrel=1
-pkgdesc="A tool to change the appearance of a C program by inserting or deleting whitespace"
-arch=('i686' 'x86_64')
-url="http://indent.isidore-it.eu/beautify.html"
-depends=('glibc')
-makedepends=('texi2html')
-license=('GPL3')
-install=indent.install
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz indent-2.2.11-segfault.patch)
-md5sums=('98beafca62472805a3739d3867d5d70f'
- 'e5ded8513547ff4555dec2bb805dd2ab')
-sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
- '31a6dcd5edcac4decac81dbb52bc9415b8b148e4')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i ../indent-2.2.11-segfault.patch
- sed -i 's/-number/-number-sections/' doc/Makefile.in
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" docdir=/usr/share/doc/indent install
-}
Copied: indent/repos/extra-x86_64/PKGBUILD (from rev 152432, indent/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Contributor: aurelien <aurelien at archlinux.org>
+# Contributor: Herb Rose (hrose56 at yahoo.com)
+
+pkgname=indent
+pkgver=2.2.11
+pkgrel=2
+pkgdesc="C language source code formatting program"
+arch=('i686' 'x86_64')
+url="http://indent.isidore-it.eu/beautify.html"
+depends=('glibc')
+makedepends=('texi2html')
+license=('GPL3')
+install=indent.install
+source=(http://indent.isidore-it.eu/${pkgname}-${pkgver}.tar.gz
+ indent-2.2.11-segfault.patch
+ indent-2.2.11-LC_ALL.patch
+ indent-2.2.11-decimal_format.patch)
+sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
+ '31a6dcd5edcac4decac81dbb52bc9415b8b148e4'
+ '91b210b666de59ca44524288a4c1ebd213570daa'
+ '2b7d5a725fe307ce81565f920a0a66b319b50c91')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i ../indent-2.2.11-segfault.patch
+
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692
+ patch -Np1 -i ../indent-2.2.11-LC_ALL.patch
+
+ # https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html
+ patch -Np1 -i ../indent-2.2.11-decimal_format.patch
+
+ sed -i 's/-number/-number-sections/' doc/Makefile.in
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install
+}
Copied: indent/repos/extra-x86_64/indent-2.2.11-LC_ALL.patch (from rev 152432, indent/trunk/indent-2.2.11-LC_ALL.patch)
===================================================================
--- extra-x86_64/indent-2.2.11-LC_ALL.patch (rev 0)
+++ extra-x86_64/indent-2.2.11-LC_ALL.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,17 @@
+From: Santiago Vila <sanvila at debian.org>
+Subject: setlocale using LC_ALL, not LC_MESSAGES
+Bug-Debian: http://bugs.debian.org/205692
+
+--- a/src/indent.c
++++ b/src/indent.c
+@@ -1008,8 +1008,8 @@
+ BOOLEAN using_stdin = false;
+ exit_values_ty exit_status;
+
+-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES)
+- setlocale(LC_MESSAGES, "");
++#if defined (HAVE_SETLOCALE)
++ setlocale(LC_ALL, "");
+ #endif
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
Copied: indent/repos/extra-x86_64/indent-2.2.11-decimal_format.patch (from rev 152432, indent/trunk/indent-2.2.11-decimal_format.patch)
===================================================================
--- extra-x86_64/indent-2.2.11-decimal_format.patch (rev 0)
+++ extra-x86_64/indent-2.2.11-decimal_format.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,98 @@
+From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 25 Aug 2011 11:26:24 +0200
+Subject: [PATCH] Do not split decimal float suffix from constant
+
+N1312 draft of ISO/IEC WDTR24732 defines additional floating types
+with given suffixes:
+
+_Decimal32 DF, df
+_Decimal64 DD, dd
+_Decimal128 DL, dl
+
+These suffixes must stick on numeric part of the constant as classic
+float or long float does.
+---
+ regression/TEST | 3 ++-
+ regression/input/float-constant-suffix.c | 13 +++++++++++++
+ regression/standard/float-constant-suffix.c | 13 +++++++++++++
+ src/lexi.c | 9 +++++++++
+ 4 files changed, 37 insertions(+), 1 deletions(-)
+ create mode 100644 regression/input/float-constant-suffix.c
+ create mode 100644 regression/standard/float-constant-suffix.c
+
+diff --git a/regression/TEST b/regression/TEST
+index c860ef2..1402ddf 100755
+--- a/regression/TEST
++++ b/regression/TEST
+@@ -35,7 +35,8 @@ EXAMPLES="do.c else.c for.c func-def.c lshift.c ncs.c \
+
+ BUGS="case-label.c one-line-1.c one-line-2.c one-line-3.c \
+ one-line-4.c struct-decl.c sizeof-in-while.c line-break-comment.c \
+- macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c"
++ macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c \
++ float-constant-suffix.c"
+
+ INDENTSRC="args.c backup.h backup.c dirent_def.h globs.c indent.h \
+ indent.c indent_globs.h io.c lexi.c memcpy.c parse.c pr_comment.c \
+diff --git a/regression/input/float-constant-suffix.c b/regression/input/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/input/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/regression/standard/float-constant-suffix.c b/regression/standard/float-constant-suffix.c
+new file mode 100644
+index 0000000..58f5310
+--- /dev/null
++++ b/regression/standard/float-constant-suffix.c
+@@ -0,0 +1,13 @@
++float foo = 1.0F;
++float foo = 1.0f;
++double foo = 1.0;
++double foo = 1.0;
++long double foo = 1.0L;
++long double foo = 1.0l;
++
++_Decimal32 foo = 1.0DF;
++_Decimal32 foo = 1.0df;
++_Decimal64 foo = 1.0DD;
++_Decimal64 foo = 1.0dd;
++_Decimal128 foo = 1.0DL;
++_Decimal128 foo = 1.0dl;
+diff --git a/src/lexi.c b/src/lexi.c
+index abc2bfa..eafb65e 100644
+--- a/src/lexi.c
++++ b/src/lexi.c
+@@ -330,6 +330,15 @@ extern codes_ty lexi(void)
+ {
+ buf_ptr++;
+ }
++ else if (*buf_ptr == 'D' || *buf_ptr == 'd')
++ {
++ if (buf_ptr[1] == 'F' || buf_ptr[1] == 'f' ||
++ buf_ptr[1] == 'D' || buf_ptr[1] == 'd' ||
++ buf_ptr[1] == 'L' || buf_ptr[1] == 'l')
++ {
++ buf_ptr+=2;
++ }
++ }
+ else
+ {
+ while (*buf_ptr == 'U' || *buf_ptr == 'u' || *buf_ptr == 'L' || *buf_ptr == 'l')
+--
+1.7.6
+
Deleted: extra-x86_64/indent-2.2.11-segfault.patch
===================================================================
--- extra-x86_64/indent-2.2.11-segfault.patch 2012-03-06 21:03:33 UTC (rev 152432)
+++ extra-x86_64/indent-2.2.11-segfault.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -1,16 +0,0 @@
---- a/man/texinfo2man.c
-+++ b/man/texinfo2man.c
-@@ -287,6 +287,13 @@
- char buf[1024];
- int line_no = 0;
-
-+ if (argc != 3)
-+ {
-+ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
-+ fprintf(stderr, " The man page will be written to stdout.\n");
-+ return -1;
-+ }
-+
- texinfoname = argv[2];
-
- in = fopen (argv[2], "r");
Copied: indent/repos/extra-x86_64/indent-2.2.11-segfault.patch (from rev 152432, indent/trunk/indent-2.2.11-segfault.patch)
===================================================================
--- extra-x86_64/indent-2.2.11-segfault.patch (rev 0)
+++ extra-x86_64/indent-2.2.11-segfault.patch 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
++++ b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+ char buf[1024];
+ int line_no = 0;
+
++ if (argc != 3)
++ {
++ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++ fprintf(stderr, " The man page will be written to stdout.\n");
++ return -1;
++ }
++
+ texinfoname = argv[2];
+
+ in = fopen (argv[2], "r");
Deleted: extra-x86_64/indent.install
===================================================================
--- extra-x86_64/indent.install 2012-03-06 21:03:33 UTC (rev 152432)
+++ extra-x86_64/indent.install 2012-03-06 21:03:48 UTC (rev 152433)
@@ -1,16 +0,0 @@
-info_dir=usr/share/info
-info_file=indent.info.gz
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
-}
Copied: indent/repos/extra-x86_64/indent.install (from rev 152432, indent/trunk/indent.install)
===================================================================
--- extra-x86_64/indent.install (rev 0)
+++ extra-x86_64/indent.install 2012-03-06 21:03:48 UTC (rev 152433)
@@ -0,0 +1,16 @@
+info_dir=usr/share/info
+info_file=indent.info.gz
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
+}
More information about the arch-commits
mailing list