Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package extractpdfmark for openSUSE:Factory checked in at 2022-12-05 18:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/extractpdfmark (Old) and /work/SRC/openSUSE:Factory/.extractpdfmark.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extractpdfmark" Mon Dec 5 18:01:24 2022 rev:3 rq:1040121 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/extractpdfmark/extractpdfmark.changes 2021-03-06 21:19:17.449274720 +0100 +++ /work/SRC/openSUSE:Factory/.extractpdfmark.new.1835/extractpdfmark.changes 2022-12-05 18:01:31.652688221 +0100 @@ -1,0 +2,8 @@ +Sun Dec 4 21:29:47 UTC 2022 - Dirk Müller <[email protected]> + +- update to 1.1.1: + * Fix handling a named destination with an empty string name + * Exclude deprecated poppler-core interface for poppler 0.76+ + * Add stable poppler-glib interface for poppler 0.78.0+ + +------------------------------------------------------------------- Old: ---- extractpdfmark-1.1.0.tar.gz New: ---- extractpdfmark-1.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extractpdfmark.spec ++++++ --- /var/tmp/diff_new_pack.uGrrZv/_old 2022-12-05 18:01:32.540693056 +0100 +++ /var/tmp/diff_new_pack.uGrrZv/_new 2022-12-05 18:01:32.564693187 +0100 @@ -1,7 +1,7 @@ # # spec file for package extractpdfmark # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: extractpdfmark -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: Helper for correctly compacting PDF files created by TeX License: GPL-3.0-or-later @@ -43,12 +43,10 @@ %prep %autosetup -p1 - %build %configure %make_build - %install %make_install rm -rf %{buildroot}%{_datadir}/doc ++++++ extractpdfmark-1.1.0.tar.gz -> extractpdfmark-1.1.1.tar.gz ++++++ ++++ 19578 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/extractpdfmark-1.1.0/NEWS new/extractpdfmark-1.1.1/NEWS --- old/extractpdfmark-1.1.0/NEWS 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/NEWS 2022-09-30 14:49:06.000000000 +0200 @@ -1,3 +1,11 @@ +Release 1.1.1 (2022-09-30): + Fix handling a named destination with an empty string name + https://github.com/trueroad/extractpdfmark/issues/3 + + Exclude deprecated poppler-core interface for poppler 0.76+ + + Add stable poppler-glib interface for poppler 0.78.0+ + Release 1.1.0 (2019-02-11): Add stable poppler-cpp interface for poppler 0.74.0+ 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/extractpdfmark-1.1.0/README.ja.md new/extractpdfmark-1.1.1/README.ja.md --- old/extractpdfmark-1.1.0/README.ja.md 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/README.ja.md 2022-09-30 14:49:06.000000000 +0200 @@ -1,6 +1,8 @@ <!-- -*- coding: utf-8 -*- --> # Extract PDFmark +[ Japanese (æ¥æ¬èª) / [English](./README.md) ] + PDF ãããã¼ã¸ã¢ã¼ãããªã³ã¯ã®å®å åãæ½åºã PDFmark ã¨ãã¦ä¿åãã¾ã https://github.com/trueroad/extractpdfmark @@ -74,25 +76,19 @@ ããã¤ãã®ãã£ã¹ããªãã¥ã¼ã·ã§ã³ã«ã¯ `extractpdfmark` ããã±ã¼ã¸ãããã¾ãã -* Debian: -[9 stretch](https://packages.debian.org/stretch/extractpdfmark). -* Ubuntu: -17.04 Zesty Zapus, -17.10 Artful Aardvark, -[18.04 LTS Bionic Beaver](https://packages.ubuntu.com/bionic/extractpdfmark), -[18.10 Cosmic Cuttlefish](https://packages.ubuntu.com/cosmic/extractpdfmark). -* Fedora: -[29](https://apps.fedoraproject.org/packages/extractpdfmark). -* Cygwin: -[2017-05](https://sourceware.org/ml/cygwin-announce/2017-05/msg00030.html). +* Debian +* Ubuntu +* Fedora +* Cygwin +* etc. -## [ã½ã¼ã¹ tarball](https://github.com/trueroad/extractpdfmark/releases/download/v1.1.0/extractpdfmark-1.1.0.tar.gz) ããã®ã¤ã³ã¹ãã¼ã« +## [ã½ã¼ã¹ tarball](https://github.com/trueroad/extractpdfmark/releases/download/v1.1.1/extractpdfmark-1.1.1.tar.gz) ããã®ã¤ã³ã¹ãã¼ã« ### å¿ è¦ãªãã® -Extract PDFmark 㯠poppler ã«ãã 2 種é¡ã®ã¤ã³ã¿ãã§ã¼ã¹ã®ãã¡ã -ã©ã¡ãããå¿ è¦ã¨ãã¾ãã -Extract PDFmark ããã«ãããéã«ãã©ã¡ãã使ç¨ãããé¸æãã¦ãã ããã +Extract PDFmark 㯠poppler ã«ãã 3 種é¡ã®ã¤ã³ã¿ãã§ã¼ã¹ã®ãã¡ã +ã©ãããå¿ è¦ã¨ãã¾ãã +Extract PDFmark ããã«ãããéã«ãã©ãã使ç¨ãããé¸æãã¦ãã ããã #### poppler-cpp I/F ï¼æ¨å¥¨ï¼ @@ -113,29 +109,44 @@ * Cygwin + libpoppler-cpp-devel -#### poppler-core I/F +#### poppler-glib I/F + +[poppler](https://poppler.freedesktop.org/) 0.78.0 以éãå¿ è¦ã§ãã +Extract PDFmark ã® configure ã¹ã¯ãªããã¯ã +pkg-config ã poppler-cpp >= 0.74.0 ãè¦ã¤ããããã +ã㤠poppler-glib >= 0.78.0 ãè¦ã¤ããã +poppler-glib I/F ãé¸æãã¾ãã + +configure ã¹ã¯ãªããã®ãªãã·ã§ã³ `--with-poppler=glib` ã«ãã£ã¦ã +æ¬ I/F ã®ä½¿ç¨ãæ示çã«æå®ã§ãã¾ãã -[poppler](https://poppler.freedesktop.org/) 0.13.3 以é +#### poppler-core I/F ï¼éæ¨å¥¨ï¼ + +[poppler](https://poppler.freedesktop.org/) 0.13.3 ãã 0.75.0 ã«ä»¥ä¸ã®ãªãã·ã§ã³ãã¤ãã¦ãã«ããããã®ãå¿ è¦ã§ã -ï¼æ¨å¥¨ poppler 0.48.0 以éï¼ã -poppler 0.74.0 以éã®å ´å㯠poppler-cpp I/F ã®æ¹ãæ¨å¥¨ãã¾ãã +ï¼æ¨å¥¨ poppler 0.48.0 ãã 0.73.0ï¼ã * --enable-xpdf-headers (poppler 0.59.0 ã¾ã§) * -DENABLE_XPDF_HEADERS=ON ï¼poppler 0.60.0 ãã 0.72.0ï¼ -* -DENABLE_UNSTABLE_API_ABI_HEADERS=ON (poppler 0.73.0 以é) +* -DENABLE_UNSTABLE_API_ABI_HEADERS=ON (poppler 0.73.0 ãã 0.75.0) + +poppler 0.74.0 以éã®å ´åã¯ããã® I/F ãã poppler-cpp I/F ã®æ¹ãæ¨å¥¨ãã¾ãã +poppler 0.76.0 ã§ãã® I/F ã«ç ´å£çå¤æ´ãå ¥ã£ãããã +poppler 0.76.0 以éã§ã¯ãã® I/F ã使ã£ãExtract PDFmarkã®ãã«ãã失æãã¾ãã Extract PDFmark ã® configure ã¹ã¯ãªããã¯ã pkg-config ã poppler-cpp >= 0.74.0 ãè¦ã¤ããããã -ã㤠poppler >= 0.24.4 ãè¦ã¤ããã +poppler-glib >= 0.78.0 ãè¦ã¤ããããã +ã㤠poppler 0.24.4 - 0.75.0 ãè¦ã¤ããã poppler-core I/F ãé¸æãã¾ãã æ¬ I/F ã«ã¯ private çã¨é常çã® 2 種é¡ãããã¾ãã poppler 0.24.4 ãã 0.47.0 ã®å ´å㯠private çãé¸æããã¾ãã -poppler 0.48.0 以éã®å ´åã¯é常çãé¸æããã¾ãã +poppler 0.48.0 ãã 0.75.0 ã®å ´åã¯é常çãé¸æããã¾ãã configure ã¹ã¯ãªããã®ãªãã·ã§ã³ `--with-poppler=core-private` ã«ãã£ã¦ã -private çã®ä½¿ç¨ãæ示çã«æå®ã§ãã¾ãï¼poppler 0.13.3 以éç¨ï¼ã +private çã®ä½¿ç¨ãæ示çã«æå®ã§ãã¾ãï¼poppler 0.13.3 ãã 0.75.0 ç¨ï¼ã configure ã¹ã¯ãªããã®ãªãã·ã§ã³ `--with-poppler=core` ã«ãã£ã¦ã -é常çã®ä½¿ç¨ãæ示çã«æå®ã§ãã¾ãï¼poppler 0.48.0 以éç¨ï¼ã +é常çã®ä½¿ç¨ãæ示çã«æå®ã§ãã¾ãï¼poppler 0.48.0 ãã 0.75.0 ç¨ï¼ã poppler 0.13.3 ãã 0.24.3 ã使ãã«ã¯ã configure ã¹ã¯ãªããã®ãªãã·ã§ã³ `--with-poppler=core-private` ã æ示çã«æå®ããå¿ è¦ãããã¾ãã @@ -199,7 +210,7 @@ ## ã©ã¤ã»ã³ã¹ -Copyright (C) 2016-2019 Masamichi Hosoda +Copyright (C) 2016-2022 Masamichi Hosoda Extract PDFmark is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by 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/extractpdfmark-1.1.0/README.md new/extractpdfmark-1.1.1/README.md --- old/extractpdfmark-1.1.0/README.md 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/README.md 2022-09-30 14:49:06.000000000 +0200 @@ -1,5 +1,8 @@ +<!-- -*- coding: utf-8 -*- --> # Extract PDFmark +[ [Japanese (æ¥æ¬èª)](./README.ja.md) / English ] + Extract page mode and named destinations as PDFmark from PDF https://github.com/trueroad/extractpdfmark @@ -70,24 +73,18 @@ Some distributions have `extractpdfmark` package. -* Debian: -[9 stretch](https://packages.debian.org/stretch/extractpdfmark). -* Ubuntu: -17.04 Zesty Zapus, -17.10 Artful Aardvark, -[18.04 LTS Bionic Beaver](https://packages.ubuntu.com/bionic/extractpdfmark), -[18.10 Cosmic Cuttlefish](https://packages.ubuntu.com/cosmic/extractpdfmark). -* Fedora: -[29](https://apps.fedoraproject.org/packages/extractpdfmark). -* Cygwin: -[2017-05](https://sourceware.org/ml/cygwin-announce/2017-05/msg00030.html). +* Debian +* Ubuntu +* Fedora +* Cygwin +* etc. -## Install from [source tarball](https://github.com/trueroad/extractpdfmark/releases/download/v1.1.0/extractpdfmark-1.1.0.tar.gz) +## Install from [source tarball](https://github.com/trueroad/extractpdfmark/releases/download/v1.1.1/extractpdfmark-1.1.1.tar.gz) ### Required -Extract PDFmark requires one of the two interfaces of poppler. -Please choose which to use when building Extrat PDFmark. +Extract PDFmark requires one of the three interfaces of poppler. +Please choose which to use when building Extrcat PDFmark. #### poppler-cpp I/F (recommended) @@ -108,28 +105,43 @@ * Cygwin + libpoppler-cpp-devel -#### poppler-core I/F +#### poppler-glib I/F + +[poppler](https://poppler.freedesktop.org/) 0.78.0+ is required. +Extract PDFmark's configure script selects poppler-glib I/F +if pkg-config does not find poppler-cpp >= 0.74.0, +and finds poppler-glib 0.78.0+. -[poppler](https://poppler.freedesktop.org/) 0.13.3+ +The configure script's option `--with-poppler=glib` specifies +explicitly using this interface. + +#### poppler-core I/F (deprecated) + +[poppler](https://poppler.freedesktop.org/) 0.13.3 - 0.75.0 built with the following option is required -(recommended poppler 0.48.0+). -If you have poppler 0.74.0+, poppler-cpp I/F is recommended. +(recommended poppler 0.48.0 - 0.73.0). * --enable-xpdf-headers (poppler 0.59.0 and before) * -DENABLE_XPDF_HEADERS=ON (poppler 0.60.0 - 0.72.0) -* -DENABLE_UNSTABLE_API_ABI_HEADERS=ON (poppler 0.73.0 and after) +* -DENABLE_UNSTABLE_API_ABI_HEADERS=ON (poppler 0.73.0 - 0.75.0) + +If you have poppler 0.74.0+, poppler-cpp I/F +instead of this I/F is recommended. +Extract PDFmark build with this I/F on poppler-0.76.0+ fails +since poppler-0.76.0 has a disruptive change to the I/F. Extract PDFmark's configure script selects poppler-core I/F -if pkg-config does not find poppler-cpp >= 0.74.0 -and finds poppler >= 0.24.4. +if pkg-config does not find poppler-cpp >= 0.74.0, +does not find poppler-glib >= 0.78.0, +and finds poppler 0.24.4 - 0.75.0. There are two versions of this interface, private and normal. For popler 0.24.4 - 0.47.0, private version is selected. -For popler 0.48.0+, normal version is selected. +For popler 0.48.0 - 0.75.0, normal version is selected. The configure script's option `--with-poppler=core-private` specifies -explicitly using private version (for poppler 0.13.3+). +explicitly using private version (for poppler 0.13.3 - 0.75.0). The configure script's option `--with-poppler=core` specifies -explicitly using normal version (for poppler 0.48.0+). +explicitly using normal version (for poppler 0.48.0 - 0.75.0). If you would like to use poppler 0.13.3 - 0.24.3, it is necessary to specify explicitly configure script's option `--with-poppler=core-private`. @@ -194,7 +206,7 @@ ## Licence -Copyright (C) 2016-2019 Masamichi Hosoda +Copyright (C) 2016-2022 Masamichi Hosoda Extract PDFmark is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by 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/extractpdfmark-1.1.0/compile new/extractpdfmark-1.1.1/compile --- old/extractpdfmark-1.1.0/compile 2019-02-11 12:55:12.000000000 +0100 +++ new/extractpdfmark-1.1.1/compile 2022-09-30 14:49:38.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/extractpdfmark-1.1.0/config.h.in new/extractpdfmark-1.1.1/config.h.in --- old/extractpdfmark-1.1.0/config.h.in 2019-02-11 12:55:08.000000000 +0100 +++ new/extractpdfmark-1.1.1/config.h.in 2022-09-30 14:49:34.000000000 +0200 @@ -18,9 +18,6 @@ /* Define to 1 if you have the <Link.h> header file. */ #undef HAVE_LINK_H -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the <PDFDocFactory.h> header file. */ #undef HAVE_PDFDOCFACTORY_H @@ -33,6 +30,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -84,7 +84,9 @@ /* Define poppler version if POPPLER_VERSION cannot be used. */ #undef POPPLER_CORE_IF_VERSION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Define if codecvt is enabled. */ 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/extractpdfmark-1.1.0/config.rpath new/extractpdfmark-1.1.1/config.rpath --- old/extractpdfmark-1.1.0/config.rpath 2019-02-11 12:55:00.000000000 +0100 +++ new/extractpdfmark-1.1.1/config.rpath 2022-09-30 14:49:25.000000000 +0200 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2016 Free Software Foundation, Inc. +# Copyright 1996-2020 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <[email protected]>, 1996 # 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/extractpdfmark-1.1.0/configure.ac new/extractpdfmark-1.1.1/configure.ac --- old/extractpdfmark-1.1.0/configure.ac 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/configure.ac 2022-09-30 14:49:06.000000000 +0200 @@ -2,13 +2,13 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([Extract PDFmark], [1.1.0], , [extractpdfmark], +AC_INIT([Extract PDFmark], [1.1.1], , [extractpdfmark], [https://github.com/trueroad/extractpdfmark]) AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_SRCDIR([src/main.cc]) AC_CONFIG_HEADERS([config.h]) -PACKAGE_COPYRIGHT="Copyright (C) 2016-2019 Masamichi Hosoda" +PACKAGE_COPYRIGHT="Copyright (C) 2016-2022 Masamichi Hosoda" PACKAGE_LICENSE="License: GPL3+" AC_SUBST([PACKAGE_COPYRIGHT]) @@ -85,34 +85,48 @@ [AC_MSG_NOTICE([--with-poppler=cpp requires poppler >= 0.74.0]) PKG_CHECK_MODULES([POPPLER_CPP], [poppler-cpp >= 0.74.0])], ["glib"], - [AC_MSG_NOTICE([--with-poppler=glib requires poppler >= 0.74.0]) - PKG_CHECK_MODULES([POPPLER_GLIB], [poppler-glib >= 0.74.0])], + [AC_MSG_NOTICE([--with-poppler=glib requires poppler >= 0.78.0]) + PKG_CHECK_MODULES([POPPLER_GLIB], [poppler-glib >= 0.78.0])], ["core"], - [AC_MSG_NOTICE([--with-poppler=core requires poppler >= 0.48.0]) - PKG_CHECK_MODULES([POPPLER], [poppler >= 0.48.0])], + [AC_MSG_NOTICE( + [--with-poppler=core requires poppler 0.48.0 - 0.75.0]) + PKG_CHECK_MODULES([POPPLER], + [poppler >= 0.48.0 poppler <= 0.75.0])], ["core-private"], [AC_MSG_NOTICE( - [--with-poppler=core-private requires poppler >= 0.13.3]) - PKG_CHECK_MODULES([POPPLER], [poppler >= 0.19.2],, - [PKG_CHECK_MODULES([POPPLER], [poppler >= 0.13.3]) - AC_DEFINE_UNQUOTED([POPPLER_CORE_IF_VERSION], - ["`$PKG_CONFIG --modversion poppler`"], - [Define poppler version if POPPLER_VERSION cannot be used.])])], + [--with-poppler=core-private requires poppler 0.13.3 - 0.75.0]) + PKG_CHECK_MODULES([POPPLER], + [poppler >= 0.24.4 poppler <= 0.75.0],, + [PKG_CHECK_MODULES([POPPLER], [poppler >= 0.19.2], + [AC_MSG_WARN([poppler < 0.24.4 is found.]) + AC_MSG_WARN([`make check' will fail some tests.])], + [PKG_CHECK_MODULES([POPPLER], [poppler >= 0.13.3]) + AC_MSG_WARN([poppler < 0.19.2 is found.]) + AC_MSG_WARN([`make check' will fail some tests.]) + AC_DEFINE_UNQUOTED([POPPLER_CORE_IF_VERSION], + ["`$PKG_CONFIG --modversion poppler`"], + [Define poppler version if POPPLER_VERSION cannot be used.])])])], ["auto"], [AC_MSG_NOTICE([selecting for --with-poppler=auto]) AC_MSG_NOTICE([ trying for cpp (poppler-cpp >= 0.74.0)]) PKG_CHECK_MODULES( [POPPLER_CPP], [poppler-cpp >= 0.74.0], [with_poppler="cpp"], - [AC_MSG_NOTICE([ trying for core (poppler >= 0.48.0)]) + [AC_MSG_NOTICE([ trying for glib (poppler-glib >= 0.78.0)]) PKG_CHECK_MODULES( - [POPPLER], [poppler >= 0.48.0], - [with_poppler="core"], + [POPPLER_GLIB], [poppler-glib >= 0.78.0], + [with_poppler="glib"], [AC_MSG_NOTICE( - [ trying for core-private (poppler >= 0.24.4)]) - PKG_CHECK_MODULES([POPPLER], [poppler >= 0.24.4], - [with_poppler="core-private"])])])] - AC_MSG_NOTICE([use --with-poppler=$with_poppler]), + [ trying for core (poppler 0.48.0 - 0.75.0)]) + PKG_CHECK_MODULES( + [POPPLER], [poppler >= 0.48.0 poppler <= 0.75.0], + [with_poppler="core"], + [AC_MSG_NOTICE( + [ trying for core-private (poppler >= 0.24.4)]) + PKG_CHECK_MODULES([POPPLER], + [poppler >= 0.24.4 poppler <= 0.75.0], + [with_poppler="core-private"])])])]) + AC_MSG_NOTICE([use --with-poppler=$with_poppler])], [AC_MSG_ERROR([unrecognized --with-poppler argument: $with_poppler])]) AS_CASE(["$with_poppler"], ["cpp"], 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/extractpdfmark-1.1.0/m4/ax_cxx_compile_stdcxx.m4 new/extractpdfmark-1.1.1/m4/ax_cxx_compile_stdcxx.m4 --- old/extractpdfmark-1.1.0/m4/ax_cxx_compile_stdcxx.m4 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/m4/ax_cxx_compile_stdcxx.m4 2022-09-30 14:49:07.000000000 +0200 @@ -10,13 +10,13 @@ # # Check for baseline language coverage in the compiler for the specified # version of the C++ standard. If necessary, add switches to CXX and -# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) -# or '14' (for the C++14 standard). +# CXXCPP to enable support. VERSION may be '11', '14', '17', or '20' for +# the respective C++ standard version. # # The second argument, if specified, indicates whether you insist on an # extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. # -std=c++11). If neither is specified, you get whatever works, with -# preference for an extended mode. +# preference for no added switch, and then for an extended mode. # # The third argument, if specified 'mandatory' or if left unspecified, # indicates that baseline support for the specified C++ standard is @@ -34,13 +34,16 @@ # Copyright (c) 2015 Paul Norman <[email protected]> # Copyright (c) 2015 Moritz Klammler <[email protected]> # Copyright (c) 2016, 2018 Krzesimir Nowak <[email protected]> +# Copyright (c) 2019 Enji Cooper <[email protected]> +# Copyright (c) 2020 Jason Merrill <[email protected]> +# Copyright (c) 2021 Jörn Heusipp <[email protected]> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 10 +#serial 15 dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro dnl (serial version number 13). @@ -49,6 +52,7 @@ m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], [$1], [14], [ax_cxx_compile_alternatives="14 1y"], [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [$1], [20], [ax_cxx_compile_alternatives="20"], [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl m4_if([$2], [], [], [$2], [ext], [], @@ -61,6 +65,16 @@ AC_LANG_PUSH([C++])dnl ac_success=no + m4_if([$2], [], [dnl + AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, + ax_cv_cxx_compile_cxx$1, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [ax_cv_cxx_compile_cxx$1=yes], + [ax_cv_cxx_compile_cxx$1=no])]) + if test x$ax_cv_cxx_compile_cxx$1 = xyes; then + ac_success=yes + fi]) + m4_if([$2], [noext], [], [dnl if test x$ac_success = xno; then for alternative in ${ax_cxx_compile_alternatives}; do @@ -139,7 +153,6 @@ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ) - dnl Test body for checking C++14 support m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], @@ -147,12 +160,24 @@ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 ) +dnl Test body for checking C++17 support + m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 ) +dnl Test body for checking C++20 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_20 +) + + dnl Tests for new features in C++11 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ @@ -164,7 +189,11 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 201103L +// MSVC always sets __cplusplus to 199711L in older versions; newer versions +// only set it correctly if /Zc:__cplusplus is specified as well as a +// /std:c++NN switch: +// https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ +#elif __cplusplus < 201103L && !defined _MSC_VER #error "This is not a C++11 compiler" @@ -189,11 +218,13 @@ struct Base { + virtual ~Base() {} virtual void f() {} }; struct Derived : public Base { + virtual ~Derived() override {} virtual void f() override {} }; @@ -453,7 +484,7 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 201402L +#elif __cplusplus < 201402L && !defined _MSC_VER #error "This is not a C++14 compiler" @@ -577,7 +608,7 @@ #error "This is not a C++ compiler" -#elif __cplusplus < 201703L +#elif __cplusplus < 201703L && !defined _MSC_VER #error "This is not a C++17 compiler" @@ -943,6 +974,36 @@ } // namespace cxx17 -#endif // __cplusplus < 201703L +#endif // __cplusplus < 201703L && !defined _MSC_VER + +]]) + + +dnl Tests for new features in C++20 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[ + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 202002L && !defined _MSC_VER + +#error "This is not a C++20 compiler" + +#else + +#include <version> + +namespace cxx20 +{ + +// As C++20 supports feature test macros in the standard, there is no +// immediate need to actually test for feature availability on the +// Autoconf side. + +} // namespace cxx20 + +#endif // __cplusplus < 202002L && !defined _MSC_VER ]]) 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/extractpdfmark-1.1.0/missing new/extractpdfmark-1.1.1/missing --- old/extractpdfmark-1.1.0/missing 2019-02-11 12:55:13.000000000 +0100 +++ new/extractpdfmark-1.1.1/missing 2022-09-30 14:49:38.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" 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/extractpdfmark-1.1.0/src/iconv_wrapper.hh new/extractpdfmark-1.1.1/src/iconv_wrapper.hh --- old/extractpdfmark-1.1.0/src/iconv_wrapper.hh 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/src/iconv_wrapper.hh 2022-09-30 14:49:07.000000000 +0200 @@ -1,8 +1,8 @@ // -// One header file iconv wrapper for C++11 2016-10-19.22 GPL -// https://github.com/trueroad/iconv_wrapper/ +// One header file iconv wrapper for C++11 2022-09-29.12 GPL +// https://github.com/trueroad/iconv_wrapper // -// Copyright (C) 2016 Masamichi Hosoda. All rights reserved. +// Copyright (C) 2016, 2019, 2022 Masamichi Hosoda. All rights reserved. // // One header file iconv wrapper for C++11 is free software: // you can redistribute it and/or modify @@ -152,7 +152,10 @@ std::string *pout) { size_t inleft {in.size ()}; - do_iconv (pout, &in.at (0), &inleft, pinpos); + if (inleft) + do_iconv (pout, &in.at (0), &inleft, pinpos); + else + pout->clear(); return *pout; } 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/extractpdfmark-1.1.0/src/poppler-cpp/poppler-cpp.cc new/extractpdfmark-1.1.1/src/poppler-cpp/poppler-cpp.cc --- old/extractpdfmark-1.1.0/src/poppler-cpp/poppler-cpp.cc 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/src/poppler-cpp/poppler-cpp.cc 2022-09-30 14:49:07.000000000 +0200 @@ -20,6 +20,7 @@ #include "poppler-cpp.hh" #include <iostream> +#include <memory> #include <string> #include <poppler-document.h> #include <poppler-version.h> @@ -31,7 +32,8 @@ bool poppler_cpp::open (const std::string &pdf_filename) { - doc = poppler::document::load_from_file (pdf_filename); + doc = std::unique_ptr<poppler::document> + {poppler::document::load_from_file (pdf_filename)}; if (!doc) { 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/extractpdfmark-1.1.0/src/poppler-cpp/poppler-cpp.hh new/extractpdfmark-1.1.1/src/poppler-cpp/poppler-cpp.hh --- old/extractpdfmark-1.1.0/src/poppler-cpp/poppler-cpp.hh 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/src/poppler-cpp/poppler-cpp.hh 2022-09-30 14:49:07.000000000 +0200 @@ -18,6 +18,7 @@ #ifndef INCLUDE_GUARD_POPPLER_CPP_HH #define INCLUDE_GUARD_POPPLER_CPP_HH +#include <memory> #include <string> #include <poppler-destination.h> #include <poppler-document.h> @@ -36,7 +37,7 @@ std::string walk (const std::string &name, const poppler::destination &dest); - poppler::document *doc = nullptr; + std::unique_ptr<poppler::document> doc; }; #endif // INCLUDE_GUARD_POPPLER_CPP_HH Binary files old/extractpdfmark-1.1.0/test/binary.pdf and new/extractpdfmark-1.1.1/test/binary.pdf differ Binary files old/extractpdfmark-1.1.0/test/destonly.pdf and new/extractpdfmark-1.1.1/test/destonly.pdf differ Binary files old/extractpdfmark-1.1.0/test/desttype.pdf and new/extractpdfmark-1.1.1/test/desttype.pdf differ Binary files old/extractpdfmark-1.1.0/test/namedict.pdf and new/extractpdfmark-1.1.1/test/namedict.pdf differ Binary files old/extractpdfmark-1.1.0/test/nodest.pdf and new/extractpdfmark-1.1.1/test/nodest.pdf differ Binary files old/extractpdfmark-1.1.0/test/pagemode-fullscreen.pdf and new/extractpdfmark-1.1.1/test/pagemode-fullscreen.pdf differ Binary files old/extractpdfmark-1.1.0/test/pagemode-thumbs.pdf and new/extractpdfmark-1.1.1/test/pagemode-thumbs.pdf differ Binary files old/extractpdfmark-1.1.0/test/pagemode-usenone.pdf and new/extractpdfmark-1.1.1/test/pagemode-usenone.pdf differ Binary files old/extractpdfmark-1.1.0/test/pdfdocencoding.pdf and new/extractpdfmark-1.1.1/test/pdfdocencoding.pdf differ Binary files old/extractpdfmark-1.1.0/test/special-chars.pdf and new/extractpdfmark-1.1.1/test/special-chars.pdf differ 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/extractpdfmark-1.1.0/test/test-expected-pdfmark.sh new/extractpdfmark-1.1.1/test/test-expected-pdfmark.sh --- old/extractpdfmark-1.1.0/test/test-expected-pdfmark.sh 2019-02-11 12:54:32.000000000 +0100 +++ new/extractpdfmark-1.1.1/test/test-expected-pdfmark.sh 2022-09-30 14:49:08.000000000 +0200 @@ -3,16 +3,11 @@ EXPECTEDPDFMARK=$1 BASENAME=`basename ${EXPECTEDPDFMARK} | sed -e "s/-expected\(-.\+\)\?\.pdfmark$//"` OPTSUFFIX=`echo ${EXPECTEDPDFMARK} | sed -e "s/^\(.*-expected\)\(-.\+\)\?\.pdfmark$/\2/"` +DIRNAME=`dirname ${EXPECTEDPDFMARK}` -PDF="${BASENAME}.pdf" +PDF="${DIRNAME}/${BASENAME}.pdf" EXTRACTEDPDFMARK="${BASENAME}-expected${OPTSUFFIX}-test.pdfmark" -if [ ! -e ${EXPECTEDPDFMARK} ]; then - EXPEXTEDPDFMARK="${srcdir}/${BASENAME}-expected${OPTSUFFIX}.pdfmark" -fi -if [ ! -e ${PDF} ]; then - PDF="${srcdir}/${BASENAME}.pdf" -fi if [ ! -s ${PDF} ]; then # skip exit 77 Binary files old/extractpdfmark-1.1.0/test/utf16.pdf and new/extractpdfmark-1.1.1/test/utf16.pdf differ Binary files old/extractpdfmark-1.1.0/test/utf8.pdf and new/extractpdfmark-1.1.1/test/utf8.pdf differ 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/extractpdfmark-1.1.0/test-driver new/extractpdfmark-1.1.1/test-driver --- old/extractpdfmark-1.1.0/test-driver 2019-02-11 12:55:13.000000000 +0100 +++ new/extractpdfmark-1.1.1/test-driver 2022-09-30 14:49:39.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # 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 @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -42,11 +42,13 @@ { cat <<END Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] + test-driver --test-name NAME --log-file PATH --trs-file PATH + [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + The '--test-name', '--log-file' and '--trs-file' options are mandatory. +See the GNU Automake documentation for information. END } @@ -103,8 +105,11 @@ trap "st=141; $do_exit" 13 trap "st=143; $do_exit" 15 -# Test script is run here. -"$@" >$log_file 2>&1 +# Test script is run here. We create the file first, then append to it, +# to ameliorate tests themselves also writing to the log file. Our tests +# don't, but others can (automake bug#35762). +: >"$log_file" +"$@" >>"$log_file" 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -126,7 +131,7 @@ # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file +echo "$res $test_name (exit status: $estatus)" >>"$log_file" # Report outcome to console. echo "${col}${res}${std}: $test_name" @@ -140,7 +145,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0"
