Hello community, here is the log from the commit of package qrencode for openSUSE:Factory checked in at 2017-07-25 11:39:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qrencode (Old) and /work/SRC/openSUSE:Factory/.qrencode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qrencode" Tue Jul 25 11:39:09 2017 rev:20 rq:511348 version:3.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/qrencode/qrencode.changes 2014-09-12 11:19:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qrencode.new/qrencode.changes 2017-07-25 11:39:10.806645758 +0200 @@ -1,0 +2,14 @@ +Tue Jul 18 14:23:32 UTC 2017 - [email protected] + +- Switch to github as an url so people can see the progress + * web is not really up-to-date +- Remove compat support for sle11 + +------------------------------------------------------------------- +Fri Oct 3 19:42:37 UTC 2014 - [email protected] + +- Update to 3.4.4 + * Bugfix release. See the changelog file for the list of changes. + * New option "--verbose" has been added to the command line tool. + +------------------------------------------------------------------- Old: ---- qrencode-3.4.3.tar.bz2 New: ---- qrencode-3.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qrencode.spec ++++++ --- /var/tmp/diff_new_pack.oWVVj9/_old 2017-07-25 11:39:11.434557084 +0200 +++ /var/tmp/diff_new_pack.oWVVj9/_new 2017-07-25 11:39:11.434557084 +0200 @@ -1,7 +1,7 @@ # # spec file for package qrencode # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,17 @@ %define so_ver 3 - Name: qrencode -Version: 3.4.3 +Version: 3.4.4 Release: 0 Summary: C library for encoding data in a QR Code symbol License: LGPL-2.1+ Group: Productivity/Graphics/Other -Url: http://fukuchi.org/works/qrencode/index.en.html -Source: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 +Url: https://github.com/fukuchi/libqrencode +Source0: http://fukuchi.org/works/qrencode/%{name}-%{version}.tar.bz2 Source1: baselibs.conf -BuildRequires: pkg-config -%if !0%{?sles_version} +BuildRequires: pkgconfig BuildRequires: pkgconfig(libpng) -%else -BuildRequires: libpng-devel -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libqrencode is a C library for encoding data in a QR Code symbol, a kind of 2D @@ -68,29 +62,26 @@ %setup -q %build -%configure +%configure \ + --with-tools make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install -rm -f %{buildroot}%{_libdir}/*.la +%make_install +find %{buildroot} -type f -name "*.la" -delete -print %post -n libqrencode%{so_ver} -p /sbin/ldconfig - %postun -n libqrencode%{so_ver} -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc README TODO NEWS COPYING ChangeLog -%doc %{_mandir}/man1/qrencode.1.gz +%{_mandir}/man1/qrencode.1%{ext_man} %{_bindir}/qrencode %files -n libqrencode%{so_ver} -%defattr(-,root,root,-) %{_libdir}/libqrencode.so.%{so_ver}* %files devel -%defattr(-,root,root,-) %{_includedir}/qrencode.h %{_libdir}/libqrencode.so %{_libdir}/pkgconfig/libqrencode.pc ++++++ qrencode-3.4.3.tar.bz2 -> qrencode-3.4.4.tar.bz2 ++++++ ++++ 7640 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/ChangeLog new/qrencode-3.4.4/ChangeLog --- old/qrencode-3.4.3/ChangeLog 2013-08-12 03:56:13.000000000 +0200 +++ new/qrencode-3.4.4/ChangeLog 2014-07-24 14:17:55.000000000 +0200 @@ -1,3 +1,24 @@ +2014.07.24 Kentaro FUKUCHI <[email protected]> + * qrinput.c: + - Code refactoring (QRinput_Struct_count has been added). + - And more code cleanups. + - Avoid to add a Structued-append chunk when only one symbol is + generated. + * tests/test_qrinput.c: + - New test has been added. + * qrinput.c, qrencode.1.in: + - Added new option, "verbose". + * tests/common.h: + - printQRinputStruct() has been added. + [3.4] + - Bumped verstion to 3.4.4. + * Version 3.4.4 has been released. + +2014.06.27 Kentaro FUKUCHI <[email protected]> + * qrenc.c, qrencode.1.in: + - Merged pull-request #44. (Thanks to Antenore) + - Fixed some format issues. + 2013.07.29 Kentaro FUKUCHI <[email protected]> [3.4] * configure.ac, README, NEWS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/NEWS new/qrencode-3.4.4/NEWS --- old/qrencode-3.4.3/NEWS 2013-08-12 03:56:56.000000000 +0200 +++ new/qrencode-3.4.4/NEWS 2014-07-24 14:17:49.000000000 +0200 @@ -1,8 +1,20 @@ libqrencode NEWS - Overview of changes ====================================== +Version 3.4.4 (2014.7.24) +------------------------- +* Bug fix release. (Thanks to Yoshimichi Inoue) +* New option "--verbose" has been added to the command line tool. + +Release Note: +When only one symbol is generated in structured-append mode, the library had +inserted unnecessary chunk to the symbol and some QR Code readers fail to read +it. Now the library omits the chunk and generate a symbol identical to non- +structured symbol. + + Version 3.4.3 (2013.8.12) ------------------------- +------------------------- * New option "--rle" has been added to the command line tool (Thanks to Daniel Dörrhöfer) * Bug fixes. (Thanks to Hassan Hajji, Emmanuel Blot, and ßlúèÇhîp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/README new/qrencode-3.4.4/README --- old/qrencode-3.4.3/README 2013-08-11 08:30:14.000000000 +0200 +++ new/qrencode-3.4.4/README 2014-07-24 14:17:49.000000000 +0200 @@ -1,4 +1,4 @@ -libqrencode 3.4.3 - QR Code encoding library +libqrencode 3.4.4 - QR Code encoding library GENERAL INFORMATION =================== @@ -140,5 +140,5 @@ Daniel Dörrhöfer - RLE option Shigeyuki Hirai, Paul Janssens, wangsai, Gavan Fantom, Matthew Baker, Rob Ryan, Fred Steinhaeuser, Terry Burton, chisj, vlad417, Petr, Hassan Hajji, -Emmanuel Blot, ßlúèÇhîp +Emmanuel Blot, ßlúèÇhîp, win32asm, Antenore, Yoshimichi Inoue - bug report / suggestion diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/config.h.in new/qrencode-3.4.4/config.h.in --- old/qrencode-3.4.3/config.h.in 2013-08-12 03:57:40.000000000 +0200 +++ new/qrencode-3.4.4/config.h.in 2014-07-24 14:19:09.000000000 +0200 @@ -52,9 +52,6 @@ /* Minor version number */ #undef MINOR_VERSION -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/configure.ac new/qrencode-3.4.4/configure.ac --- old/qrencode-3.4.3/configure.ac 2013-07-29 11:16:49.000000000 +0200 +++ new/qrencode-3.4.4/configure.ac 2014-07-24 14:17:49.000000000 +0200 @@ -1,13 +1,15 @@ -AC_INIT(QRencode) +m4_define([__MAJOR_VERSION], [3])dnl +m4_define([__MINOR_VERSION], [4])dnl +m4_define([__MICRO_VERSION], [4])dnl +m4_define([__VERSION], [__MAJOR_VERSION.__MINOR_VERSION.__MICRO_VERSION])dnl +AC_INIT(QRencode, __VERSION) -MAJOR_VERSION=3 -MINOR_VERSION=4 -MICRO_VERSION=3 -VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION +MAJOR_VERSION=__MAJOR_VERSION +MINOR_VERSION=__MINOR_VERSION +MICRO_VERSION=__MICRO_VERSION AC_SUBST(MAJOR_VERSION) AC_SUBST(MINOR_VERSION) AC_SUBST(MICRO_VERSION) -AC_SUBST(VERSION) AC_DEFINE_UNQUOTED([MAJOR_VERSION], [$MAJOR_VERSION], [Major version number]) AC_DEFINE_UNQUOTED([MINOR_VERSION], [$MINOR_VERSION], [Minor version number]) AC_DEFINE_UNQUOTED([MICRO_VERSION], [$MICRO_VERSION], [Micro version number]) @@ -19,7 +21,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(qrencode, $VERSION) +AM_INIT_AUTOMAKE AC_DISABLE_STATIC AC_C_CONST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/qrenc.c new/qrencode-3.4.4/qrenc.c --- old/qrencode-3.4.3/qrenc.c 2013-08-11 08:33:01.000000000 +0200 +++ new/qrencode-3.4.4/qrenc.c 2014-07-24 14:17:49.000000000 +0200 @@ -46,6 +46,8 @@ static unsigned int fg_color[4] = {0, 0, 0, 255}; static unsigned int bg_color[4] = {255, 255, 255, 255}; +static int verbose = 0; + enum imageType { PNG_TYPE, EPS_TYPE, @@ -76,9 +78,10 @@ {"8bit" , no_argument , NULL, '8'}, {"rle" , no_argument , &rle, 1}, {"micro" , no_argument , NULL, 'M'}, - {"foreground" , required_argument, NULL, 'f'}, - {"background" , required_argument, NULL, 'b'}, + {"foreground" , required_argument, NULL, 'f'}, + {"background" , required_argument, NULL, 'b'}, {"version" , no_argument , NULL, 'V'}, + {"verbose" , no_argument , &verbose, 1}, {NULL, 0, NULL, 0} }; @@ -107,9 +110,10 @@ " specify error correction level from L (lowest) to H (highest).\n" " (default=L)\n\n" " -v NUMBER, --symversion=NUMBER\n" -" specify the version of the symbol. (default=auto)\n\n" +" specify the version of the symbol. See SYMBOL VERSIONS for more\n" +" information. (default=auto)\n\n" " -m NUMBER, --margin=NUMBER\n" -" specify the width of the margins. (default=4 (2 for Micro)))\n\n" +" specify the width of the margins. (default=4 (2 for Micro QR)))\n\n" " -d NUMBER, --dpi=NUMBER\n" " specify the DPI of the generated PNG. (default=72)\n\n" " -t {PNG,EPS,SVG,ANSI,ANSI256,ASCII,ASCIIi,UTF8,ANSIUTF8}, --type={PNG,EPS,\n" @@ -132,8 +136,19 @@ " Color output support available only in PNG and SVG.\n" " -V, --version\n" " display the version number and copyrights of the qrencode.\n\n" +" --verbose\n" +" display verbose information to stderr.\n\n" " [STRING] input data. If it is not specified, data will be taken from\n" -" standard input.\n" +" standard input.\n\n" +"*SYMBOL VERSIONS\n" +" The symbol versions of QR Code range from Version 1 to Version\n" +" 40. Each version has a different module configuration or number\n" +" of modules, ranging from Version 1 (21 x 21 modules) up to\n" +" Version 40 (177 x 177 modules). Each higher version number\n" +" comprises 4 additional modules per side by default. See\n" +" http://www.qrcode.com/en/about/version.html for a detailed\n" +" version list.\n" + ); } else { fprintf(stderr, @@ -810,6 +825,11 @@ perror("Failed to encode the input data"); exit(EXIT_FAILURE); } + + if(verbose) { + fprintf(stderr, "File: %s, Version: %d\n", (outfile!=NULL)?outfile:"(stdout)", qrcode->version); + } + switch(image_type) { case PNG_TYPE: writePNG(qrcode, outfile); @@ -840,6 +860,7 @@ fprintf(stderr, "Unknown image type.\n"); exit(EXIT_FAILURE); } + QRcode_free(qrcode); } @@ -921,6 +942,11 @@ } else { snprintf(filename, FILENAME_MAX, "%s-%02d", base, i); } + + if(verbose) { + fprintf(stderr, "File: %s, Version: %d\n", filename, p->code->version); + } + switch(image_type) { case PNG_TYPE: writePNG(p->code, filename); @@ -1074,9 +1100,6 @@ case '8': eightbit = 1; break; - case 'r': - rle = 1; - break; case 'M': micro = 1; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/qrencode.1.in new/qrencode-3.4.4/qrencode.1.in --- old/qrencode-3.4.3/qrencode.1.in 2012-10-15 08:03:28.000000000 +0200 +++ new/qrencode-3.4.4/qrencode.1.in 2014-07-24 14:17:49.000000000 +0200 @@ -30,7 +30,7 @@ specify error collectin level from L (lowest) to H (highest). (default=L) .TP .B \-v NUMBER, \-\-symversion=NUMBER -specify the version of the symbol. (default=auto) +specify the version of the symbol. See SYMBOL VERSIONS for more information. (default=auto) .TP .B \-m NUMBER, \-\-margin=NUMBER specify the width of margin. (default=4) @@ -75,9 +75,19 @@ .B \-V, \-\-version display the version number and copyrights of the qrencode. .TP +.B \-\-verbose +display verbose information to stderr. +.TP .B [STRING] input data. If it is not specified, data will be taken from standard input. +.SH SYMBOL VERSIONS +The symbol versions of QR Code range from Version 1 to Version 40. +Each version has a different module configuration or number of modules, +ranging from Version 1 (21 x 21 modules) up to Version 40 (177 x 177 modules). +Each higher version number comprises 4 additional modules per side by default. +See http://www.qrcode.com/en/about/version.html for a detailed version list. + .SH EXAMPLES .TP .B qrencode \-l L \-v 1 \-o output.png 'Hello, world!' @@ -86,6 +96,9 @@ .B qrencode \-iSv 1 \-\-output=output.png read standard input and encode it into a structured-appended symbols in case-insensitive mode. +.TP +.B cat bigfile.txt | qrencode \-S \-v 40 \-l L \-o output.png +encode into a symbol version 40, level L. .SH AUTHOR Written by Kentaro Fukuchi. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/qrencode.c new/qrencode-3.4.4/qrencode.c --- old/qrencode-3.4.3/qrencode.c 2012-11-26 13:48:55.000000000 +0100 +++ new/qrencode-3.4.4/qrencode.c 2014-07-24 14:17:49.000000000 +0200 @@ -533,6 +533,9 @@ goto EXIT; } qrcode = QRcode_new(version, width, masked); + if(qrcode == NULL) { + free(masked); + } EXIT: QRraw_free(raw); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/qrencode.spec new/qrencode-3.4.4/qrencode.spec --- old/qrencode-3.4.3/qrencode.spec 2013-08-12 03:57:36.000000000 +0200 +++ new/qrencode-3.4.4/qrencode.spec 2014-07-24 14:18:52.000000000 +0200 @@ -1,4 +1,4 @@ -%define ver 3.4.3 +%define ver 3.4.4 %define rel 1 Name: qrencode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/qrinput.c new/qrencode-3.4.4/qrinput.c --- old/qrencode-3.4.3/qrinput.c 2013-07-29 11:32:19.000000000 +0200 +++ new/qrencode-3.4.4/qrinput.c 2014-07-24 14:17:49.000000000 +0200 @@ -1677,22 +1677,20 @@ int QRinput_Struct_insertStructuredAppendHeaders(QRinput_Struct *s) { - int num, i; + int i; QRinput_InputList *list; + if(s->size == 1) { + return 0; + } + if(s->parity < 0) { QRinput_Struct_calcParity(s); } - num = 0; - list = s->head; - while(list != NULL) { - num++; - list = list->next; - } i = 1; list = s->head; while(list != NULL) { - if(QRinput_insertStructuredAppendHeader(list->input, num, i, s->parity)) + if(QRinput_insertStructuredAppendHeader(list->input, s->size, i, s->parity)) return -1; i++; list = list->next; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/tests/common.h new/qrencode-3.4.4/tests/common.h --- old/qrencode-3.4.3/tests/common.h 2012-11-01 14:10:59.000000000 +0100 +++ new/qrencode-3.4.4/tests/common.h 2014-07-24 14:17:49.000000000 +0200 @@ -70,6 +70,20 @@ } } +void printQRinputStruct(QRinput_Struct *s) +{ + QRinput_InputList *list; + int i = 1; + + printf("Struct size: %d\n", s->size); + printf("Struct parity: %08x\n", s->parity); + for(list = s->head; list != NULL; list = list->next) { + printf("Symbol %d - ", i); + printQRinputInfo(list->input); + i++; + } +} + void printFrame(int width, unsigned char *frame) { int x, y; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/tests/test_qrinput.c new/qrencode-3.4.4/tests/test_qrinput.c --- old/qrencode-3.4.3/tests/test_qrinput.c 2012-11-01 14:10:59.000000000 +0100 +++ new/qrencode-3.4.4/tests/test_qrinput.c 2014-07-24 14:17:49.000000000 +0200 @@ -564,6 +564,26 @@ free(str); } +void test_struct_singlestructure(void) +{ + QRinput *input; + QRinput_Struct *s; + char *str = "TEST"; + + testStart("Testing structured-append symbols. (single structure)"); + input = QRinput_new2(10, QR_ECLEVEL_H); + QRinput_append(input, QR_MODE_AN, strlen(str), (unsigned char *)str); + s = QRinput_splitQRinputToStruct(input); + assert_nonnull(s, "must return a code."); + assert_equal(s->size, 1, "size must be 1, but %d returned.", s->size); + if(s->size != 1) { + printQRinputStruct(s); + } + testFinish(); + if(s != NULL) QRinput_Struct_free(s); + QRinput_free(input); +} + void test_splitentry(void) { QRinput *i1, *i2; @@ -966,6 +986,7 @@ test_struct_split_example(); test_struct_split_tooLarge(); test_struct_split_invalidVersion(); + test_struct_singlestructure(); test_parity(); test_parity2(); test_null_free(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/use/compile new/qrencode-3.4.4/use/compile --- old/qrencode-3.4.3/use/compile 2010-10-07 05:16:50.000000000 +0200 +++ new/qrencode-3.4.4/use/compile 2014-07-04 02:44:32.000000000 +0200 @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ # bugs to <[email protected]> or send patches to # <[email protected]>. +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to <[email protected]>. EOF @@ -53,11 +255,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qrencode-3.4.3/use/missing new/qrencode-3.4.4/use/missing --- old/qrencode-3.4.3/use/missing 2010-10-07 05:16:50.000000000 +0200 +++ new/qrencode-3.4.4/use/missing 2014-07-04 02:44:32.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp)
