From 538b7ff4bbc52faa37112a18246da806bd0a1283 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 29 Jun 2026 21:18:48 +0200 Subject: [PATCH] Use system JavaFX for PDFsam --- app-text/pdfsam/Manifest | 4 +-- app-text/pdfsam/metadata.xml | 9 +++-- app-text/pdfsam/pdfsam-6.0.1.ebuild | 31 +++++++++-------- dev-java/openjfx-bin/Manifest | 6 ++++ dev-java/openjfx-bin/metadata.xml | 11 +++++++ .../openjfx-bin/openjfx-bin-25.0.3.ebuild | 33 +++++++++++++++++++ metadata/md5-cache/app-text/pdfsam-6.0.1 | 8 ++--- .../md5-cache/dev-java/openjfx-bin-25.0.3 | 13 ++++++++ 8 files changed, 93 insertions(+), 22 deletions(-) create mode 100644 dev-java/openjfx-bin/Manifest create mode 100644 dev-java/openjfx-bin/metadata.xml create mode 100644 dev-java/openjfx-bin/openjfx-bin-25.0.3.ebuild create mode 100644 metadata/md5-cache/dev-java/openjfx-bin-25.0.3 diff --git a/app-text/pdfsam/Manifest b/app-text/pdfsam/Manifest index 3d1baa5e..82a3bb3e 100644 --- a/app-text/pdfsam/Manifest +++ b/app-text/pdfsam/Manifest @@ -1,4 +1,4 @@ DIST pdfsam-basic-6.0.1-linux-x64.tar.gz 101106661 BLAKE2B c48d0bc09fcbf3fb2a20ed8e3c4db0f6be7e81999ddba0ed857249982f7bc5bf15a91358120797aa59b635821a0d6d57822b7308d03b215a5cb548c90e785ac8 SHA512 2954b9fa5174195b7ba7f5f3d0eb78311e0f94c89e730307ffe6ca996952f929d56d302a095f385f6dcd617e57600e031ca1fa8cd4a40377ee213db80bb39d21 -EBUILD pdfsam-6.0.1.ebuild 1425 BLAKE2B 07a1dd95e3ac7eac226e7dc9d49f3139e8e85ce6f8369b5c326837dc387c21393d915d47f47b59b177967cc53f8b194c5c1dbde7126c7fac6f990a54890ae7de SHA512 96af22ec5bbac3e0985697223b0507924daf791a3ea980dbf435c3dde1bbbcd909891395890a46d48e51b18c83e9c096dee40322cd94b8b3e722dc3232572ed3 +EBUILD pdfsam-6.0.1.ebuild 1414 BLAKE2B 1a350da7e98eb7f8cb319551565cc9c6ed8bdf0a9695b4343a61917f3f3e6f06828503c8dc67c91efbb37dae5e9fa60b1cf85dd261fc7abb97dce48a1d4ffe0f SHA512 711d56f74e0e3138904144208e2a41410057ce65fcad2870d87e4d05ff620bf59f5f1b73b3235f865002522719eaae19a7b552db638457456b7bea11c30a0b8a MISC ChangeLog 3992 BLAKE2B 1c654fe4894c7609246f03c4c8fe50c4527763ff98906d1ca89da23d14bc39dbaad2057e74627f711a5e20f2e4513eb0cae4626f96ecb09dfcfd86116411c8dc SHA512 91fd919a7b8929fbd1cf205ed1ee4b9fa7440065c80a4b15a6509cb5b47e4116f0431bd0112136167624ab6fb7b7b0d9d11832b014de1858357a92e36679c969 -MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b +MISC metadata.xml 301 BLAKE2B 7265db33049fa4a96787414b589e46d9b42ef8b1ec5a854e9401bff2b733a871d339ab18c7e947beb7dfeff327cf95de2a2d7bbe98708befbb84bb730931eb5b SHA512 923923c0f84e35431aa1404bf032c5c3cca15922ba116215d1e56900f218006f1a09020b9bd3be7c1c1b67759dd87abf50bef830fee64beb264b0499e0fddebc diff --git a/app-text/pdfsam/metadata.xml b/app-text/pdfsam/metadata.xml index 0830b325..38422bbe 100644 --- a/app-text/pdfsam/metadata.xml +++ b/app-text/pdfsam/metadata.xml @@ -1,7 +1,10 @@ - - mario.fetka@gmail.com - + + mario.fetka@gmail.com + + + torakiki/pdfsam + diff --git a/app-text/pdfsam/pdfsam-6.0.1.ebuild b/app-text/pdfsam/pdfsam-6.0.1.ebuild index 994210cf..32de6e3c 100644 --- a/app-text/pdfsam/pdfsam-6.0.1.ebuild +++ b/app-text/pdfsam/pdfsam-6.0.1.ebuild @@ -12,14 +12,19 @@ DESCRIPTION="Free open source tool to split and merge PDF documents" HOMEPAGE="https://pdfsam.org/ https://github.com/torakiki/pdfsam" SRC_URI="https://github.com/torakiki/${PN}/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + LICENSE="AGPL-3" SLOT="0" KEYWORDS="-* ~amd64" RESTRICT="strip" RDEPEND=" + dev-java/java-config + dev-java/openjfx-bin:25 dev-libs/glib:2 media-libs/alsa-lib + virtual/jre:25 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 @@ -31,29 +36,29 @@ RDEPEND=" x11-libs/pango " -S="${WORKDIR}/${MY_P}" - -QA_PREBUILT=" - opt/${MY_PN}/runtime/bin/* - opt/${MY_PN}/runtime/lib/* - opt/${MY_PN}/runtime/lib/server/* -" - src_compile() { :; } +src_prepare() { + default + sed -i \ + -e 's|^MODULEPATH=.*|MODULEPATH="${PDFSAM_JAVAFX_PATH:-/usr/share/openjfx-bin-25/lib}:$BASEDIR/lib"|' \ + bin/pdfsam.sh || die +} + src_install() { local dir="/opt/${MY_PN}" insinto "${dir}" - doins -r bin doc lib runtime splash.png LICENSE.txt + doins -r bin doc lib splash.png LICENSE.txt fperms +x "${dir}/bin/pdfsam.sh" - fperms +x "${dir}/runtime/bin/java" "${dir}/runtime/bin/keytool" - fperms +x "${dir}/runtime/lib/jexec" "${dir}/runtime/lib/jspawnhelper" - find "${ED}${dir}/runtime/lib" -type f -name "*.so" -exec chmod +x {} + || die - rm "${ED}${dir}"/runtime/lib/libavplugin*.so || die dosym "../..${dir}/bin/pdfsam.sh" "/usr/bin/${MY_PN}" newicon splash.png "${MY_PN}.png" make_desktop_entry "${MY_PN}" "PDFsam Basic" "${MY_PN}" "Office;Viewer;" } + +pkg_postinst() { + elog "PDFsam Basic now uses the system Java selected by java-config." + elog "JavaFX is provided by dev-java/openjfx-bin:25." +} diff --git a/dev-java/openjfx-bin/Manifest b/dev-java/openjfx-bin/Manifest new file mode 100644 index 00000000..53626e54 --- /dev/null +++ b/dev-java/openjfx-bin/Manifest @@ -0,0 +1,6 @@ +DIST javafx-base-25.0.3-linux.jar 749081 BLAKE2B 9a1ec977c23ac98bb7adfcb8afab23ed53ff1890db44ff7d6a164bdf4a9e761edf81a22f6e04e554417cf481e84bcfd94ff321db30267180ec89083d2c8f0372 SHA512 27313e5e68f79bcb4d82b1defb74d9b6cbe216e86a813fc77c8fe95e8565c9e693db6e805054995bc7aabdbda1362d4070604b8fa0b9c2692aaf2807cb7bb490 +DIST javafx-controls-25.0.3-linux.jar 2602903 BLAKE2B 0774ec88bc153c8739f9ec008608a9738137528c4070968149e909072a729f6722ce1bf2d4b9d6b0ee450733a3676e42742d2c177388393c919af343b0e1f561 SHA512 920ef6aff13e0c512721f8a9cfe859851b5c69bd6f157f4444101c1079de268fcb704c0f7c141a27285eb03750a3f14c02b1feba60e48097da9aaf00950438f4 +DIST javafx-graphics-25.0.3-linux.jar 5403472 BLAKE2B 675165701f09fba7d05684493f9ed222993325c2dbd7a03c21055eb4f5cc0e3337de31a87e63e81547aa6f5ea346a201a71805cbfd9519be68392dbcbad2f103 SHA512 c52bf99a357bdd8acab33b920602b1b0cb8bc87814a2b110762d5391b486024b7dbc834caf8a3d62cf0f414c1d1076fe01e98b02f00ca33779e1e6c67543c766 +DIST javafx-media-25.0.3-linux.jar 1578285 BLAKE2B e4f776219d190dddabd6589b13d984f36a4abd1f3ff4caf7892065f159f084209f572269d4aac6550955a350b86947b20cf30b8b509a39e0d8fb579bb75117cc SHA512 df6257794fad5610d1de9fe134f18ce9675b9f9f5a722d098295d98489036548c80cfba37069847c7736cb9f9bafb26c0414ca8cdd5ffcf923f972a8a812d071 +EBUILD openjfx-bin-25.0.3.ebuild 1139 BLAKE2B ce16e31125956d8ab9958bd5b255aba14178481c418f39479463367f043d856162560ba1c8b6a9ed8f18a9efffe4d8b9d64c13367d0890147cbedca620c0a62b SHA512 4a762170b9f908b53784bb4cc12b00a474654be74acb98c82e8a14b6aaba695372ffda90b3f9b25558566df7d551ddd0cebe928fd1b7306942c8f63562c2533e +MISC metadata.xml 339 BLAKE2B 6d5447c39d29100426c8fd1321cacdb8fb05275eefbc4874af1190f126a6f050fd864eb085ad7ae995acc92d47b170bd12bf7386692c809e3a20fd8e987f1e74 SHA512 a525fe755ebe3f4ba49e9997c04f0a10fe7e8d181e87ce57887d51aac928491528931a3d3e96cac5f9f9ecf755c63d354c5279c1ae4791315d254ac69048a339 diff --git a/dev-java/openjfx-bin/metadata.xml b/dev-java/openjfx-bin/metadata.xml new file mode 100644 index 00000000..18430cdb --- /dev/null +++ b/dev-java/openjfx-bin/metadata.xml @@ -0,0 +1,11 @@ + + + + + mario.fetka@disconnected-by-peer.at + Mario Fetka + + + openjdk/jfx + + diff --git a/dev-java/openjfx-bin/openjfx-bin-25.0.3.ebuild b/dev-java/openjfx-bin/openjfx-bin-25.0.3.ebuild new file mode 100644 index 00000000..5a4d9305 --- /dev/null +++ b/dev-java/openjfx-bin/openjfx-bin-25.0.3.ebuild @@ -0,0 +1,33 @@ +# Copyright 2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-utils-2 + +DESCRIPTION="Java OpenJFX client application platform" +HOMEPAGE="https://openjfx.io/ https://gluonhq.com/products/javafx/" +SRC_URI=" + https://repo1.maven.org/maven2/org/openjfx/javafx-base/${PV}/javafx-base-${PV}-linux.jar + https://repo1.maven.org/maven2/org/openjfx/javafx-controls/${PV}/javafx-controls-${PV}-linux.jar + https://repo1.maven.org/maven2/org/openjfx/javafx-graphics/${PV}/javafx-graphics-${PV}-linux.jar + https://repo1.maven.org/maven2/org/openjfx/javafx-media/${PV}/javafx-media-${PV}-linux.jar +" + +S="${WORKDIR}" + +LICENSE="GPL-2-with-classpath-exception" +SLOT="${PV%%.*}" +KEYWORDS="amd64" + +DEPEND="virtual/jdk:25" +RDEPEND="virtual/jre:25" + +src_unpack() { :; } + +src_install() { + java-pkg_newjar "${DISTDIR}/javafx-base-${PV}-linux.jar" javafx.base.jar + java-pkg_newjar "${DISTDIR}/javafx-controls-${PV}-linux.jar" javafx.controls.jar + java-pkg_newjar "${DISTDIR}/javafx-graphics-${PV}-linux.jar" javafx.graphics.jar + java-pkg_newjar "${DISTDIR}/javafx-media-${PV}-linux.jar" javafx.media.jar +} diff --git a/metadata/md5-cache/app-text/pdfsam-6.0.1 b/metadata/md5-cache/app-text/pdfsam-6.0.1 index ecebc56c..29018b44 100644 --- a/metadata/md5-cache/app-text/pdfsam-6.0.1 +++ b/metadata/md5-cache/app-text/pdfsam-6.0.1 @@ -1,4 +1,4 @@ -DEFINED_PHASES=compile install postinst postrm preinst +DEFINED_PHASES=compile install postinst postrm preinst prepare DESCRIPTION=Free open source tool to split and merge PDF documents EAPI=8 HOMEPAGE=https://pdfsam.org/ https://github.com/torakiki/pdfsam @@ -6,9 +6,9 @@ IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info INHERIT=desktop xdg KEYWORDS=-* ~amd64 LICENSE=AGPL-3 -RDEPEND=dev-libs/glib:2 media-libs/alsa-lib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/pango +RDEPEND=dev-java/java-config dev-java/openjfx-bin:25 dev-libs/glib:2 media-libs/alsa-lib virtual/jre:25 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/pango RESTRICT=strip SLOT=0 SRC_URI=https://github.com/torakiki/pdfsam/releases/download/v6.0.1/pdfsam-basic-6.0.1-linux-x64.tar.gz -_eclasses_=desktop e447b5f77146d69797e9f03ff177f3f1 xdg-utils 42869b3c8d86a70ef3cf75165a395e09 xdg 3ef49a87c52c8b77c476351195dfe575 -_md5_=33eb2b962862bace4335ab0dede3d620 +_eclasses_=desktop e447b5f77146d69797e9f03ff177f3f1 xdg 3ef49a87c52c8b77c476351195dfe575 xdg-utils 42869b3c8d86a70ef3cf75165a395e09 +_md5_=15f8972713a301aa40272f533679a513 diff --git a/metadata/md5-cache/dev-java/openjfx-bin-25.0.3 b/metadata/md5-cache/dev-java/openjfx-bin-25.0.3 new file mode 100644 index 00000000..97435e71 --- /dev/null +++ b/metadata/md5-cache/dev-java/openjfx-bin-25.0.3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=install unpack +DEPEND=virtual/jdk:25 +DESCRIPTION=Java OpenJFX client application platform +EAPI=8 +HOMEPAGE=https://openjfx.io/ https://gluonhq.com/products/javafx/ +INHERIT=java-utils-2 +KEYWORDS=amd64 +LICENSE=GPL-2-with-classpath-exception +RDEPEND=virtual/jre:25 +SLOT=25 +SRC_URI=https://repo1.maven.org/maven2/org/openjfx/javafx-base/25.0.3/javafx-base-25.0.3-linux.jar https://repo1.maven.org/maven2/org/openjfx/javafx-controls/25.0.3/javafx-controls-25.0.3-linux.jar https://repo1.maven.org/maven2/org/openjfx/javafx-graphics/25.0.3/javafx-graphics-25.0.3-linux.jar https://repo1.maven.org/maven2/org/openjfx/javafx-media/25.0.3/javafx-media-25.0.3-linux.jar +_eclasses_=java-utils-2 4fa0be92748bc228f31bd845d285d7f9 +_md5_=be063d15cfb7697f495525354c5aafb2