wok-next rev 20966

Micro-updates
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Sep 10 11:49:32 2018 +0300 (2018-09-10)
parents 3460c1bb1b40
children 315a1dc02606
files giws/receipt gnome-nibbles/receipt gnupg/receipt gsettings-desktop-schemas/receipt gtest/receipt indent/receipt indent/stuff/patches/indent-2.2.11-LC_ALL.patch indent/stuff/patches/indent-2.2.11-decimal_format.patch indent/stuff/patches/indent-2.2.11-segfault.patch indent/stuff/patches/series
line diff
     1.1 --- a/giws/receipt	Mon Sep 10 09:51:02 2018 +0300
     1.2 +++ b/giws/receipt	Mon Sep 10 11:49:32 2018 +0300
     1.3 @@ -1,27 +1,23 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="giws"
     1.8 -VERSION="2.0.1"
     1.9 +VERSION="2.0.2"
    1.10  CATEGORY="development"
    1.11 -SHORT_DESC="Generates a C++ wrapper on the Java object."
    1.12 +SHORT_DESC="Generates a C++ wrapper on the Java object"
    1.13  MAINTAINER="pascal.bellard@slitaz.org"
    1.14  LICENSE="CECILL"
    1.15  WEB_SITE="https://github.com/opencollab/giws"
    1.16 +
    1.17  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.18 -WGET_URL="http://forge.scilab.org/index.php/p/$PACKAGE/downloads/get/$TARBALL"
    1.19 +WGET_URL="https://github.com/opencollab/giws/archive/$VERSION.tar.gz"
    1.20  
    1.21 -DEPENDS="python"
    1.22  BUILD_DEPENDS="python libxml2-python"
    1.23  
    1.24 -# Rules to configure and make the package.
    1.25 -compile_rules()
    1.26 -{
    1.27 -	python setup.py build
    1.28 -	python setup.py install --root=$DESTDIR
    1.29 +compile_rules() {
    1.30 +	python -B setup.py install --root=$DESTDIR
    1.31  }
    1.32  
    1.33 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.34 -genpkg_rules()
    1.35 -{
    1.36 -	cp -a $install/* $fs
    1.37 +genpkg_rules() {
    1.38 +	copy @std
    1.39 +	DEPENDS="python"
    1.40  }
     2.1 --- a/gnome-nibbles/receipt	Mon Sep 10 09:51:02 2018 +0300
     2.2 +++ b/gnome-nibbles/receipt	Mon Sep 10 11:49:32 2018 +0300
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="gnome-nibbles"
     2.7 -VERSION="3.24.0"
     2.8 +VERSION="3.24.1"
     2.9  CATEGORY="games"
    2.10  SHORT_DESC="Guide a worm around a maze"
    2.11  MAINTAINER="al.bobylev@gmail.com"
     3.1 --- a/gnupg/receipt	Mon Sep 10 09:51:02 2018 +0300
     3.2 +++ b/gnupg/receipt	Mon Sep 10 11:49:32 2018 +0300
     3.3 @@ -1,18 +1,18 @@
     3.4  # SliTaz package receipt v2.
     3.5  
     3.6  PACKAGE="gnupg"
     3.7 -VERSION="2.2.9"
     3.8 +VERSION="2.2.10"
     3.9  CATEGORY="security"
    3.10  SHORT_DESC="Free implementation of the OpenPGP"
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  LICENSE="GPL3"
    3.13  WEB_SITE="https://www.gnupg.org/"
    3.14 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/gnupg.html"
    3.15 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/gnupg.html"
    3.16  
    3.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.18  WGET_URL="https://www.gnupg.org/ftp/gcrypt/gnupg/$TARBALL"
    3.19  # https://www.gnupg.org/download/integrity_check.html
    3.20 -TARBALL_SHA1="e6ef18c2e06175bbe563959c9acc682c02bcd572"
    3.21 +TARBALL_SHA1="3e87504e2ca317718aa9b6299947ebf7e906b54e"
    3.22  
    3.23  BUILD_DEPENDS="libgpg-error-dev libassuan-dev libgcrypt-dev libksba-dev \
    3.24  npth-dev perl libusb-dev sqlite3-dev gettext zlib-dev bzip2-dev readline-dev \
     4.1 --- a/gsettings-desktop-schemas/receipt	Mon Sep 10 09:51:02 2018 +0300
     4.2 +++ b/gsettings-desktop-schemas/receipt	Mon Sep 10 11:49:32 2018 +0300
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt v2.
     4.5  
     4.6  PACKAGE="gsettings-desktop-schemas"
     4.7 -VERSION="3.28.0"
     4.8 +VERSION="3.28.1"
     4.9  CATEGORY="gnome"
    4.10  SHORT_DESC="Collection of GSettings schemas"
    4.11  MAINTAINER="al.bobylev@gmail.com"
     5.1 --- a/gtest/receipt	Mon Sep 10 09:51:02 2018 +0300
     5.2 +++ b/gtest/receipt	Mon Sep 10 11:49:32 2018 +0300
     5.3 @@ -1,7 +1,7 @@
     5.4  # SliTaz package receipt v2.
     5.5  
     5.6  PACKAGE="gtest"
     5.7 -VERSION="1.8.0"
     5.8 +VERSION="1.8.1"
     5.9  CATEGORY="development"
    5.10  SHORT_DESC="Google's framework for writing C++ tests"
    5.11  MAINTAINER="pascal.bellard@slitaz.org"
     6.1 --- a/indent/receipt	Mon Sep 10 09:51:02 2018 +0300
     6.2 +++ b/indent/receipt	Mon Sep 10 11:49:32 2018 +0300
     6.3 @@ -1,29 +1,24 @@
     6.4  # SliTaz package receipt v2.
     6.5  
     6.6  PACKAGE="indent"
     6.7 -VERSION="2.2.11"
     6.8 +VERSION="2.2.12"
     6.9  CATEGORY="utilities"
    6.10  SHORT_DESC="A tool for formatting C code"
    6.11  MAINTAINER="lufeng369@slitaz.org"
    6.12  LICENSE="GPL3"
    6.13  WEB_SITE="https://www.gnu.org/software/indent/"
    6.14  
    6.15 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    6.16 -#WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    6.17 -WGET_URL="http://ftp.de.debian.org/debian/pool/main/i/indent/${PACKAGE}_$VERSION.orig.tar.gz"
    6.18 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.19 +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    6.20  
    6.21 -BUILD_DEPENDS="gettext texi2html"
    6.22 +BUILD_DEPENDS="gettext texi2html texinfo"
    6.23  
    6.24  compile_rules() {
    6.25 -#	rm -f man/indent.1 # remove zero-size file to force rebuild it
    6.26 -#	sed -i 's|/doc/|/share&|' doc/Makefile*
    6.27 -
    6.28 -	sed -i 's/-number/-number-sections/' doc/Makefile.in
    6.29 -
    6.30 -	export CFLAGS="$CFLAGS -std=gnu90"
    6.31  	./configure $CONFIGURE_ARGS &&
    6.32 -	make -j 1 &&
    6.33 -	make install
    6.34 +	make &&
    6.35 +	make \
    6.36 +		docdir=/usr/share/doc/$PACKAGE-$VERSION \
    6.37 +		install
    6.38  }
    6.39  
    6.40  genpkg_rules() {
     7.1 --- a/indent/stuff/patches/indent-2.2.11-LC_ALL.patch	Mon Sep 10 09:51:02 2018 +0300
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,17 +0,0 @@
     7.4 -From: Santiago Vila <sanvila@debian.org>
     7.5 -Subject: setlocale using LC_ALL, not LC_MESSAGES
     7.6 -Bug-Debian: http://bugs.debian.org/205692
     7.7 -
     7.8 ---- a/src/indent.c
     7.9 -+++ b/src/indent.c
    7.10 -@@ -1008,8 +1008,8 @@
    7.11 -     BOOLEAN using_stdin = false;
    7.12 -     exit_values_ty exit_status;
    7.13 - 
    7.14 --#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES)
    7.15 --    setlocale(LC_MESSAGES, "");
    7.16 -+#if defined (HAVE_SETLOCALE)
    7.17 -+    setlocale(LC_ALL, "");
    7.18 - #endif
    7.19 -     bindtextdomain(PACKAGE, LOCALEDIR);
    7.20 -     textdomain(PACKAGE);
     8.1 --- a/indent/stuff/patches/indent-2.2.11-decimal_format.patch	Mon Sep 10 09:51:02 2018 +0300
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,98 +0,0 @@
     8.4 -From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001
     8.5 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
     8.6 -Date: Thu, 25 Aug 2011 11:26:24 +0200
     8.7 -Subject: [PATCH] Do not split decimal float suffix from constant
     8.8 -
     8.9 -N1312 draft of ISO/IEC WDTR24732 defines additional floating types
    8.10 -with given suffixes:
    8.11 -
    8.12 -_Decimal32  DF, df
    8.13 -_Decimal64  DD, dd
    8.14 -_Decimal128 DL, dl
    8.15 -
    8.16 -These suffixes must stick on numeric part of the constant as classic
    8.17 -float or long float does.
    8.18 ----
    8.19 - regression/TEST                             |    3 ++-
    8.20 - regression/input/float-constant-suffix.c    |   13 +++++++++++++
    8.21 - regression/standard/float-constant-suffix.c |   13 +++++++++++++
    8.22 - src/lexi.c                                  |    9 +++++++++
    8.23 - 4 files changed, 37 insertions(+), 1 deletions(-)
    8.24 - create mode 100644 regression/input/float-constant-suffix.c
    8.25 - create mode 100644 regression/standard/float-constant-suffix.c
    8.26 -
    8.27 -diff --git a/regression/TEST b/regression/TEST
    8.28 -index c860ef2..1402ddf 100755
    8.29 ---- a/regression/TEST
    8.30 -+++ b/regression/TEST
    8.31 -@@ -35,7 +35,8 @@ EXAMPLES="do.c else.c for.c func-def.c lshift.c ncs.c \
    8.32 - 
    8.33 - BUGS="case-label.c one-line-1.c one-line-2.c one-line-3.c \
    8.34 -         one-line-4.c struct-decl.c sizeof-in-while.c line-break-comment.c \
    8.35 --        macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c"
    8.36 -+        macro.c enum.c elif.c nested.c wrapped-string.c minus_predecrement.c \
    8.37 -+        float-constant-suffix.c"
    8.38 - 
    8.39 - INDENTSRC="args.c backup.h backup.c dirent_def.h globs.c indent.h \
    8.40 -         indent.c indent_globs.h io.c lexi.c memcpy.c parse.c pr_comment.c \
    8.41 -diff --git a/regression/input/float-constant-suffix.c b/regression/input/float-constant-suffix.c
    8.42 -new file mode 100644
    8.43 -index 0000000..58f5310
    8.44 ---- /dev/null
    8.45 -+++ b/regression/input/float-constant-suffix.c
    8.46 -@@ -0,0 +1,13 @@
    8.47 -+float foo = 1.0F;
    8.48 -+float foo = 1.0f;
    8.49 -+double foo = 1.0;
    8.50 -+double foo = 1.0;
    8.51 -+long double foo = 1.0L;
    8.52 -+long double foo = 1.0l;
    8.53 -+
    8.54 -+_Decimal32 foo = 1.0DF;
    8.55 -+_Decimal32 foo = 1.0df;
    8.56 -+_Decimal64 foo = 1.0DD;
    8.57 -+_Decimal64 foo = 1.0dd;
    8.58 -+_Decimal128 foo = 1.0DL;
    8.59 -+_Decimal128 foo = 1.0dl;
    8.60 -diff --git a/regression/standard/float-constant-suffix.c b/regression/standard/float-constant-suffix.c
    8.61 -new file mode 100644
    8.62 -index 0000000..58f5310
    8.63 ---- /dev/null
    8.64 -+++ b/regression/standard/float-constant-suffix.c
    8.65 -@@ -0,0 +1,13 @@
    8.66 -+float foo = 1.0F;
    8.67 -+float foo = 1.0f;
    8.68 -+double foo = 1.0;
    8.69 -+double foo = 1.0;
    8.70 -+long double foo = 1.0L;
    8.71 -+long double foo = 1.0l;
    8.72 -+
    8.73 -+_Decimal32 foo = 1.0DF;
    8.74 -+_Decimal32 foo = 1.0df;
    8.75 -+_Decimal64 foo = 1.0DD;
    8.76 -+_Decimal64 foo = 1.0dd;
    8.77 -+_Decimal128 foo = 1.0DL;
    8.78 -+_Decimal128 foo = 1.0dl;
    8.79 -diff --git a/src/lexi.c b/src/lexi.c
    8.80 -index abc2bfa..eafb65e 100644
    8.81 ---- a/src/lexi.c
    8.82 -+++ b/src/lexi.c
    8.83 -@@ -330,6 +330,15 @@ extern codes_ty lexi(void)
    8.84 -          {
    8.85 -             buf_ptr++;
    8.86 -          }
    8.87 -+         else if (*buf_ptr == 'D' || *buf_ptr == 'd')
    8.88 -+         {
    8.89 -+           if (buf_ptr[1] == 'F' || buf_ptr[1] == 'f' ||
    8.90 -+               buf_ptr[1] == 'D' || buf_ptr[1] == 'd' ||
    8.91 -+               buf_ptr[1] == 'L' || buf_ptr[1] == 'l')
    8.92 -+           {
    8.93 -+             buf_ptr+=2;
    8.94 -+           }
    8.95 -+         }
    8.96 -          else
    8.97 -          {
    8.98 -             while (*buf_ptr == 'U' || *buf_ptr == 'u' || *buf_ptr == 'L' || *buf_ptr == 'l')
    8.99 --- 
   8.100 -1.7.6
   8.101 -
     9.1 --- a/indent/stuff/patches/indent-2.2.11-segfault.patch	Mon Sep 10 09:51:02 2018 +0300
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,16 +0,0 @@
     9.4 ---- a/man/texinfo2man.c
     9.5 -+++ b/man/texinfo2man.c
     9.6 -@@ -287,6 +287,13 @@
     9.7 -    char buf[1024];
     9.8 -    int line_no = 0;
     9.9 - 
    9.10 -+   if (argc != 3)
    9.11 -+   {
    9.12 -+      fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
    9.13 -+      fprintf(stderr, "  The man page will be written to stdout.\n");
    9.14 -+      return -1;
    9.15 -+   }
    9.16 -+
    9.17 -    texinfoname = argv[2];
    9.18 - 
    9.19 -    in = fopen (argv[2], "r");
    10.1 --- a/indent/stuff/patches/series	Mon Sep 10 09:51:02 2018 +0300
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,7 +0,0 @@
    10.4 -# from https://aur.archlinux.org/packages/indent/
    10.5 -
    10.6 -indent-2.2.11-segfault.patch
    10.7 -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692
    10.8 -indent-2.2.11-LC_ALL.patch
    10.9 -# https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html
   10.10 -indent-2.2.11-decimal_format.patch