# HG changeset patch # User Aleksej Bobylev # Date 1536569372 -10800 # Node ID 48b896290f1279bf245bcfd37f1e209e35adf3cc # Parent 3460c1bb1b40ef6bdf6191c9556c176307b2e788 Micro-updates diff -r 3460c1bb1b40 -r 48b896290f12 giws/receipt --- a/giws/receipt Mon Sep 10 09:51:02 2018 +0300 +++ b/giws/receipt Mon Sep 10 11:49:32 2018 +0300 @@ -1,27 +1,23 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="giws" -VERSION="2.0.1" +VERSION="2.0.2" CATEGORY="development" -SHORT_DESC="Generates a C++ wrapper on the Java object." +SHORT_DESC="Generates a C++ wrapper on the Java object" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="CECILL" WEB_SITE="https://github.com/opencollab/giws" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WGET_URL="http://forge.scilab.org/index.php/p/$PACKAGE/downloads/get/$TARBALL" +WGET_URL="https://github.com/opencollab/giws/archive/$VERSION.tar.gz" -DEPENDS="python" BUILD_DEPENDS="python libxml2-python" -# Rules to configure and make the package. -compile_rules() -{ - python setup.py build - python setup.py install --root=$DESTDIR +compile_rules() { + python -B setup.py install --root=$DESTDIR } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - cp -a $install/* $fs +genpkg_rules() { + copy @std + DEPENDS="python" } diff -r 3460c1bb1b40 -r 48b896290f12 gnome-nibbles/receipt --- a/gnome-nibbles/receipt Mon Sep 10 09:51:02 2018 +0300 +++ b/gnome-nibbles/receipt Mon Sep 10 11:49:32 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="gnome-nibbles" -VERSION="3.24.0" +VERSION="3.24.1" CATEGORY="games" SHORT_DESC="Guide a worm around a maze" MAINTAINER="al.bobylev@gmail.com" diff -r 3460c1bb1b40 -r 48b896290f12 gnupg/receipt --- a/gnupg/receipt Mon Sep 10 09:51:02 2018 +0300 +++ b/gnupg/receipt Mon Sep 10 11:49:32 2018 +0300 @@ -1,18 +1,18 @@ # SliTaz package receipt v2. PACKAGE="gnupg" -VERSION="2.2.9" +VERSION="2.2.10" CATEGORY="security" SHORT_DESC="Free implementation of the OpenPGP" MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" WEB_SITE="https://www.gnupg.org/" -LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/gnupg.html" +LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/gnupg.html" TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="https://www.gnupg.org/ftp/gcrypt/gnupg/$TARBALL" # https://www.gnupg.org/download/integrity_check.html -TARBALL_SHA1="e6ef18c2e06175bbe563959c9acc682c02bcd572" +TARBALL_SHA1="3e87504e2ca317718aa9b6299947ebf7e906b54e" BUILD_DEPENDS="libgpg-error-dev libassuan-dev libgcrypt-dev libksba-dev \ npth-dev perl libusb-dev sqlite3-dev gettext zlib-dev bzip2-dev readline-dev \ diff -r 3460c1bb1b40 -r 48b896290f12 gsettings-desktop-schemas/receipt --- a/gsettings-desktop-schemas/receipt Mon Sep 10 09:51:02 2018 +0300 +++ b/gsettings-desktop-schemas/receipt Mon Sep 10 11:49:32 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="gsettings-desktop-schemas" -VERSION="3.28.0" +VERSION="3.28.1" CATEGORY="gnome" SHORT_DESC="Collection of GSettings schemas" MAINTAINER="al.bobylev@gmail.com" diff -r 3460c1bb1b40 -r 48b896290f12 gtest/receipt --- a/gtest/receipt Mon Sep 10 09:51:02 2018 +0300 +++ b/gtest/receipt Mon Sep 10 11:49:32 2018 +0300 @@ -1,7 +1,7 @@ # SliTaz package receipt v2. PACKAGE="gtest" -VERSION="1.8.0" +VERSION="1.8.1" CATEGORY="development" SHORT_DESC="Google's framework for writing C++ tests" MAINTAINER="pascal.bellard@slitaz.org" diff -r 3460c1bb1b40 -r 48b896290f12 indent/receipt --- a/indent/receipt Mon Sep 10 09:51:02 2018 +0300 +++ b/indent/receipt Mon Sep 10 11:49:32 2018 +0300 @@ -1,29 +1,24 @@ # SliTaz package receipt v2. PACKAGE="indent" -VERSION="2.2.11" +VERSION="2.2.12" CATEGORY="utilities" SHORT_DESC="A tool for formatting C code" MAINTAINER="lufeng369@slitaz.org" LICENSE="GPL3" WEB_SITE="https://www.gnu.org/software/indent/" -TARBALL="$PACKAGE-$VERSION.tar.gz" -#WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -WGET_URL="http://ftp.de.debian.org/debian/pool/main/i/indent/${PACKAGE}_$VERSION.orig.tar.gz" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -BUILD_DEPENDS="gettext texi2html" +BUILD_DEPENDS="gettext texi2html texinfo" compile_rules() { -# rm -f man/indent.1 # remove zero-size file to force rebuild it -# sed -i 's|/doc/|/share&|' doc/Makefile* - - sed -i 's/-number/-number-sections/' doc/Makefile.in - - export CFLAGS="$CFLAGS -std=gnu90" ./configure $CONFIGURE_ARGS && - make -j 1 && - make install + make && + make \ + docdir=/usr/share/doc/$PACKAGE-$VERSION \ + install } genpkg_rules() { diff -r 3460c1bb1b40 -r 48b896290f12 indent/stuff/patches/indent-2.2.11-LC_ALL.patch --- a/indent/stuff/patches/indent-2.2.11-LC_ALL.patch Mon Sep 10 09:51:02 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -From: Santiago Vila -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 -r 3460c1bb1b40 -r 48b896290f12 indent/stuff/patches/indent-2.2.11-decimal_format.patch --- a/indent/stuff/patches/indent-2.2.11-decimal_format.patch Mon Sep 10 09:51:02 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -From ff47ab3b90333bdfaa40b86cb548e92a01787345 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -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 - diff -r 3460c1bb1b40 -r 48b896290f12 indent/stuff/patches/indent-2.2.11-segfault.patch --- a/indent/stuff/patches/indent-2.2.11-segfault.patch Mon Sep 10 09:51:02 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 \n", argv[0]); -+ fprintf(stderr, " The man page will be written to stdout.\n"); -+ return -1; -+ } -+ - texinfoname = argv[2]; - - in = fopen (argv[2], "r"); diff -r 3460c1bb1b40 -r 48b896290f12 indent/stuff/patches/series --- a/indent/stuff/patches/series Mon Sep 10 09:51:02 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -# from https://aur.archlinux.org/packages/indent/ - -indent-2.2.11-segfault.patch -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=205692 -indent-2.2.11-LC_ALL.patch -# https://lists.gnu.org/archive/html/bug-indent/2011-08/msg00000.html -indent-2.2.11-decimal_format.patch