diff options
author | Nbiba Bedis | 2021-12-14 12:20:50 +0100 |
---|---|---|
committer | Nbiba Bedis | 2021-12-14 12:23:52 +0100 |
commit | 4f41bcc5f7f632765323d2080875383c89d63fe3 (patch) | |
tree | 0ccc2ac2337e779e1cca287981a7e8939d657bf0 | |
parent | dff43e4669c1df9ec7f02341cff9ab307e7ea8d9 (diff) | |
download | aur-4f41bcc5f7f632765323d2080875383c89d63fe3.tar.gz |
Fix pkg
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | PKGBUILD | 45 | ||||
-rw-r--r-- | fix_flatpak.rs | bin | 1665 -> 1653 bytes | |||
-rw-r--r-- | shortwave | 2 |
4 files changed, 29 insertions, 33 deletions
@@ -1,22 +1,21 @@ pkgbase = shortwave-bin-hack - pkgdesc = Find and listen to internet radio stations. This pkg uses the flatpak version and intercepts libc functions to make it work Currently it is broken - pkgver = 1570577 - pkgrel = 5 + pkgdesc = Find and listen to internet radio stations. This pkg uses a fork and some hacks to make it work, checkout (https://aur.archlinux.org/packages/shortwave-bin-hack/) for more infos. + pkgver = 1673135 + pkgrel = 1 url = https://gitlab.gnome.org/World/Shortwave/ arch = any license = GPL makedepends = cargo - makedepends = ostree depends = gst-plugins-bad depends = libadwaita depends = libsoup provides = shortwave conflicts = shortwave - source = https://gitlab.gnome.org/World/Shortwave/-/jobs/1570577/artifacts/download?file_type=archive + source = https://gitlab.gnome.org/sigmaSd/Shortwave/-/jobs/1673135/artifacts/download source = fix_flatpak.rs source = shortwave - sha256sums = fefe532b4896b7d03ed0b2d2bab3aa429af19944ef4fb105490b8a0345cafbd9 - sha256sums = c9f1bc05e916ab429ffa2b18cca2f63e7cad4ce2a5dfa9c99d19c6db3d4fb4de - sha256sums = bdd3140b737646d38e801d7cfa2092e47126b968e32ffe32250c9046ddc76a6a + sha256sums = c5a02e584f9152d0735d38174e0fa8c1e5a58d4a8f6517b20c846a95740c4c15 + sha256sums = 10356a1c427c639ec94dece3ab0c0173b81c075df30b55c4b93347932f3b22f5 + sha256sums = 58f061f909b6a8eff030ba1058a3c70c3ca3680ed13b865a118671388a3f3a9d pkgname = shortwave-bin-hack @@ -1,49 +1,46 @@ # Maintainer: sigmasd pkgname=shortwave-bin-hack -pkgver=1570577 -pkgrel=5 +pkgver=1673135 +pkgrel=1 pkgdesc="Find and listen to internet radio stations. -This pkg uses the flatpak version and intercepts libc functions to make it work -Currently it is broken" +This pkg uses a fork and some hacks to make it work, checkout (https://aur.archlinux.org/packages/shortwave-bin-hack/) for more infos." arch=(any) url="https://gitlab.gnome.org/World/Shortwave/" license=(GPL) provides=("shortwave") conflicts=("shortwave") -makedepends=(cargo ostree) +makedepends=(cargo) depends=('gst-plugins-bad' 'libadwaita' 'libsoup') -source=("$url-/jobs/$pkgver/artifacts/download?file_type=archive" "fix_flatpak.rs" "shortwave") -sha256sums=('fefe532b4896b7d03ed0b2d2bab3aa429af19944ef4fb105490b8a0345cafbd9' - 'c9f1bc05e916ab429ffa2b18cca2f63e7cad4ce2a5dfa9c99d19c6db3d4fb4de' - 'bdd3140b737646d38e801d7cfa2092e47126b968e32ffe32250c9046ddc76a6a') +# use fork in order to comment out gtk4.6 usage +source=("https://gitlab.gnome.org/sigmaSd/Shortwave/-/jobs/$pkgver/artifacts/download" "fix_flatpak.rs" "shortwave") + +sha256sums=('c5a02e584f9152d0735d38174e0fa8c1e5a58d4a8f6517b20c846a95740c4c15' + '10356a1c427c639ec94dece3ab0c0173b81c075df30b55c4b93347932f3b22f5' + '58f061f909b6a8eff030ba1058a3c70c3ca3680ed13b865a118671388a3f3a9d') + prepare() { # Build flatpak-fix dylib - rustc --crate-type dylib fix_flatpak.rs + rustc -O --crate-type cdylib fix_flatpak.rs } package() { - # Extract flatpak - ostree init --repo=shortwave_repo - ostree --repo=shortwave_repo config set core.min-free-space-percent 0 - ostree static-delta apply-offline --repo=shortwave_repo shortwave-dev.flatpak - commit=$(find -name "*commit" | cut -d/ --output-delimiter= -f4- | tr -d '\0' | xargs -i basename {} .commit) - ostree --repo=shortwave_repo checkout -U $commit shortwave_build - # Entry point - install -Dm755 "$srcdir/shortwave_build/files/bin/shortwave" "$pkgdir/usr/share/shortwave/shortwave" + install -Dm755 "$srcdir/app/files/bin/shortwave" "$pkgdir/usr/share/shortwave/shortwave" - # Extra (desktop,icons) - rm -rf "$srcdir/shortwave_build/export/share/dbus-1" - sed -i "s/DBusActivatable=true//" "$srcdir/shortwave_build/export/share/applications/de.haeckerfelix.Shortwave.Devel.desktop" - cp -r "$srcdir/shortwave_build/export/share/" "$pkgdir/usr/" + # Cleanup pkg and install Extra (desktop,icons) + sed "s%Exec=/app%Exec=/usr%" -i "$srcdir/app/files/share/dbus-1/services/de.haeckerfelix.Shortwave.service" + rm "$srcdir/app/files/share/applications/mimeinfo.cache" + rm "$srcdir/app/files/share/glib-2.0/schemas/gschemas.compiled" + rm "$srcdir/app/files/share/icons/hicolor/icon-theme.cache" + cp -r "$srcdir/app/files/share/" "$pkgdir/usr/" # Actual program - install -m755 "$srcdir/shortwave_build/files/share/shortwave/de.haeckerfelix.Shortwave.Devel.gresource" "$pkgdir/usr/share/shortwave/" install -m755 "$srcdir/libfix_flatpak.so" "$pkgdir/usr/share/shortwave/" + install -m755 "$srcdir/app/files/lib/libshumate-0.0.so.0.0" "$pkgdir/usr/share/shortwave/libshumate-0.0.so.0" install -Dm755 "$srcdir/shortwave" "$pkgdir/usr/bin/shortwave" # Gschema - install -Dm755 "$srcdir/shortwave_build/files/share/glib-2.0/schemas/de.haeckerfelix.Shortwave.gschema.xml" "$pkgdir/usr/share/glib-2.0/schemas/de.haeckerfelix.Shortwave.gschema.xml" + install -Dm755 "$srcdir/app/files/share/glib-2.0/schemas/de.haeckerfelix.Shortwave.gschema.xml" "$pkgdir/usr/share/glib-2.0/schemas/de.haeckerfelix.Shortwave.gschema.xml" } diff --git a/fix_flatpak.rs b/fix_flatpak.rs Binary files differindex 69195b1f8add..9bd6faa717fe 100644 --- a/fix_flatpak.rs +++ b/fix_flatpak.rs diff --git a/shortwave b/shortwave index e75994960590..e67d74093055 100644 --- a/shortwave +++ b/shortwave @@ -1,2 +1,2 @@ #!/bin/bash -LD_PRELOAD=/usr/share/shortwave/libfix_flatpak.so /usr/share/shortwave/shortwave +LD_PRELOAD="/usr/share/shortwave/libfix_flatpak.so /usr/share/shortwave/libshumate-0.0.so.0" /usr/share/shortwave/shortwave |