[arch-commits] Commit in mediathekview/trunk (PKGBUILD mediathekview.sh)

[David Runge]

    Date: Wednesday, August 11, 2021 @ 08:59:00
  Author: dvzrv
Revision: 997433

upgpkg: mediathekview 13.7.1.r152.g178bb58c-1: Upgrade to prerelease of 13.8.0.

As 13.7.1 has been broken with java-runtime > 15 for several months and
upstream has still not released a new (pre-release) version, we pin the latest
commit on the develop branch and build from that instead:
https://github.com/mediathekview/MediathekView/issues/610

Remove the now unneeded --enable-preview flag from the java call in the wrapper
script.

Modified:
  mediathekview/trunk/PKGBUILD
  mediathekview/trunk/mediathekview.sh

------------------+
 PKGBUILD         |   29 +++++++++++++++--------------
 mediathekview.sh |    4 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-11 08:50:36 UTC (rev 997432)
+++ PKGBUILD	2021-08-11 08:59:00 UTC (rev 997433)
@@ -2,43 +2,44 @@
 
 _name=MediathekView
 pkgname=mediathekview
-pkgver=13.7.1
+pkgver=13.7.1.r152.g178bb58c
 pkgrel=1
+_commit='178bb58c16069506908fa1332e4e6738ad159f42'
 pkgdesc="Access the Mediathek of many German TV stations"
 arch=('any')
 url="https://github.com/mediathekview/MediathekView"
 license=('GPL3')
-depends=('bash' 'hicolor-icon-theme' 'java-runtime>=15')
+depends=('bash' 'hicolor-icon-theme' 'java-runtime')
+makedepends=('git' 'maven')
+conflicts=('mediathek')
 provides=('mediathek')
-conflicts=('mediathek')
 replaces=('mediathek')
-makedepends=('maven')
 optdepends=('libnotify: to use desktop notifications'
             'mplayer: for recording streams'
             'vlc: for stream playback')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz"
+source=("git+https://github.com/${pkgname}/${pkgname}#commit=${_commit}"
         "de.${pkgname}.${_name}.desktop"
         "${pkgname}.sh")
-sha512sums=('1eb2cfd9c69cc84a1b49c8997f6aee1e2bebeebc834ba1a1743f308a0b220d0f95afda9a421187359d04e055501b6af35647636707480f2edc8b0329c3e86a62'
+sha512sums=('SKIP'
             '24a94a078180aca7c50ed7763ef4806c116c27f901f644ef570ee413ffc3ac795b5ebd24d696a9b2ec426e7c9b6eaf8a8b22addb5ac7c9fe9700f7c04305f64b'
-            'c70e7ffc83ef6f05552edcf90f69461b543af9b601983ceeb4deaf3d372fe9d3ab0750928dd73db4da29727583c7814202d2a6bbf6d0b51642bacf14c972666c')
-b2sums=('add161143865f18ce83d6e4c2c24d5cff5121635ddcd7c3f5536aecbde688aae61ecbd9fae62297a76805847e762072e7895ef4d2bf9d1aa52720a49fb228fbc'
+            '3b4b96bd7f8dd26b9fbc71b109c57257eb57969bfc67dabb87b4d541da37b196f54534eb38266c0b74407c5493aa35db3dd1374b84ab562eb02a02d1660e2ec8')
+b2sums=('SKIP'
         '6dbcdea2918009621fc132b4ff1056ef79f06e27c3299b69ccd7e3cb2b093e3a2a5f76acd6b1ab62689edd867ac1650f61bf829f2a1c575835d31e117d9b9ae5'
-        '12b16d33c4c0e1ab6f6b7963ad2d9cc508116cc512521bdfa7b361c2443154558ccfacf42be3032c261392c6d60424021cb69fb9753821bd063c21911b2cae81')
+        'db19620fdde16e95df7b866745d95484571db421c791d2f8e28e5b96c59347dc13cc24fab69f07a6d32d5567bdefd8dda7a7057018be7a98a8186d3b156aa298')
 
-prepare() {
-  mv -v "${_name}-$pkgver" "$pkgname-$pkgver"
-  cd "$pkgname-$pkgver"
+pkgver() {
+  cd "$pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
   ./mvnw clean install -Plinux,install4j-linux
 }
 
 package() {
   local _size
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
   # jar
   install -vDm 644 "target/${_name}.jar" \
     -t "${pkgdir}/usr/share/java/${pkgname}"

Modified: mediathekview.sh
===================================================================
--- mediathekview.sh	2021-08-11 08:50:36 UTC (rev 997432)
+++ mediathekview.sh	2021-08-11 08:59:00 UTC (rev 997433)
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
-PATH="/usr/lib/jvm/java-15-openjdk/bin:${PATH}"
+PATH="/usr/lib/jvm/java-16-openjdk/bin:${PATH}"
 # requires preview features: https://github.com/mediathekview/MediathekView/issues/528
-java --enable-preview -jar /usr/share/java/mediathekview/MediathekView.jar "$@"
+java -jar /usr/share/java/mediathekview/MediathekView.jar "$@"