From 2ccc58586006943f1ac29adf707fad4f597a3e7f Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Tue, 28 Feb 2023 09:11:31 -0800 Subject: [PATCH 1/4] +poppler.freedesktop.org --- projects/poppler.freedesktop.org/package.yml | 60 ++++++++++++++++++ .../poppler-data/package.yml | 24 +++++++ projects/poppler.freedesktop.org/test.pdf | Bin 0 -> 136 bytes 3 files changed, 84 insertions(+) create mode 100644 projects/poppler.freedesktop.org/package.yml create mode 100644 projects/poppler.freedesktop.org/poppler-data/package.yml create mode 100644 projects/poppler.freedesktop.org/test.pdf diff --git a/projects/poppler.freedesktop.org/package.yml b/projects/poppler.freedesktop.org/package.yml new file mode 100644 index 0000000000..00c59a2a76 --- /dev/null +++ b/projects/poppler.freedesktop.org/package.yml @@ -0,0 +1,60 @@ +distributable: + url: https://poppler.freedesktop.org/poppler-{{version}}.tar.xz + strip-components: 1 + +versions: + github: freedesktop/poppler/tags + strip: /^poppler-/ + +provides: + - bin/pdfattach + - bin/pdfdetach + - bin/pdffonts + - bin/pdfimages + - bin/pdfinfo + - bin/pdfseparate + - bin/pdftocairo + - bin/pdftohtml + - bin/pdftoppm + - bin/pdftops + - bin/pdftotext + - bin/pdfunite + +# TODO: Add in libopenjpeg, libtiff +dependencies: + boost.org: '>=1.58.0' + cairographics.org: '>=1.16.0' + curl.se: '*' + freedesktop.org/fontconfig: '>=2.13' + freetype.org: '>=2.10' + gnome.org/glib: '>=2.64' + libjpeg-turbo.org: '*' + libpng.org: '*' + openjpeg.org: '*' + poppler.freedesktop.org/poppler-data: '*' + simplesystems.org/libtiff: '*' + zlib.net: '*' + +build: + dependencies: + cmake.org: '>=3.16.0' + freedesktop.org/pkg-config: '*' + gnome.org/gobject-introspection: '>=1.64.0' + tea.xyz/gx/cc: c99 + tea.xyz/gx/make: '*' + script: | + cmake -S . -B build_shared $ARGS + cmake --build build_shared + cmake --install build_shared + + cmake -S . -B build_static $ARGS -DBUILD_SHARED_LIBS=OFF + cmake --build build_static + install -c build_static/libpoppler.a build_static/cpp/libpoppler-cpp.a build_static/glib/libpoppler-glib.a {{prefix}}/lib + env: + ARGS: + - -DCMAKE_BUILD_TYPE=Release + - -DCMAKE_INSTALL_PREFIX="{{prefix}}" + +test: + script: | + pdfinfo test.pdf diff --git a/projects/poppler.freedesktop.org/poppler-data/package.yml b/projects/poppler.freedesktop.org/poppler-data/package.yml new file mode 100644 index 0000000000..ffdcfd0baf --- /dev/null +++ b/projects/poppler.freedesktop.org/poppler-data/package.yml @@ -0,0 +1,24 @@ +distributable: + url: https://poppler.freedesktop.org/poppler-data-{{version}}.tar.gz + strip-components: 1 + +versions: + - '0.4.12' + # They have a github but don't update tags! + # gitlab: https://gitlab.freedesktop.org/poppler/poppler-data + +build: + dependencies: + tea.xyz/gx/make: '*' + script: | + # datadir is for pkgconfig files, needed by poppler itself to find its own data files + make install prefix={{prefix}} datadir={{prefix}}/lib pkgdatadir={{prefix}}/share/poppler + + # create a symlink in case something is expecting the .pc in share + ln -s {{prefix}}/lib/pkgconfig {{prefix}}/share/ + +test: + dependencies: + freedesktop.org/pkg-config: '*' + script: | + pkg-config --cflags poppler-data diff --git a/projects/poppler.freedesktop.org/test.pdf b/projects/poppler.freedesktop.org/test.pdf new file mode 100644 index 0000000000000000000000000000000000000000..6084ba77adf601a49fed867c36f0e029e0b296af GIT binary patch literal 136 zcmY!laB{9bmfTCa?MAkbqr8wFcBpIvk zoL`z(qF@MD1rmm+@=Z<2Omxbxh&BKU87mma!qjk;6eVWnq!t0~3Chn0YKB Date: Sat, 4 Mar 2023 20:42:31 -0500 Subject: [PATCH 2/4] see if explicit PIC fixes segfaults --- projects/poppler.freedesktop.org/package.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/poppler.freedesktop.org/package.yml b/projects/poppler.freedesktop.org/package.yml index 00c59a2a76..a411ea3970 100644 --- a/projects/poppler.freedesktop.org/package.yml +++ b/projects/poppler.freedesktop.org/package.yml @@ -54,6 +54,14 @@ build: ARGS: - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX="{{prefix}}" + - -DCMAKE_C_FLAGS=$CFLAGS + - -DCMAKE_CXX_FLAGS=$CXXFLAGS + - -DCMAKE_EXE_LINKER_FLAGS=$LDFLAGS + linux/x86-64: + CFLAGS: -fPIC + CXXFLAGS: -fPIC + LDFLAGS: -pie + test: script: | From d725dc90befb32c203de26b31123512880a2d106 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Sat, 4 Mar 2023 20:55:26 -0500 Subject: [PATCH 3/4] that will teach me to use the web editor --- projects/poppler.freedesktop.org/package.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/projects/poppler.freedesktop.org/package.yml b/projects/poppler.freedesktop.org/package.yml index a411ea3970..353198f8ab 100644 --- a/projects/poppler.freedesktop.org/package.yml +++ b/projects/poppler.freedesktop.org/package.yml @@ -57,12 +57,9 @@ build: - -DCMAKE_C_FLAGS=$CFLAGS - -DCMAKE_CXX_FLAGS=$CXXFLAGS - -DCMAKE_EXE_LINKER_FLAGS=$LDFLAGS - linux/x86-64: - CFLAGS: -fPIC - CXXFLAGS: -fPIC - LDFLAGS: -pie + linux/x86-64: + CFLAGS: -fPIC + CXXFLAGS: -fPIC + LDFLAGS: -pie - -test: - script: | - pdfinfo test.pdf +test: pdfinfo test.pdf From 09eea6169ab6ea40680dd68acb45594c859a5380 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Sat, 4 Mar 2023 22:29:21 -0500 Subject: [PATCH 4/4] this, maybe --- projects/poppler.freedesktop.org/package.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/projects/poppler.freedesktop.org/package.yml b/projects/poppler.freedesktop.org/package.yml index 353198f8ab..fd517cc589 100644 --- a/projects/poppler.freedesktop.org/package.yml +++ b/projects/poppler.freedesktop.org/package.yml @@ -54,12 +54,10 @@ build: ARGS: - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX="{{prefix}}" - - -DCMAKE_C_FLAGS=$CFLAGS - - -DCMAKE_CXX_FLAGS=$CXXFLAGS - - -DCMAKE_EXE_LINKER_FLAGS=$LDFLAGS linux/x86-64: - CFLAGS: -fPIC - CXXFLAGS: -fPIC - LDFLAGS: -pie + ARGS: + - -DCMAKE_C_FLAGS=-fPIC + - -DCMAKE_CXX_FLAGS=-fPIC + - -DCMAKE_EXE_LINKER_FLAGS=-pie test: pdfinfo test.pdf