Advertisement
Guest User

Untitled

a guest
Aug 19th, 2023
51
0
91 days
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.26 KB | None | 0 0
  1. From f123714efecafd8963746348228e7892c6659c10 Mon Sep 17 00:00:00 2001
  2. From: Michael Lass <bevan@bi-co.net>
  3. Date: Sat, 19 Aug 2023 13:12:05 +0200
  4. Subject: [PATCH] Let makepkg extract maven into $srcdir
  5.  
  6. ---
  7. .SRCINFO |  2 ++
  8.  PKGBUILD | 15 +++++++--------
  9.  2 files changed, 9 insertions(+), 8 deletions(-)
  10.  
  11. diff --git a/.SRCINFO b/.SRCINFO
  12. index 29dff0c..6262bb1 100644
  13. --- a/.SRCINFO
  14. +++ b/.SRCINFO
  15. @@ -12,6 +12,8 @@ pkgbase = portfolio
  16.     depends = java-runtime=17
  17.     depends = webkit2gtk
  18.     source = https://github.com/buchen/portfolio/archive/0.65.1.tar.gz
  19. +   source = https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz
  20.     sha1sums = 687f09e52343c1b09b4da567bf5df064da6f53e3
  21. +   sha1sums = fcc62d61598c48425061ee9eb6549cd412a1fa10
  22.  
  23.  pkgname = portfolio
  24. diff --git a/PKGBUILD b/PKGBUILD
  25. index d1049ac..6d8852c 100644
  26. --- a/PKGBUILD
  27. +++ b/PKGBUILD
  28. @@ -16,15 +16,14 @@ _DEST="/usr/share/portfolio"
  29.  [ "$CARCH" = "i686" ]   && _platform="x86"
  30.  [ "$CARCH" = "x86_64" ] && _platform="x86_64"
  31.  
  32. -source=("https://github.com/buchen/portfolio/archive/$pkgver.tar.gz")
  33. -sha1sums=('687f09e52343c1b09b4da567bf5df064da6f53e3')
  34. +_mvnver=3.9.4
  35.  
  36. -prepare() {
  37. -        mvnver=3.9.4
  38. -        mvnpath=~/
  39. -        curl https://dlcdn.apache.org/maven/maven-3/$mvnver/binaries/apache-maven-$mvnver-bin.tar.gz --output /tmp/apache-maven-$mvnver.tar.gz
  40. -        tar -xf /tmp/apache-maven-$mvnver.tar.gz -C $mvnpath
  41. +source=("https://github.com/buchen/portfolio/archive/$pkgver.tar.gz"
  42. +        "https://dlcdn.apache.org/maven/maven-3/$_mvnver/binaries/apache-maven-$_mvnver-bin.tar.gz")
  43. +sha1sums=('687f09e52343c1b09b4da567bf5df064da6f53e3'
  44. +          'fcc62d61598c48425061ee9eb6549cd412a1fa10')
  45.  
  46. +prepare() {
  47.     gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
  48.         --name="Portfolio Performance" \
  49.         --genericname="Personal finance" \
  50. @@ -42,7 +41,7 @@ build() {
  51.      #export JAVA_HOME=/usr/lib/jvm/default-runtime
  52.      #export JAVA_HOME=$(archlinux-java-run --min 11 --max 14 --java-home)
  53.      export JAVA_HOME=$(archlinux-java-run --min 17 --max 17 --java-home)
  54. -    export PATH=$mvnpath/apache-maven-$mvnver/bin:$PATH
  55. +    export PATH="$srcdir/apache-maven-$_mvnver/bin:$PATH"
  56.      cd $pkgname-$pkgver
  57.  
  58.      cd portfolio-app
  59. --
  60. 2.41.0
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement