Follow upstream renames, fix nextcloud-native's source, add missing metadata

README.md

@@ -56,16 +56,16 @@ source in the `PKGBUILD` (and drop the `-bin` suffix), or don't package it.
 | `modrinth-enhanced-bin` | [Felitendo/Modrinth-Enhanced](https://github.com/Felitendo/Modrinth-Enhanced) — prebuilt release of `modrinth-enhanced` | `.deb` | [modrinth-enhanced-bin](https://aur.archlinux.org/packages/modrinth-enhanced-bin) |
 | `moondeckbuddy` | [FrogTheFrog/moondeck-buddy](https://github.com/FrogTheFrog/moondeck-buddy) — host companion of the MoonDeck Steam Deck plugin (C++/Qt6) | *built from source* | [moondeckbuddy](https://aur.archlinux.org/packages/moondeckbuddy) |
 | `moondeckbuddy-bin` | [FrogTheFrog/moondeck-buddy](https://github.com/FrogTheFrog/moondeck-buddy) — prebuilt release of `moondeckbuddy` | AppImage | *not published yet* |
-| `nextcloud-native` | [Obiente/nc-native](https://github.com/Obiente/nc-native) — adaptive native Nextcloud client for files, media and installed server apps (Compose Multiplatform, unofficial) | *built from source* | [nextcloud-native](https://aur.archlinux.org/packages/nextcloud-native) |
+| `nextcloud-native` | [Obiente/native](https://github.com/Obiente/native) — adaptive native Nextcloud client for files, media and installed server apps (Compose Multiplatform, unofficial) | *built from source* | [nextcloud-native](https://aur.archlinux.org/packages/nextcloud-native) |
-| `nextcloud-native-bin` | [Obiente/nc-native](https://github.com/Obiente/nc-native) — prebuilt release of `nextcloud-native` | `.deb` | [nextcloud-native-bin](https://aur.archlinux.org/packages/nextcloud-native-bin) |
+| `nextcloud-native-bin` | [Obiente/native](https://github.com/Obiente/native) — prebuilt release of `nextcloud-native` | `.deb` | [nextcloud-native-bin](https://aur.archlinux.org/packages/nextcloud-native-bin) |
-| `nextcloud-native-git` | [Obiente/nc-native](https://github.com/Obiente/nc-native) — `main` branch of `nextcloud-native` | *built from source* | [nextcloud-native-git](https://aur.archlinux.org/packages/nextcloud-native-git) |
+| `nextcloud-native-git` | [Obiente/native](https://github.com/Obiente/native) — `main` branch of `nextcloud-native` | *built from source* | [nextcloud-native-git](https://aur.archlinux.org/packages/nextcloud-native-git) |
 | `plezy-bin` | [edde746/plezy](https://github.com/edde746/plezy) — Plex, Jellyfin and Emby client (Flutter); the source package [lives in `extra`](https://archlinux.org/packages/extra/x86_64/plezy/) | `.deb` | [plezy-bin](https://aur.archlinux.org/packages/plezy-bin) |
 | `sharpemu-bin` | [sharpemu/sharpemu](https://github.com/sharpemu/sharpemu) — experimental PlayStation 5 emulator | tarball | [sharpemu-bin](https://aur.archlinux.org/packages/sharpemu-bin) |
 | `snapx-bin` | [SnapXL/SnapX](https://github.com/SnapXL/SnapX) — ShareX-fork screenshot/sharing tool | self-contained tarball | [snapx-bin](https://aur.archlinux.org/packages/snapx-bin) |
 | `tenzen-studio-bin` | [tenzen.studio](https://tenzen.studio) — Tenzen Studio, screen recorder and editor for product demos (proprietary Electron app) | Flatpak bundle | [tenzen-studio-bin](https://aur.archlinux.org/packages/tenzen-studio-bin) |
 | `timetable` | [ostfriese4/untis](https://codeberg.org/ostfriese4/untis) — "Timetable", a GTK4 + LibAdwaita client for WebUntis | *built from source* | [timetable](https://aur.archlinux.org/packages/timetable) |
 | `vacuumtube-bin` | [shy1132/VacuumTube](https://github.com/shy1132/VacuumTube) — YouTube Leanback (TV UI) with built-in adblocker | `.deb` | [vacuumtube-bin](https://aur.archlinux.org/packages/vacuumtube-bin) |
-| `waydroid-helper-bin` | [ayasa520/waydroid-helper](https://github.com/ayasa520/waydroid-helper) — GTK4 GUI for Waydroid configuration and extensions | AppImage | [waydroid-helper-bin](https://aur.archlinux.org/packages/waydroid-helper-bin) |
+| `waydroid-helper-bin` | [waydroid-helper/waydroid-helper](https://github.com/waydroid-helper/waydroid-helper) — GTK4 GUI for Waydroid configuration and extensions | AppImage | [waydroid-helper-bin](https://aur.archlinux.org/packages/waydroid-helper-bin) |
 | `wiiudownloader-bin` | [Xpl0itU/WiiUDownloader](https://github.com/Xpl0itU/WiiUDownloader) — Wii U title downloader (Go + GTK4) | AppImage | [wiiudownloader-bin](https://aur.archlinux.org/packages/wiiudownloader-bin) |
 | `zapzap-bin` | [rafatosta/zapzap](https://github.com/rafatosta/zapzap) — WhatsApp desktop client (PyQt6 + WebEngine) | wheel | [zapzap-bin](https://aur.archlinux.org/packages/zapzap-bin) |
 

fluxer-bin/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = fluxer-bin
 	pkgdesc = Fluxer Desktop Application
 	pkgver = 0.0.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://fluxer.app
 	arch = x86_64
 	arch = aarch64
@@ -9,6 +9,8 @@ pkgbase = fluxer-bin
 	depends = gtk3
 	depends = nss
 	depends = alsa-lib
+	provides = fluxer
+	conflicts = fluxer
 	options = !strip
 	source = fluxer.desktop
 	sha256sums = 981daa8015b823fef254bb8e79fe6b28f77dda02cdc374796443bd64f5041de1

fluxer-bin/PKGBUILD

@@ -5,12 +5,16 @@
 
 pkgname=fluxer-bin
 pkgver=0.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Fluxer Desktop Application"
 arch=('x86_64' 'aarch64')
 url="https://fluxer.app"
 license=('AGPL-3.0-only')
 depends=('gtk3' 'nss' 'alsa-lib')
+# the AUR also carries fluxer-git, which installs the same /usr/bin/fluxer:
+# provides/conflicts makes that an either/or instead of a file conflict
+provides=('fluxer')
+conflicts=('fluxer')
 options=('!strip')
 
 source=("fluxer.desktop")

lunar-client-bin/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = lunar-client-bin
 	pkgdesc = PvP modpack for all modern versions of Minecraft (upstream AppImage)
 	pkgver = 3.7.17
-	pkgrel = 1
+	pkgrel = 2
 	url = https://lunarclient.com
 	arch = x86_64
 	license = LicenseRef-proprietary

lunar-client-bin/PKGBUILD

@@ -5,7 +5,7 @@
 pkgname=lunar-client-bin
 _pkgname=lunarclient
 pkgver=3.7.17
-pkgrel=1
+pkgrel=2
 pkgdesc="PvP modpack for all modern versions of Minecraft (upstream AppImage)"
 arch=('x86_64')
 url="https://lunarclient.com"
@@ -45,4 +45,16 @@ package() {
 
   install -dm755 "${pkgdir}/usr/bin"
   ln -s "/opt/${_pkgname}/${_pkgname}.AppImage" "${pkgdir}/usr/bin/${_pkgname}"
+
+  # A custom licence has to ship its terms. Lunar Client publishes none in the
+  # AppImage, so what goes in is the reference to the terms it is used under.
+  install -Dm644 /dev/stdin "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" <<'EOF'
+Lunar Client is proprietary software, distributed by Moonsworth, LLC.
+
+It is not covered by a free-software licence: use is governed by the terms
+of service the vendor publishes, and redistribution of the AppImage this
+package installs is not granted by them.
+
+Terms of service: https://www.lunarclient.com/terms
+EOF
 }

nextcloud-native-bin/.SRCINFO

@@ -1,8 +1,8 @@
 pkgbase = nextcloud-native-bin
 	pkgdesc = Adaptive native client for Nextcloud files, media and apps (upstream binary)
 	pkgver = 0.1.0alpha.2
-	pkgrel = 1
+	pkgrel = 2
-	url = https://nc-native.obiente.dev
+	url = https://nati.ve
 	arch = x86_64
 	license = AGPL-3.0-or-later
 	depends = alsa-lib
@@ -37,7 +37,7 @@ pkgbase = nextcloud-native-bin
 	noextract = nextcloud-native-bin-0.1.0alpha.2.deb
 	options = !strip
 	options = !debug
-	source = nextcloud-native-bin-0.1.0alpha.2.deb::https://github.com/Obiente/nc-native/releases/download/v0.1.0-alpha.2/nextcloudnative_1.0.3822_amd64.deb
+	source = nextcloud-native-bin-0.1.0alpha.2.deb::https://github.com/Obiente/native/releases/download/v0.1.0-alpha.2/nextcloudnative_1.0.3822_amd64.deb
 	sha256sums = df8e3e616c79c4ce3f7597fa9b88c188a956475f2af4128bc7a70692ebf39325
 
 pkgname = nextcloud-native-bin

nextcloud-native-bin/PKGBUILD

@@ -4,10 +4,10 @@
 
 pkgname=nextcloud-native-bin
 pkgver=0.1.0alpha.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Adaptive native client for Nextcloud files, media and apps (upstream binary)"
 arch=('x86_64')
-url="https://nc-native.obiente.dev"
+url="https://nati.ve"
 license=('AGPL-3.0-or-later')
 # jpackage bundles its own Java runtime, so these are the shared libraries the
 # upstream .deb declares plus libsecret, whose secret-tool the client calls to
@@ -28,7 +28,7 @@ options=('!strip' '!debug')
 # number that cannot be derived from pkgver - both are refreshed automatically.
 _tag="v0.1.0-alpha.2"
 _asset="nextcloudnative_1.0.3822_amd64.deb"
-source=("${pkgname}-${pkgver}.deb::https://github.com/Obiente/nc-native/releases/download/${_tag}/${_asset}")
+source=("${pkgname}-${pkgver}.deb::https://github.com/Obiente/native/releases/download/${_tag}/${_asset}")
 noextract=("${pkgname}-${pkgver}.deb")
 sha256sums=('df8e3e616c79c4ce3f7597fa9b88c188a956475f2af4128bc7a70692ebf39325')
 

nextcloud-native-bin/pkg.sh

@@ -1,4 +1,4 @@
-# nextcloud-native-bin - Nextcloud Native (https://github.com/Obiente/nc-native),
+# nextcloud-native-bin - Nextcloud Native (https://github.com/Obiente/native),
 # an adaptive native Nextcloud client built with Kotlin/Compose Multiplatform.
 #
 # Upstream publishes a jpackage .deb (and .rpm) per release, so there is no
@@ -17,7 +17,7 @@
 # is -1, the trailing alphabetic segment loses), so the prereleases upgrade to
 # the eventual stable release on their own and no epoch is needed.
 
-UPSTREAM_REPO="Obiente/nc-native"
+UPSTREAM_REPO="Obiente/native"
 
 # newest release whose tag looks like a version (skips nightly-*/channel-*)
 latest_tag() {

nextcloud-native-git/.SRCINFO

@@ -1,8 +1,8 @@
 pkgbase = nextcloud-native-git
 	pkgdesc = Adaptive native client for Nextcloud files, media and apps (git)
 	pkgver = 0.1.0.alpha.2.r31.gdcfde9b
-	pkgrel = 1
+	pkgrel = 2
-	url = https://nc-native.obiente.dev
+	url = https://nati.ve
 	arch = x86_64
 	license = AGPL-3.0-or-later
 	makedepends = jdk21-openjdk
@@ -39,7 +39,7 @@ pkgbase = nextcloud-native-git
 	conflicts = nextcloud-native
 	options = !strip
 	options = !debug
-	source = nextcloud-native-git::git+https://github.com/Obiente/nc-native.git
+	source = nextcloud-native-git::git+https://github.com/Obiente/native.git
 	sha256sums = SKIP
 
 pkgname = nextcloud-native-git

nextcloud-native-git/PKGBUILD

@@ -4,10 +4,10 @@
 
 pkgname=nextcloud-native-git
 pkgver=0.1.0.alpha.2.r31.gdcfde9b
-pkgrel=1
+pkgrel=2
 pkgdesc="Adaptive native client for Nextcloud files, media and apps (git)"
 arch=('x86_64')
-url="https://nc-native.obiente.dev"
+url="https://nati.ve"
 license=('AGPL-3.0-or-later')
 # createDistributable produces a jpackage application image with its own jlink
 # runtime, so the shared libraries that runtime needs are the only depends.
@@ -25,7 +25,7 @@ optdepends=('gnome-keyring: Secret Service provider for stored accounts'
 options=('!strip' '!debug')
 provides=('nextcloud-native')
 conflicts=('nextcloud-native')
-source=("${pkgname}::git+https://github.com/Obiente/nc-native.git")
+source=("${pkgname}::git+https://github.com/Obiente/native.git")
 sha256sums=('SKIP')
 
 pkgver() {

nextcloud-native-git/pkg.sh

@@ -1,4 +1,4 @@
-# nextcloud-native-git - Nextcloud Native (https://github.com/Obiente/nc-native)
+# nextcloud-native-git - Nextcloud Native (https://github.com/Obiente/native)
 # built from the main branch. Same build as nextcloud-native, see that package
 # for why the Linux desktop image needs nothing but JDK 21.
 #

nextcloud-native/.SRCINFO

@@ -1,8 +1,8 @@
 pkgbase = nextcloud-native
 	pkgdesc = Adaptive native client for Nextcloud files, media and apps
 	pkgver = 0.1.0alpha.2
-	pkgrel = 1
+	pkgrel = 2
-	url = https://nc-native.obiente.dev
+	url = https://nati.ve
 	arch = x86_64
 	license = AGPL-3.0-or-later
 	makedepends = jdk21-openjdk
@@ -36,7 +36,7 @@ pkgbase = nextcloud-native
 	optdepends = fuse2: mount an account as a virtual file system
 	options = !strip
 	options = !debug
-	source = nextcloud-native-0.1.0alpha.2.tar.gz::https://github.com/Obiente/nc-native/archive/refs/tags/v0.1.0-alpha.2.tar.gz
+	source = nextcloud-native-0.1.0alpha.2.tar.gz::https://github.com/Obiente/native/archive/refs/tags/v0.1.0-alpha.2.tar.gz
-	sha256sums = 7ec5b795778668f133f0fe3d3e41e11b4fcb0c2e825c794c3915d791af14f920
+	sha256sums = 7df806cfb84c1bc3e3d1ce6c642003a16ed7d607546d89973fba31cd381fd699
 
 pkgname = nextcloud-native

nextcloud-native/PKGBUILD

@@ -4,10 +4,10 @@
 
 pkgname=nextcloud-native
 pkgver=0.1.0alpha.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Adaptive native client for Nextcloud files, media and apps"
 arch=('x86_64')
-url="https://nc-native.obiente.dev"
+url="https://nati.ve"
 license=('AGPL-3.0-or-later')
 # createDistributable produces a jpackage application image with its own jlink
 # runtime, so the shared libraries that runtime needs are the only depends.
@@ -26,10 +26,10 @@ options=('!strip' '!debug')
 # Upstream has no stable release yet; only the versioned tags are packaged.
 # pkgver drops the hyphen from the tag; see pkg.sh.
 _tag="v0.1.0-alpha.2"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Obiente/nc-native/archive/refs/tags/${_tag}.tar.gz")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Obiente/native/archive/refs/tags/${_tag}.tar.gz")
-sha256sums=('7ec5b795778668f133f0fe3d3e41e11b4fcb0c2e825c794c3915d791af14f920')
+sha256sums=('7df806cfb84c1bc3e3d1ce6c642003a16ed7d607546d89973fba31cd381fd699')
 
-_srcname="nc-native-${_tag#v}"
+_srcname="native-${_tag#v}"
 
 build() {
   cd "$_srcname"

nextcloud-native/pkg.sh

@@ -1,4 +1,4 @@
-# nextcloud-native - Nextcloud Native (https://github.com/Obiente/nc-native),
+# nextcloud-native - Nextcloud Native (https://github.com/Obiente/native),
 # an adaptive native Nextcloud client built with Kotlin/Compose Multiplatform.
 #
 # Source package: the PKGBUILD builds :ui:createDistributable from the release
@@ -17,7 +17,7 @@
 # older than a later plain 0.1.0, so no epoch is needed. See
 # nextcloud-native-bin/pkg.sh.
 
-UPSTREAM_REPO="Obiente/nc-native"
+UPSTREAM_REPO="Obiente/native"
 
 # Installed in CI (pacman) before the makepkg test build.
 BUILD_DEPS=(jdk21-openjdk python)

tenzen-studio-bin/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = tenzen-studio-bin
 	pkgdesc = Record and edit product demos: cut pauses, add zooms and captions (upstream Flatpak bundle)
 	pkgver = 0.1.26
-	pkgrel = 1
+	pkgrel = 2
 	url = https://tenzen.studio
 	arch = x86_64
 	license = LicenseRef-proprietary

tenzen-studio-bin/PKGBUILD

@@ -5,7 +5,7 @@
 pkgname=tenzen-studio-bin
 _pkgname=tenzen
 pkgver=0.1.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Record and edit product demos: cut pauses, add zooms and captions (upstream Flatpak bundle)"
 arch=('x86_64')
 url="https://tenzen.studio"
@@ -55,4 +55,24 @@ package() {
 
   # 1024x1024, which the hicolor theme has no directory for
   install -Dm644 "${srcdir}/icon.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
+
+  # A custom licence has to ship its terms. Upstream publishes none as a file,
+  # so what goes in is the reference to the terms it is used under, next to
+  # the notices for everything bundled with it, which the app dir does carry.
+  install -Dm644 /dev/stdin "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" <<'EOF'
+Tenzen Studio is proprietary software, distributed by Tenzen Studio.
+
+It is not covered by a free-software licence: use is governed by the terms
+of service the vendor publishes, and redistribution of the build this
+package installs is not granted by them.
+
+Terms of service: https://tenzen.studio/legal/terms-of-service/
+EOF
+
+  ln -s "/opt/${pkgname}/resources/THIRD_PARTY_NOTICES.txt" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/THIRD_PARTY_NOTICES.txt"
+  ln -s "/opt/${pkgname}/LICENSE.electron.txt" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.electron.txt"
+  ln -s "/opt/${pkgname}/LICENSES.chromium.html" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSES.chromium.html"
 }

waydroid-helper-bin/.SRCINFO

@@ -1,8 +1,8 @@
 pkgbase = waydroid-helper-bin
 	pkgdesc = GUI application for Waydroid configuration and extension installation (upstream AppImage)
 	pkgver = 0.2.9
-	pkgrel = 2
+	pkgrel = 3
-	url = https://github.com/ayasa520/waydroid-helper
+	url = https://github.com/waydroid-helper/waydroid-helper
 	arch = x86_64
 	license = GPL-3.0-or-later
 	depends = glibc
@@ -17,7 +17,7 @@ pkgbase = waydroid-helper-bin
 	noextract = waydroid-helper-bin-0.2.9.AppImage
 	options = !strip
 	options = !debug
-	source = waydroid-helper-bin-0.2.9.AppImage::https://github.com/ayasa520/waydroid-helper/releases/download/v0.2.9/waydroid-helper-0.2.9-x86_64.AppImage
+	source = waydroid-helper-bin-0.2.9.AppImage::https://github.com/waydroid-helper/waydroid-helper/releases/download/v0.2.9/waydroid-helper-0.2.9-x86_64.AppImage
 	sha256sums = 4e477a02f7fb52e879aec3ab582995ccb3d2003dce24d9e3e71ea7576b12ac33
 
 pkgname = waydroid-helper-bin

waydroid-helper-bin/PKGBUILD

@@ -4,10 +4,10 @@
 
 pkgname=waydroid-helper-bin
 pkgver=0.2.9
-pkgrel=2
+pkgrel=3
 pkgdesc="GUI application for Waydroid configuration and extension installation (upstream AppImage)"
 arch=('x86_64')
-url="https://github.com/ayasa520/waydroid-helper"
+url="https://github.com/waydroid-helper/waydroid-helper"
 license=('GPL-3.0-or-later')
 # the AppImage bundles Python, GTK4, VTE, adb and fakeroot; these are what is
 # left over

waydroid-helper-bin/pkg.sh

@@ -1,12 +1,12 @@
 # waydroid-helper-bin - Waydroid Helper
-# (https://github.com/ayasa520/waydroid-helper), a GTK4 + LibAdwaita GUI for
+# (https://github.com/waydroid-helper/waydroid-helper), a GTK4 + LibAdwaita GUI for
 # Waydroid configuration and extension installation.
 #
 # Upstream publishes an AppImage per release, which the PKGBUILD unpacks and
 # installs into /opt - so there is no build step here, only pkgver and the
 # checksum are refreshed on a new version.
 
-UPSTREAM_REPO="ayasa520/waydroid-helper"
+UPSTREAM_REPO="waydroid-helper/waydroid-helper"
 
 latest_version() {
   gh api "repos/$UPSTREAM_REPO/releases/latest" --jq '.tag_name' | sed 's/^v//'