From 51e2d260b9f3cdf2e42dc8819fce9489d991e468 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 6 Nov 2024 14:30:29 +0800 Subject: poppler: upgrade 24.09.0 -> 24.11.0 Changelog: ============ core: * Fix rendering of some buttons * Fix selecting fonts in TTC font collections * CairoOutputDev: prevent infinite loop in functionShadedFill() * Fix some unstable headers not being usable on their own * Fix some headers not being usable on their own * Add support for SubmitForms Links * Internal code improvements * Fix crash in malformed documents glib: * Fix some headers not being usable on their own * add INSTALL_GLIB_DEMO option to install poppler-glib-demo * Fix Launch action with unicode encoded filenames * add auto_cleanup functions so that consumers can use g_auto* * fix closure GI annotation qt6: * Fix memory handling issue on signature creation * Fix Launch action with unicode encoded filenames * Add support for SubmitForms Links * Add API for creating signature field without signing immediately qt5: * Fix Launch action with unicode encoded filenames * Add support for SubmitForms Links build system: * Remove duplicate definitions * cmake: Set CMAKE_C_STANDARD to 17 * Use the boosts own cmake file as suggested by cmake itself Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- meta-oe/recipes-support/poppler/poppler_24.09.0.bb | 57 ---------------------- meta-oe/recipes-support/poppler/poppler_24.11.0.bb | 57 ++++++++++++++++++++++ 2 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 meta-oe/recipes-support/poppler/poppler_24.09.0.bb create mode 100644 meta-oe/recipes-support/poppler/poppler_24.11.0.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-support/poppler/poppler_24.09.0.bb b/meta-oe/recipes-support/poppler/poppler_24.09.0.bb deleted file mode 100644 index fb6b534cf4..0000000000 --- a/meta-oe/recipes-support/poppler/poppler_24.09.0.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - file://0001-cmake-Do-not-use-isystem.patch \ - " -SRC_URI[sha256sum] = "ebd857987e2395608c69fdc44009692d5906f13b612c5280beff65a0b75dc255" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff" -PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss" -PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme" -PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_LCMS=ON \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DRUN_GPERF_IF_PRESENT=OFF \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" -EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" - -do_configure:append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES:libpoppler = "${libdir}/libpoppler.so.*" -FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS:libpoppler = "poppler-data" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/poppler/poppler_24.11.0.bb b/meta-oe/recipes-support/poppler/poppler_24.11.0.bb new file mode 100644 index 0000000000..8b9888a78a --- /dev/null +++ b/meta-oe/recipes-support/poppler/poppler_24.11.0.bb @@ -0,0 +1,57 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + file://0001-cmake-Do-not-use-isystem.patch \ + " +SRC_URI[sha256sum] = "7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff" +PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss" +PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme" +PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_LCMS=ON \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DRUN_GPERF_IF_PRESENT=OFF \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" +EXTRA_OECMAKE:append:class-native = " -DENABLE_CPP=OFF" + +do_configure:append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES:libpoppler = "${libdir}/libpoppler.so.*" +FILES:libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS:libpoppler = "poppler-data" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf