From 8d5a38666f9c441fbf6a231a05723e8c1acdf161 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 15 Nov 2023 12:28:14 -0500 Subject: [PATCH 1/4] New package: bc-java-1.76 --- srcpkgs/bc-java/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/bc-java/template diff --git a/srcpkgs/bc-java/template b/srcpkgs/bc-java/template new file mode 100644 index 0000000000000..edd1b9c4398c6 --- /dev/null +++ b/srcpkgs/bc-java/template @@ -0,0 +1,23 @@ +# Template file for 'bc-java' +pkgname=bc-java +version=1.76 +revision=1 +hostmakedepends="apache-ant openjdk17" +depends="virtual?java-runtime" +short_desc="Bouncy Castle Java cryptography APIs" +maintainer="classabbyamp " +license="MIT" +homepage="https://www.bouncycastle.org/java.html" +distfiles="https://github.com/bcgit/bc-java/archive/refs/tags/r${version/./rv}.tar.gz" +checksum=20524a31378291def8e2d7d387550f4f70f34590e431a425d29b64bd57159866 + +do_build() { + export JAVA_HOME=/usr/lib/jvm/openjdk17 + ant -f ant/jdk18+.xml clean build-provider build +} + +do_install() { + vinstall build/artifacts/jdk1.8/jars/bcprov-jdk18on-${version/./}.jar 644 /usr/lib/bc-java + ln -s bcprov-jdk18on-${version/./}.jar "${DESTDIR}"/usr/lib/bc-java/bcprov.jar + vlicense LICENSE.html +} From 64c521da779964f40b5246a4860fb7f4415c26c7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 15 Nov 2023 12:28:31 -0500 Subject: [PATCH 2/4] New package: java-commons-lang-3.13.0 --- srcpkgs/java-commons-lang/template | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 srcpkgs/java-commons-lang/template diff --git a/srcpkgs/java-commons-lang/template b/srcpkgs/java-commons-lang/template new file mode 100644 index 0000000000000..ea01b5e0239c3 --- /dev/null +++ b/srcpkgs/java-commons-lang/template @@ -0,0 +1,23 @@ +# Template file for 'java-commons-lang' +pkgname=java-commons-lang +version=3.13.0 +revision=1 +hostmakedepends="apache-maven openjdk17" +depends="virtual?java-runtime" +short_desc="Helper utilities for the java.lang API" +maintainer="classabbyamp " +license="Apache-2.0" +homepage="https://commons.apache.org/proper/commons-lang/" +distfiles="https://archive.apache.org/dist/commons/lang/source/commons-lang3-${version}-src.tar.gz" +checksum=49bb80cd6d76270412bc77c48702a05845594e9a72d49243094b79bef1fd3b33 + +do_build() { + export JAVA_HOME=/usr/lib/jvm/openjdk17 + mvn -am -Dmaven.javadoc.skip=true -Dmaven.test.skip=true clean package +} + +do_install() { + vinstall target/commons-lang3-"${version}".jar 644 /usr/lib/java-commons-lang + ln -s "commons-lang3-$version.jar" "${DESTDIR}"/usr/lib/java-commons-lang/commons-lang.jar + +} From ddca528e83e0169be0e29ccb3d1a7264116aa7f5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 15 Nov 2023 12:31:02 -0500 Subject: [PATCH 3/4] New package: pdftk-java-3.3.3 port of pdftk to java --- srcpkgs/pdftk-java/files/pdftk | 4 ++++ srcpkgs/pdftk-java/template | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 srcpkgs/pdftk-java/files/pdftk create mode 100644 srcpkgs/pdftk-java/template diff --git a/srcpkgs/pdftk-java/files/pdftk b/srcpkgs/pdftk-java/files/pdftk new file mode 100644 index 0000000000000..2b1959430c5df --- /dev/null +++ b/srcpkgs/pdftk-java/files/pdftk @@ -0,0 +1,4 @@ +#!/bin/sh + +"$JAVA_HOME"/bin/java -cp "/usr/lib/bc-java/bc-java.jar:/usr/lib/java-commons-lang/commons-lang.jar:/usr/lib/pdftk/pdftk.jar" \ + com.gitlab.pdftk_java.pdftk "$@" diff --git a/srcpkgs/pdftk-java/template b/srcpkgs/pdftk-java/template new file mode 100644 index 0000000000000..44b2a3a5e8d59 --- /dev/null +++ b/srcpkgs/pdftk-java/template @@ -0,0 +1,28 @@ +# Template file for 'pdftk-java' +pkgname=pdftk-java +version=3.3.3 +revision=1 +hostmakedepends="gradle openjdk17" +depends="virtual?java-runtime bc-java java-commons-lang" +short_desc="Command-line tool for working with PDFs" +maintainer="classabbyamp " +license="GPL-2.0-or-later" +homepage="https://gitlab.com/pdftk-java/pdftk" +distfiles="https://gitlab.com/pdftk-java/pdftk/-/archive/v${version}/pdftk-v${version}.tar.gz" +checksum=9c947de54658539e3a136e39f9c38ece1cf2893d143abb7f5bf3a2e3e005b286 + +do_build() { + export JAVA_HOME=/usr/lib/jvm/openjdk17 + gradle --no-daemon build +} + +do_check() { + export JAVA_HOME=/usr/lib/jvm/openjdk17 + gradle --no-daemon test +} + +do_install() { + vinstall build/libs/pdftk.jar 644 /usr/lib/pdftk + vman pdftk.1 + vbin "${FILESDIR}"/pdftk +} From 60ff1503f0af5343589285e7549fe70d6488d721 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 15 Nov 2023 12:33:52 -0500 Subject: [PATCH 4/4] pdftk: remove and replace with pdftk-java - requires gcc6 libraries, which are now in /bootstrap - replaced by pdftk-java: > This is a port of pdftk into Java. > The current goals are to keep functionality as compatible with the > original as it is reasonable, to fix any issues present in the > original (correctness takes precedence over compatibility, see the > differences), and to clean up the code. New functionality may be added, > but it is not a priority. fixes #47176 --- srcpkgs/pdftk | 1 + srcpkgs/pdftk-java/template | 6 ++++++ srcpkgs/pdftk/files/Makefile | 19 ------------------- srcpkgs/pdftk/template | 30 ------------------------------ 4 files changed, 7 insertions(+), 49 deletions(-) create mode 120000 srcpkgs/pdftk delete mode 100644 srcpkgs/pdftk/files/Makefile delete mode 100644 srcpkgs/pdftk/template diff --git a/srcpkgs/pdftk b/srcpkgs/pdftk new file mode 120000 index 0000000000000..3a3e0e2c17f0f --- /dev/null +++ b/srcpkgs/pdftk @@ -0,0 +1 @@ +pdftk-java \ No newline at end of file diff --git a/srcpkgs/pdftk-java/template b/srcpkgs/pdftk-java/template index 44b2a3a5e8d59..f04b33e2d160b 100644 --- a/srcpkgs/pdftk-java/template +++ b/srcpkgs/pdftk-java/template @@ -26,3 +26,9 @@ do_install() { vman pdftk.1 vbin "${FILESDIR}"/pdftk } + +pdftk_package() { + build_style=meta + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" +} diff --git a/srcpkgs/pdftk/files/Makefile b/srcpkgs/pdftk/files/Makefile deleted file mode 100644 index 126a0653b7324..0000000000000 --- a/srcpkgs/pdftk/files/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# Based on 'Makefile.Debian', part of pdftk -# Copyright (c) 2004-2012 Sid Steward - -export CXX= @CXX@ -export GCJ= gcj-6 -export GCJH= gcjh-6 -export GJAR= gjar-6 -export LIBGCJ= /usr/share/java/libgcj.jar -export AR= @AR@ -export RM= rm -export ARFLAGS= rs -export RMFLAGS= -vf -export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers -export CXXFLAGS= @CXXFLAGS@ -export GCJFLAGS= -Wno-all -fsource=1.3 -O2 -fPIC -L/usr/lib -export GCJHFLAGS= -force -export LDLIBS= @LDFLAGS@ -lgcj - -include Makefile.Base diff --git a/srcpkgs/pdftk/template b/srcpkgs/pdftk/template deleted file mode 100644 index 56af9ba6965f5..0000000000000 --- a/srcpkgs/pdftk/template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'pdftk' -pkgname=pdftk -version=2.02 -revision=4 -build_wrksrc=${pkgname} -hostmakedepends="unzip gcc6-gcj gcc6" -makedepends="libgcj-devel" -short_desc="Command-line tool for working with PDFs" -maintainer="Helmut Pozimski " -license="GPL-2.0-or-later" -homepage="https://www.pdflabs.com/tools/pdftk-server/" -distfiles="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${pkgname}-${version}-src.zip" -checksum=118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1 -nocross=yes - -do_build() { - _cxxflags="${CXXFLAGS//-fstack-clash-protection}" - _cxxflags="${_cxxflags//-ffile-prefix-map=\/builddir\/${pkgname}-${version}\/${build_wrksrc}=.}" - sed -e "s;@CXX@;g++-6;" \ - -e "s;@AR@;$AR;" \ - -e "s;@CXXFLAGS@;${_cxxflags};" \ - -e "s;@LDFLAGS@;$LDFLAGS;" \ - ${FILESDIR}/Makefile > Makefile - make ${makejobs} || make ${makjobs} -} - -do_install() { - vbin pdftk - vman ../pdftk.1 -}