diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0001-use-rxjavafx-from-jitpack.io.patch | 52 | ||||
| -rw-r--r-- | PKGBUILD | 26 |
3 files changed, 67 insertions, 15 deletions
@@ -4,12 +4,14 @@ pkgbase = latexdraw pkgrel = 7 url = http://latexdraw.sourceforge.net arch = x86_64 - license = GPL3 + license = GPL-3.0-or-later makedepends = dpkg makedepends = java-environment=14 makedepends = maven optdepends = ttf-droid: font for CJK characters source = latexdraw-4.0.3.tar.gz::https://github.com/latexdraw/latexdraw/archive/4.0.3.tar.gz + source = 0001-use-rxjavafx-from-jitpack.io.patch sha512sums = a2b5a7438c43fab1cb840e4eb521dab78369fb5ee78ebb138d6b6e8f8bf07d51d62ca54d3689ee82dd57e1dfb34e2773cc439fdb1221aaf0614d2ba6d161566c + sha512sums = 64f5bd990dc5c773048161a9a5ea4da5db4680024d054dbc50b6105fc4516ea779c726c649a73313db18b407f9efa3c27c0eb0b5c7711c15b0772cb4081a4f8f pkgname = latexdraw diff --git a/0001-use-rxjavafx-from-jitpack.io.patch b/0001-use-rxjavafx-from-jitpack.io.patch new file mode 100644 index 000000000000..7bf166f7e712 --- /dev/null +++ b/0001-use-rxjavafx-from-jitpack.io.patch @@ -0,0 +1,52 @@ +From e1c36ac37d412aae2445f7f5a0bb1d7fb410fe31 Mon Sep 17 00:00:00 2001 +From: Hu Butui <hot123tea123@gmail.com> +Date: Sat, 2 Mar 2024 13:05:18 +0800 +Subject: [PATCH] use rxjavafx from jitpack.io + +1. maven requires https, but http://maven.inria.fr is not ready. +2. even if we re-enable http for maven building, rxjavafx is not found + in http://maven.inria.fr anymore. maybe it's no plublic available. +3. we use rxjavafx from https://jitpack.io instead, and upgrade to + 2.11.0-RC34. +--- + pom.xml | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/pom.xml b/pom.xml +index c024bfe1..d12edede 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -19,7 +19,7 @@ + <mockito.version>3.5.13</mockito.version> + <javafx.platform>linux</javafx.platform> + <annotations.version>16.0.1</annotations.version> +- <rxjavafx.version>2.11.0-RC33</rxjavafx.version> ++ <rxjavafx.version>2.11.0-RC34</rxjavafx.version> + <jmods.path>${java.home}</jmods.path> + <jpkg.args>--linux-rpm-license-type "GPLv3+" --linux-menu-group "Office;" --linux-shortcut --linux-deb-maintainer "Arnaud Blouin"</jpkg.args> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> +@@ -58,6 +58,10 @@ + </scm> + + <repositories> ++ <repository> ++ <id>jitpack.io</id> ++ <url>https://jitpack.io</url> ++ </repository> + <repository> + <id>mavenTriskellRelease</id> + <name>http://maven.inria.fr-triskell-releases</name> +@@ -638,8 +642,8 @@ + <classifier>${javafx.platform}</classifier> + </dependency> + <dependency> +- <groupId>io.reactivex</groupId> +- <artifactId>rxjavafx</artifactId> ++ <groupId>com.github.ReactiveX</groupId> ++ <artifactId>RxJavaFX</artifactId> + <version>${rxjavafx.version}</version> + </dependency> + </dependencies> +-- +2.43.2 + @@ -1,9 +1,4 @@ # Maintainer: Butui Hu <hot123tea123@gmail.com> -# -# Note: this pkg need java-environment=14 as makedepends -# You could use zulu-14-bin, but jdk14-openj9-bin will not work. -# I don't have jdk14-openjdk installed, and https://aur.archlinux.org/packages/jdk14-openjdk -# needs a working jdk14 to build it, so I could not test it, but it should work. pkgname=latexdraw pkgver=4.0.3 @@ -11,23 +6,26 @@ pkgrel=7 pkgdesc='A vector drawing editor for LaTeX (JavaFX)' arch=('x86_64') url='http://latexdraw.sourceforge.net' -license=('GPL3') +license=('GPL-3.0-or-later') makedepends=( - dpkg - java-environment=14 - maven + 'dpkg' + 'java-environment=14' + 'maven' ) optdepends=( 'ttf-droid: font for CJK characters' ) -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/latexdraw/latexdraw/archive/${pkgver}.tar.gz") -sha512sums=('a2b5a7438c43fab1cb840e4eb521dab78369fb5ee78ebb138d6b6e8f8bf07d51d62ca54d3689ee82dd57e1dfb34e2773cc439fdb1221aaf0614d2ba6d161566c') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/latexdraw/latexdraw/archive/${pkgver}.tar.gz" + "0001-use-rxjavafx-from-jitpack.io.patch" +) +sha512sums=('a2b5a7438c43fab1cb840e4eb521dab78369fb5ee78ebb138d6b6e8f8bf07d51d62ca54d3689ee82dd57e1dfb34e2773cc439fdb1221aaf0614d2ba6d161566c' + '64f5bd990dc5c773048161a9a5ea4da5db4680024d054dbc50b6105fc4516ea779c726c649a73313db18b407f9efa3c27c0eb0b5c7711c15b0772cb4081a4f8f') prepare() { - # maven >= 3.8.1 requies HTTPS, see also https://maven.apache.org/docs/3.8.1/release-notes.html - sed -i 's,http://maven.inria.fr,https://maven.inria.fr,' "${pkgname}-${pkgver}/pom.xml" # dirty hack to specify jpackage --type arg sed -i 's,<commandlineArgs>--name LaTeXDraw,<commandlineArgs>--name LaTeXDraw --type deb,' "${pkgname}-${pkgver}/pom.xml" + cd "${pkgname}-${pkgver}" + patch -p1 -i ${srcdir}/0001-use-rxjavafx-from-jitpack.io.patch } build() { @@ -35,7 +33,6 @@ build() { mvn --batch-mode -DskipTests package } - package() { dpkg -x "${pkgname}-${pkgver}/target/${pkgname}_${pkgver}-1_amd64.deb" "${pkgdir}" install -d ${pkgdir}/usr/bin @@ -43,3 +40,4 @@ package() { install -Dm644 "${pkgdir}/opt/latexdraw/lib/latexdraw-LaTeXDraw.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" } # vim:set ts=2 sw=2 et: + |