diff options
| author | Zach van Rijn <me@zv.io> | 2024-12-10 15:47:01 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2024-12-10 15:47:01 +0000 |
| commit | 281aa38b87981b0b9bb091f367457bb8a1bbc8ac (patch) | |
| tree | bd5609c0302846ee593e54753000f3da46fea9c3 /user | |
| parent | 9658dc567290a6251d84fb072a6ca77c9fb55a2c (diff) | |
| download | packages-281aa38b87981b0b9bb091f367457bb8a1bbc8ac.tar.gz packages-281aa38b87981b0b9bb091f367457bb8a1bbc8ac.tar.bz2 packages-281aa38b87981b0b9bb091f367457bb8a1bbc8ac.tar.xz packages-281aa38b87981b0b9bb091f367457bb8a1bbc8ac.zip | |
user/spice-gtk: remove bad git assumption. fixes #1294.
Diffstat (limited to 'user')
| -rw-r--r-- | user/spice-gtk/APKBUILD | 7 | ||||
| -rw-r--r-- | user/spice-gtk/fix-dirty-spicy-corruption.patch | 23 |
2 files changed, 28 insertions, 2 deletions
diff --git a/user/spice-gtk/APKBUILD b/user/spice-gtk/APKBUILD index dae9a0eca..f1fd970a8 100644 --- a/user/spice-gtk/APKBUILD +++ b/user/spice-gtk/APKBUILD @@ -19,7 +19,9 @@ makedepends="$depends_dev acl-dev bash cyrus-sasl-dev eudev-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang spicy spice-glib:glib" -source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz" +source="https://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.xz + fix-dirty-spicy-corruption.patch + " build() { # Note: pulseaudio support is disabled because it's deprecated. @@ -64,4 +66,5 @@ glib() { "$subpkgdir"/usr/lib/girepository-1.0/ } -sha512sums="fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137 spice-gtk-0.42.tar.xz" +sha512sums="fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137 spice-gtk-0.42.tar.xz +4da61b94db02f4db400be45933bb6d3d3aa05137dfba78dcbc1757d9709c4252984e12f61f88c953597925e3145f5637fde1e76422513e0d1808b53c61c521c7 fix-dirty-spicy-corruption.patch" diff --git a/user/spice-gtk/fix-dirty-spicy-corruption.patch b/user/spice-gtk/fix-dirty-spicy-corruption.patch new file mode 100644 index 000000000..44397fc67 --- /dev/null +++ b/user/spice-gtk/fix-dirty-spicy-corruption.patch @@ -0,0 +1,23 @@ +diff -ur a/build-aux/git-version-gen b/build-aux/git-version-gen +--- a/build-aux/git-version-gen 2024-12-10 15:40:58.099527209 +0000 ++++ b/build-aux/git-version-gen 2024-12-10 15:44:18.316014690 +0000 +@@ -133,19 +133,6 @@ + + v=`echo "$v" |sed 's/^v//'` + +-# Don't declare a version "dirty" merely because a time stamp has changed. +-git update-index --refresh > /dev/null 2>&1 +- +-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +-case "$dirty" in +- '') ;; +- *) # Append the suffix only if there isn't one already. +- case $v in +- *-dirty) ;; +- *) v="$v-dirty" ;; +- esac ;; +-esac +- + # Omit the trailing newline, so that m4_esyscmd can use the result directly. + echo "$v" | tr -d "$nl" + |