aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2021-01-02 16:59:22 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2021-01-02 17:03:30 +0000
commitedcb62fed132a29686cb95cc6daf34eaf6885957 (patch)
tree4b69489af59f4d7036d6b0e288a93d4a92c155b1
parent9e6a41344e86c869de658f0a21aced851e5d1a97 (diff)
downloadaports-edcb62fed132a29686cb95cc6daf34eaf6885957.tar.gz
aports-edcb62fed132a29686cb95cc6daf34eaf6885957.tar.bz2
aports-edcb62fed132a29686cb95cc6daf34eaf6885957.tar.xz
community/gtk+3.0: remove demo files from main package
The `-demo` subpackage installed the demo file from the $builddir, but gtk3 also installed those files in the main pacakge, resulting in those files living in both packages. Use `amove` to move these files from the main package into the subpackage, instead of installing them from the builddir. Fixes #12264
-rw-r--r--main/gtk+3.0/APKBUILD25
1 files changed, 11 insertions, 14 deletions
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index 88a891a301..3a1e25e9fb 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gtk+3.0
pkgver=3.24.23
-pkgrel=1
+pkgrel=2
pkgdesc="The GTK+ Toolkit (v3)"
url="https://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -96,19 +96,16 @@ package() {
demo() {
pkgdesc="$pkgdesc (demonstration application)"
- install -Dm755 "$pkgdir"/usr/bin/gtk3-demo \
- "$pkgdir"/usr/bin/gtk3-widget-factory \
- "$pkgdir"/usr/bin/gtk3-demo-application \
- -t "$subpkgdir"/usr/bin
- install -Dm644 "$pkgdir"/usr/share/gtk-3.0/gtkbuilder.rng \
- -t "$subpkgdir"/usr/share/gtk-3.0
- install -Dm644 "$pkgdir"/usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml \
- -t "$subpkgdir"/usr/share/glib-2.0/schemas
- install -Dm644 "$pkgdir"/usr/share/applications/gtk3-widget-factory.desktop \
- "$pkgdir"/usr/share/applications/gtk3-demo.desktop \
- -t "$subpkgdir"/usr/share/applications
- mkdir -p "$subpkgdir"/usr/share
- mv "$pkgdir"/usr/share/icons "$subpkgdir"/usr/share
+ amove usr/bin/gtk3-demo \
+ usr/bin/gtk3-widget-factory \
+ usr/bin/gtk3-demo-application
+
+ amove usr/share/gtk-3.0/gtkbuilder.rng \
+ usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml \
+ usr/share/applications/gtk3-widget-factory.desktop \
+ usr/share/applications/gtk3-demo.desktop
+
+ amove usr/share/icons
}
dev() {