diff --git a/DEVELOPERS b/DEVELOPERS index 1adeaf7efe..7f99e8cb53 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -243,6 +243,7 @@ F: package/python-pillow/ F: package/python-pydal/ F: package/python-spidev/ F: package/python-web2py/ +F: package/qpdf/ F: package/qt5/qt5coap/ F: package/qt5/qt5knx/ F: package/qt5/qt5mqtt/ diff --git a/package/cups-filters/Config.in b/package/cups-filters/Config.in index ded99a4774..b5b9e04a28 100644 --- a/package/cups-filters/Config.in +++ b/package/cups-filters/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_CUPS_FILTERS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_PACKAGE_CUPS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # qpdf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # qpdf depends on BR2_TOOLCHAIN_HAS_ATOMIC # qpdf select BR2_PACKAGE_JPEG select BR2_PACKAGE_FONTCONFIG @@ -32,9 +32,9 @@ config BR2_PACKAGE_CUPS_FILTERS http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters -comment "cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 5" +comment "cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 10" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 diff --git a/package/qpdf/Config.in b/package/qpdf/Config.in index accf2b5f34..ccb6715110 100644 --- a/package/qpdf/Config.in +++ b/package/qpdf/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_QPDF bool "qpdf" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_ATOMIC select BR2_PACKAGE_ZLIB select BR2_PACKAGE_JPEG @@ -16,7 +16,7 @@ config BR2_PACKAGE_QPDF http://qpdf.sourceforge.net/ -comment "qpdf needs a toolchain w/ C++, gcc >= 5" +comment "qpdf needs a toolchain w/ C++, gcc >= 10" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_10 diff --git a/package/qpdf/qpdf.hash b/package/qpdf/qpdf.hash index 08a048f2ed..81bee9e58c 100644 --- a/package/qpdf/qpdf.hash +++ b/package/qpdf/qpdf.hash @@ -1,5 +1,5 @@ -# From https://sourceforge.net/projects/qpdf/files/qpdf/10.5.0/qpdf-10.5.0.sha256/download -sha256 88257d36a44fd5c50b2879488324dd9cafc11686ae49d8c4922a4872203ce006 qpdf-10.5.0.tar.gz +# From https://github.com/qpdf/qpdf/releases/download/v12.3.2/qpdf-12.3.2.sha256 +sha256 6cba2f9f2cd887d905faeb99e0e51a307b217920d1bbf3e9cfbb2e8178a2deda qpdf-12.3.2.tar.gz # Locally computed: sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt sha256 fb929ac30decb4dc3a2eea2bec6c43296a797c5d2d602deb3784ee39430583d5 Artistic-2.0 diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index d479515789..c11b42f60c 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -4,36 +4,31 @@ # ################################################################################ -QPDF_VERSION = 10.5.0 -QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) +QPDF_VERSION = 12.3.2 +QPDF_SITE = https://github.com/qpdf/qpdf/releases/download/v$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Apache-2.0 or Artistic-2.0 QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0 QPDF_CPE_ID_VALID = YES QPDF_DEPENDENCIES = host-pkgconf zlib jpeg +QPDF_SUPPORTS_IN_SOURCE_BUILD = NO -QPDF_CONF_OPTS = --with-random=/dev/urandom - -ifeq ($(BR2_USE_WCHAR),) -QPDF_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -DQPDF_NO_WCHAR_T" -endif +QPDF_CONF_OPTS = \ + -DUSE_IMPLICIT_CRYPTO=OFF \ + -DREQUIRE_CRYPTO_NATIVE=ON ifeq ($(BR2_PACKAGE_GNUTLS),y) -QPDF_CONF_OPTS += --enable-crypto-gnutls +QPDF_CONF_OPTS += -DREQUIRE_CRYPTO_GNUTLS=ON QPDF_DEPENDENCIES += gnutls else -QPDF_CONF_OPTS += --disable-crypto-gnutls +QPDF_CONF_OPTS += -DREQUIRE_CRYPTO_GNUTLS=OFF endif ifeq ($(BR2_PACKAGE_OPENSSL),y) -QPDF_CONF_OPTS += --enable-crypto-openssl +QPDF_CONF_OPTS += -DREQUIRE_CRYPTO_OPENSSL=ON QPDF_DEPENDENCIES += openssl else -QPDF_CONF_OPTS += --disable-crypto-openssl +QPDF_CONF_OPTS += -DREQUIRE_CRYPTO_OPENSSL=OFF endif -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -QPDF_CONF_ENV += LIBS=-latomic -endif - -$(eval $(autotools-package)) +$(eval $(cmake-package))