diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-09 17:15:33 +0100 |
commit | 81c145bbc94619d18db270991d31912a3d50c43b (patch) | |
tree | d4019392a513b226493ade11b1486d73dbb1e68e /extra/indent | |
parent | 4290dec175736d43c7df289c599f553c469f3678 (diff) | |
parent | 0a7c64736c0b026c3105928d89500a8af1ad5eac (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/recoll/PKGBUILD
core/dnsutils/PKGBUILD
core/tzdata/PKGBUILD
extra/cabal-install/PKGBUILD
extra/feh/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/indent/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk/PKGBUILD
extra/ktorrent/PKGBUILD
extra/libktorrent/PKGBUILD
libre/mplayer-libre/PKGBUILD
multilib/lib32-libxau/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/wine/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdepim/PKGBUILD
testing/bluez/PKGBUILD
testing/xf86-input-evdev/PKGBUILD
Diffstat (limited to 'extra/indent')
-rw-r--r-- | extra/indent/PKGBUILD | 39 | ||||
-rw-r--r-- | extra/indent/indent-2.2.11-LC_ALL.patch | 17 | ||||
-rw-r--r-- | extra/indent/indent-2.2.11-decimal_format.patch | 98 |
3 files changed, 140 insertions, 14 deletions
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD index 5360329ce..9a0f80be1 100644 --- a/extra/indent/PKGBUILD +++ b/extra/indent/PKGBUILD @@ -1,33 +1,44 @@ -# $Id: PKGBUILD 127328 2011-06-13 05:26:28Z eric $ +# $Id: PKGBUILD 152433 2012-03-06 21:03:48Z stephane $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: aurelien <aurelien@archlinux.org> # Contributor: Herb Rose (hrose56@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" +pkgrel=2 +pkgdesc="C language source code formatting program" arch=('i686' 'x86_64' 'mips64el') 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') +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') + '31a6dcd5edcac4decac81dbb52bc9415b8b148e4' + '91b210b666de59ca44524288a4c1ebd213570daa' + '2b7d5a725fe307ce81565f920a0a66b319b50c91') 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 + 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 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" docdir=/usr/share/doc/indent install } diff --git a/extra/indent/indent-2.2.11-LC_ALL.patch b/extra/indent/indent-2.2.11-LC_ALL.patch new file mode 100644 index 000000000..0ffe56d3c --- /dev/null +++ b/extra/indent/indent-2.2.11-LC_ALL.patch @@ -0,0 +1,17 @@ +From: Santiago Vila <sanvila@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); diff --git a/extra/indent/indent-2.2.11-decimal_format.patch b/extra/indent/indent-2.2.11-decimal_format.patch new file mode 100644 index 000000000..ea34d0ea7 --- /dev/null +++ b/extra/indent/indent-2.2.11-decimal_format.patch @@ -0,0 +1,98 @@ +From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@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 + |