diff options
| -rw-r--r-- | .SRCINFO | 33 | ||||
| -rw-r--r-- | PKGBUILD | 103 | ||||
| -rw-r--r-- | lombok_jdk21.patch | 12 |
3 files changed, 119 insertions, 29 deletions
@@ -1,18 +1,35 @@ pkgbase = lightzone - pkgdesc = A professional photo browser and editor, like Aperture or Lightroom - pkgver = 4.1.8 + pkgdesc = Open-source professional-level digital darkroom software + pkgver = 5.0.0beta2 pkgrel = 2 - url = http://lightzoneproject.org/ + url = https://github.com/ktgw0316/LightZone/ arch = x86_64 - license = custom:BSD-3-Clause - depends = jre7-openjdk + license = BSD-3-Clause + makedepends = java-environment>=17 + makedepends = ant + makedepends = autoconf + makedepends = gcc + makedepends = make + makedepends = git + makedepends = libx11 + makedepends = pkgconf + makedepends = rsync + depends = gcc-libs + depends = glibc + depends = hicolor-icon-theme + depends = java-runtime>=17 depends = javahelp2 depends = lcms2 + depends = lensfun depends = libjpeg-turbo depends = libtiff + depends = libraw depends = libxml2 - source = https://download.opensuse.org/repositories/home:/ktgw0316:/LightZone/Arch_Extra/x86_64/lightzone-4.1.8-0-x86_64.pkg.tar.xz - md5sums = 563a2a43982c88d1c9be7b56f20cb124 + provides = lightzone + conflicts = lightzone-git + source = https://github.com/ktgw0316/LightZone//archive/5.0.0beta2.zip + source = lombok_jdk21.patch + md5sums = d3b9246311182e12fc6da5230dfcb173 + md5sums = 60e33c6550b0f342e8e71eb1c90e093c pkgname = lightzone - @@ -1,31 +1,92 @@ -# Maintainer: <trash@ps3zone.org> -# Contributer: Rikles <style.boubou@gmail.com> -# Contributer: N30N <archlinux@alunamation.com> +# Maintainer: Masahiro Kitagawa <arctica0316@gmail.com> +# Contributor: alexisph@gmail.com +# Contributor: <trash@ps3zone.org> +# Contributor: Rikles <style.boubou@gmail.com> +# Contributor: N30N <archlinux@alunamation.com> -pkgname="lightzone" -pkgver=4.1.8 +pkgname=lightzone +pkgver=5.0.0beta2 pkgrel=2 -pkgdesc="A professional photo browser and editor, like Aperture or Lightroom" -url="http://lightzoneproject.org/" -license=("custom:BSD-3-Clause") +pkgdesc="Open-source professional-level digital darkroom software" +url="https://github.com/ktgw0316/LightZone/" +license=("BSD-3-Clause") arch=("x86_64") -depends=('jre7-openjdk' - 'javahelp2' - 'lcms2' - 'libjpeg-turbo' - 'libtiff' - 'libxml2') +conflicts=('lightzone-git') +provides=('lightzone') +depends=( + 'gcc-libs' + 'glibc' + 'hicolor-icon-theme' + 'java-runtime>=17' + 'javahelp2' + 'lcms2' + 'lensfun' + 'libjpeg-turbo' + 'libtiff' + 'libraw' + 'libxml2' +) +makedepends=('java-environment>=17' + 'ant' + 'autoconf' + 'gcc' + 'make' + 'git' + 'libx11' + 'pkgconf' + 'rsync' +) -source=("https://download.opensuse.org/repositories/home:/ktgw0316:/LightZone/Arch_Extra/x86_64/${pkgname}-${pkgver}-0-x86_64.pkg.tar.xz") -md5sums=('563a2a43982c88d1c9be7b56f20cb124') +_git_url=${url} +_patch_name="lombok_jdk21.patch" +source=("${_git_url}/archive/${pkgver}.zip" + "${_patch_name}") +md5sums=('d3b9246311182e12fc6da5230dfcb173' + '60e33c6550b0f342e8e71eb1c90e093c') + +prepare() { + cd "${srcdir}/LightZone-${pkgver}/" + patch -Np1 -i "${srcdir}/${_patch_name}" +} build() { - cd "${srcdir}" - tar -I xz -xf lightzone-4.1.8-0-x86_64.pkg.tar.xz + if [ -d /usr/lib/jvm/java-21-openjdk ]; then + export JAVA_HOME=/usr/lib/jvm/java-21-openjdk + export MAKEPKG_JAVA_VERSION=21 + elif [ -d /usr/lib/jvm/java-17-openjdk ]; then + export JAVA_HOME=/usr/lib/jvm/java-21-openjdk + export MAKEPKG_JAVA_VERSION=17 + else + export JAVA_HOME=/usr/lib/jvm/default + fi + echo $JAVA_HOME + + # https://github.com/Aries85/LightZone/issues/218#issuecomment-357868376 + MAKEFLAGS="-j1" + + cd "${srcdir}/LightZone-${pkgver}/" + ant -f linux/build.xml jar } package() { - cd "${srcdir}" - # Install - cp -dr --no-preserve=ownership ./usr "${pkgdir}"/ + cd "${srcdir}/LightZone-${pkgver}/" + + _libexecdir=/usr/lib + install -dm 0755 "${pkgdir}/${_libexecdir}/${pkgname}" + cp -pH linux/products/*.so "${pkgdir}/${_libexecdir}/${pkgname}" + _javadir=/usr/share/java + install -dm 0755 "${pkgdir}/${_javadir}/${pkgname}" + cp -pH lightcrafts/products/dcraw_lz "${pkgdir}/${_javadir}/${pkgname}" + cp -pH lightcrafts/products/LightZone-forkd "${pkgdir}/${_javadir}/${pkgname}" + cp -pH linux/products/*.jar "${pkgdir}/${_javadir}/${pkgname}" + + # create icons and shortcuts + _datadir=/usr/share + install -dm 0755 "${pkgdir}/${_datadir}/applications" + install -m 644 linux/products/lightzone.desktop "${pkgdir}/${_datadir}/applications/" + cp -pHR linux/icons "${pkgdir}/${_datadir}/" + + _bindir=/usr/bin + install -dm 0755 "${pkgdir}/${_bindir}" + install -m 755 "linux/products/${pkgname}" "${pkgdir}/${_bindir}" } diff --git a/lombok_jdk21.patch b/lombok_jdk21.patch new file mode 100644 index 000000000000..46c8a635eb4d --- /dev/null +++ b/lombok_jdk21.patch @@ -0,0 +1,12 @@ +diff --unified --recursive --text LightZone-5.0.0beta2/lightcrafts/ivy.xml LightZone-5.0.0beta2.new/lightcrafts/ivy.xml +--- LightZone-5.0.0beta2/lightcrafts/ivy.xml 2023-09-25 21:58:06.000000000 +0900 ++++ LightZone-5.0.0beta2.new/lightcrafts/ivy.xml 2024-03-31 14:38:38.160510073 +0900 +@@ -17,7 +17,7 @@ + <dependency name="jiconfont-font_awesome" rev="4.7.0.0" org="com.github.jiconfont" conf="compile->default"/> + <dependency name="jiconfont-google_material_design_icons" rev="2.2.0.2" org="com.github.jiconfont" conf="compile->default"/> + <dependency name="jiconfont-swing" rev="1.0.1" org="com.github.jiconfont" conf="compile->default"/> +- <dependency name="lombok" rev="1.18.26" org="org.projectlombok" conf="compile->default"/> ++ <dependency name="lombok" rev="1.18.32" org="org.projectlombok" conf="compile->default"/> + <!-- Test dependencies --> + <dependency name="junit-jupiter-api" rev="5.9.3" org="org.junit.jupiter" conf="test->default"/> + <dependency name="junit-jupiter-params" rev="5.9.3" org="org.junit.jupiter" conf="test->default"/> |