Commit c7599d91 authored by Kevin Daudt's avatar Kevin Daudt 💻
Browse files

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.

See #12264
parent d4b5d61f
......@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=gtk+3.0
pkgver=3.24.22
pkgrel=0
pkgrel=1
pkgdesc="The GTK+ Toolkit (v3)"
url="https://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
......@@ -102,19 +102,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() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment