Date: Monday, April 25, 2022 @ 12:19:27
Author: heftig
Revision: 443946
archrelease: copy trunk to extra-x86_64
Added:
gtk3/repos/extra-x86_64/PKGBUILD
(from rev 443945, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
(from rev 443945, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/extra-x86_64/gtk3.install
(from rev 443945, gtk3/trunk/gtk3.install)
Deleted:
gtk3/repos/extra-x86_64/PKGBUILD
gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
gtk3/repos/extra-x86_64/gtk3.install
------------------------------+
PKGBUILD | 216 +++++++++++++++++++++--------------------
gtk-query-immodules-3.0.hook | 22 ++--
gtk3.install | 6 -
3 files changed, 125 insertions(+), 119 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-04-25 12:19:09 UTC (rev 443945)
+++ PKGBUILD 2022-04-25 12:19:27 UTC (rev 443946)
@@ -1,105 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
-# Contributor: Ionut Biru <ib...@archlinux.org>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk3-docs gtk3-demos)
-pkgver=3.24.33
-pkgrel=2
-epoch=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-url="https://www.gtk.org/";
-arch=(x86_64)
-depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
- dconf libxcomposite libxdamage pango shared-mime-info at-spi2-atk
- wayland libxkbcommon adwaita-icon-theme json-glib librsvg
- desktop-file-utils mesa cantarell-fonts libcolord rest libcups
- fribidi iso-codes libcloudproviders tracker3 gtk-update-icon-cache)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson
- wayland-protocols)
-license=(LGPL)
-options=(debug)
-_commit=8ff9b2f83ff491cbfcbf9b30c706bd917679e7cc # tags/3.24.33^0
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit";
- gtk-query-immodules-3.0.hook)
-sha256sums=('SKIP'
- 'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229')
-
-pkgver() {
- cd gtk
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd gtk
-}
-
-build() {
- CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
- local meson_options=(
- -D broadway_backend=true
- -D cloudproviders=true
- -D tracker3=true
- -D colord=yes
- -D gtk_doc=true
- -D man=true
- )
-
- arch-meson gtk build "${meson_options[@]}"
- meson compile -C build
-}
-
-_pick() {
- local p="$1" f d; shift
- for f; do
- d="$srcdir/$p/${f#$pkgdir/}"
- mkdir -p "$(dirname "$d")"
- mv "$f" "$d"
- rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
- done
-}
-
-package_gtk3() {
- optdepends=('evince: Default print preview command')
- provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
- conflicts=(gtk3-print-backends)
- replaces=("gtk3-print-backends<=3.22.26-1")
- install=gtk3.install
-
- meson install -C build --destdir "$pkgdir"
-
- install -Dm644 /dev/stdin "$pkgdir/usr/share/gtk-3.0/settings.ini" <<END
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
-END
-
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644
gtk-query-immodules-3.0.hook
-
- cd "$pkgdir"
-
- rm usr/bin/gtk-update-icon-cache
- rm usr/share/man/man1/gtk-update-icon-cache.1
-
- _pick docs usr/share/gtk-doc
-
- _pick demo usr/bin/gtk3-{demo,demo-application,icon-browser,widget-factory}
- _pick demo
usr/share/applications/gtk3-{demo,icon-browser,widget-factory}.desktop
- _pick demo usr/share/glib-2.0/schemas/org.gtk.{Demo,exampleapp}.gschema.xml
- _pick demo usr/share/icons/hicolor/*/apps/gtk3-{demo,widget-factory}[-.]*
- _pick demo
usr/share/man/man1/gtk3-{demo,demo-application,icon-browser,widget-factory}.1
-}
-
-package_gtk3-docs() {
- pkgdesc+=" (documentation)"
- depends=()
- mv docs/* "$pkgdir"
-}
-
-package_gtk3-demos() {
- pkgdesc+=" (demo applications)"
- depends=(gtk3)
- mv demo/* "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 443945, gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-04-25 12:19:27 UTC (rev 443946)
@@ -0,0 +1,111 @@
+# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk3-docs gtk3-demos)
+pkgver=3.24.33
+pkgrel=3
+epoch=1
+pkgdesc="GObject-based multi-platform GUI toolkit"
+url="https://www.gtk.org/";
+arch=(x86_64)
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
+ dconf libxcomposite libxdamage pango shared-mime-info at-spi2-atk
+ wayland libxkbcommon adwaita-icon-theme json-glib librsvg
+ desktop-file-utils mesa cantarell-fonts libcolord rest libcups
+ fribidi iso-codes libcloudproviders tracker3 gtk-update-icon-cache)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson
+ wayland-protocols)
+license=(LGPL)
+options=(debug)
+_commit=8ff9b2f83ff491cbfcbf9b30c706bd917679e7cc # tags/3.24.33^0
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit";
+ gtk-query-immodules-3.0.hook)
+sha256sums=('SKIP'
+ 'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229')
+
+pkgver() {
+ cd gtk
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gtk
+
+ # Add legacy icons
+ git cherry-pick -n 5a0ffbbb4568e39bdf26006e1bf18c1c1d0d597a
+
+ # Fix annotation
+ git cherry-pick -n 56ada2f01f3b522a42831aba158786e843fca817
+}
+
+build() {
+ CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
+ local meson_options=(
+ -D broadway_backend=true
+ -D cloudproviders=true
+ -D tracker3=true
+ -D colord=yes
+ -D gtk_doc=true
+ -D man=true
+ )
+
+ arch-meson gtk build "${meson_options[@]}"
+ meson compile -C build
+}
+
+_pick() {
+ local p="$1" f d; shift
+ for f; do
+ d="$srcdir/$p/${f#$pkgdir/}"
+ mkdir -p "$(dirname "$d")"
+ mv "$f" "$d"
+ rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+ done
+}
+
+package_gtk3() {
+ optdepends=('evince: Default print preview command')
+ provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so)
+ conflicts=(gtk3-print-backends)
+ replaces=("gtk3-print-backends<=3.22.26-1")
+ install=gtk3.install
+
+ meson install -C build --destdir "$pkgdir"
+
+ install -Dm644 /dev/stdin "$pkgdir/usr/share/gtk-3.0/settings.ini" <<END
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
+END
+
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644
gtk-query-immodules-3.0.hook
+
+ cd "$pkgdir"
+
+ rm usr/bin/gtk-update-icon-cache
+ rm usr/share/man/man1/gtk-update-icon-cache.1
+
+ _pick docs usr/share/gtk-doc
+
+ _pick demo usr/bin/gtk3-{demo,demo-application,icon-browser,widget-factory}
+ _pick demo
usr/share/applications/gtk3-{demo,icon-browser,widget-factory}.desktop
+ _pick demo usr/share/glib-2.0/schemas/org.gtk.{Demo,exampleapp}.gschema.xml
+ _pick demo usr/share/icons/hicolor/*/apps/gtk3-{demo,widget-factory}[-.]*
+ _pick demo
usr/share/man/man1/gtk3-{demo,demo-application,icon-browser,widget-factory}.1
+}
+
+package_gtk3-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+ mv docs/* "$pkgdir"
+}
+
+package_gtk3-demos() {
+ pkgdesc+=" (demo applications)"
+ depends=(gtk3)
+ mv demo/* "$pkgdir"
+}
+
+# vim:set sw=2 et:
Deleted: gtk-query-immodules-3.0.hook
===================================================================
--- gtk-query-immodules-3.0.hook 2022-04-25 12:19:09 UTC (rev 443945)
+++ gtk-query-immodules-3.0.hook 2022-04-25 12:19:27 UTC (rev 443946)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Copied: gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook (from rev 443945,
gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk-query-immodules-3.0.hook (rev 0)
+++ gtk-query-immodules-3.0.hook 2022-04-25 12:19:27 UTC (rev 443946)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Deleted: gtk3.install
===================================================================
--- gtk3.install 2022-04-25 12:19:09 UTC (rev 443945)
+++ gtk3.install 2022-04-25 12:19:27 UTC (rev 443946)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 443945,
gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install (rev 0)
+++ gtk3.install 2022-04-25 12:19:27 UTC (rev 443946)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
