[arch-commits] Commit in gtk4/repos/extra-x86_64 (10 files)
Jan Steffens
heftig at gemini.archlinux.org
Thu Feb 3 19:42:58 UTC 2022
Date: Thursday, February 3, 2022 @ 19:42:58
Author: heftig
Revision: 436131
archrelease: copy trunk to extra-x86_64
Added:
gtk4/repos/extra-x86_64/0001-demos-Make-our-stack-noexec.patch
(from rev 436130, gtk4/trunk/0001-demos-Make-our-stack-noexec.patch)
gtk4/repos/extra-x86_64/PKGBUILD
(from rev 436130, gtk4/trunk/PKGBUILD)
gtk4/repos/extra-x86_64/gtk-update-icon-cache.hook
(from rev 436130, gtk4/trunk/gtk-update-icon-cache.hook)
gtk4/repos/extra-x86_64/gtk-update-icon-cache.script
(from rev 436130, gtk4/trunk/gtk-update-icon-cache.script)
gtk4/repos/extra-x86_64/gtk4-querymodules.hook
(from rev 436130, gtk4/trunk/gtk4-querymodules.hook)
Deleted:
gtk4/repos/extra-x86_64/PKGBUILD
gtk4/repos/extra-x86_64/fix-resources.diff
gtk4/repos/extra-x86_64/gtk-update-icon-cache.hook
gtk4/repos/extra-x86_64/gtk-update-icon-cache.script
gtk4/repos/extra-x86_64/gtk4-querymodules.hook
----------------------------------------+
0001-demos-Make-our-stack-noexec.patch | 115 +++++++++++++
PKGBUILD | 273 +++++++++++++++----------------
fix-resources.diff | 102 -----------
gtk-update-icon-cache.hook | 26 +-
gtk-update-icon-cache.script | 20 +-
gtk4-querymodules.hook | 24 +-
6 files changed, 288 insertions(+), 272 deletions(-)
Copied: gtk4/repos/extra-x86_64/0001-demos-Make-our-stack-noexec.patch (from rev 436130, gtk4/trunk/0001-demos-Make-our-stack-noexec.patch)
===================================================================
--- 0001-demos-Make-our-stack-noexec.patch (rev 0)
+++ 0001-demos-Make-our-stack-noexec.patch 2022-02-03 19:42:58 UTC (rev 436131)
@@ -0,0 +1,115 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Thu, 3 Feb 2022 19:14:36 +0000
+Subject: [PATCH] demos: Make our stack noexec
+
+This is similar to https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4330
+and https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4334, which fixed
+the main library but missed the demos.
+---
+ demos/gtk-demo/meson.build | 4 ++++
+ demos/widget-factory/meson.build | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
+index 5c84a0121d33..f594cd59b29c 100644
+--- a/demos/gtk-demo/meson.build
++++ b/demos/gtk-demo/meson.build
+@@ -170,42 +170,46 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
+ depfile : 'gtkdemo.gresource.d',
+ command : [glib_compile_resources,
+ '--generate',
++ '--internal',
+ '--target=@OUTPUT@',
+ '--dependency-file=@DEPFILE@',
+ '--sourcedir=' + meson.current_source_dir(),
+ '--sourcedir=' + meson.current_build_dir(),
+ '@INPUT@'])
+
+ # Create resource data file
+ gtkdemo_resources_c = custom_target('gtkdemo_resources.c',
+ input : 'demo.gresource.xml',
+ output : 'gtkdemo_resources.c',
+ depfile : 'gtkdemo_resources.c.d',
+ command : [glib_compile_resources,
+ '--generate-source',
++ '--internal',
+ '--target=@OUTPUT@',
+ '--dependency-file=@DEPFILE@',
+ '--sourcedir=' + meson.current_source_dir(),
+ '--sourcedir=' + meson.current_build_dir(),
+ '--external-data',
+ '--c-name', '_g_binary_gtkdemo',
+ '@INPUT@'])
+
+ # Create object file containing resource data
+ gtkdemo_resources_binary = custom_target('gtkdemo_resources.o',
+ input : gtkdemo_gresource,
+ output : 'gtkdemo_resources.o',
+ command : [ld,
++ '-z', 'noexecstack',
+ '-r',
+ '-b','binary',
+ '@INPUT@',
+ '-o','@OUTPUT@'])
+
+ # Rename symbol to match the one in the C file
+ gtkdemo_resources_o = custom_target('gtkdemo_resources2.o',
+ input : gtkdemo_resources_binary,
+ output : 'gtkdemo_resources2.o',
+ command : [objcopy,
++ '--strip-all',
+ '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
+ '@INPUT@',
+ '@OUTPUT@'])
+diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
+index 800230b512db..9a083eb1aca5 100644
+--- a/demos/widget-factory/meson.build
++++ b/demos/widget-factory/meson.build
+@@ -18,42 +18,46 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
+ depfile: 'widgetfactory.gresource.d',
+ command : [glib_compile_resources,
+ '--generate',
++ '--internal',
+ '--target=@OUTPUT@',
+ '--dependency-file=@DEPFILE@',
+ '--sourcedir=' + meson.current_source_dir(),
+ '--sourcedir=' + meson.current_build_dir(),
+ '@INPUT@'])
+
+ # Create resource data file
+ widgetfactory_resources_c = custom_target('widgetfactory_resources.c',
+ input : 'widget-factory.gresource.xml',
+ output : 'widgetfactory_resources.c',
+ depfile: 'widgetfactory_resources.c.d',
+ command : [glib_compile_resources,
+ '--generate-source',
++ '--internal',
+ '--target=@OUTPUT@',
+ '--dependency-file=@DEPFILE@',
+ '--sourcedir=' + meson.current_source_dir(),
+ '--sourcedir=' + meson.current_build_dir(),
+ '--external-data',
+ '--c-name', '_g_binary_widgetfactory',
+ '@INPUT@'])
+
+ # Create object file containing resource data
+ widgetfactory_resources_binary = custom_target('widgetfactory_resources.o',
+ input : widgetfactory_gresource,
+ output : 'widgetfactory_resources.o',
+ command : [ld,
++ '-z', 'noexecstack',
+ '-r',
+ '-b','binary',
+ '@INPUT@',
+ '-o','@OUTPUT@'])
+
+ # Rename symbol to match the one in the C file
+ widgetfactory_resources_o = custom_target('widgetfactory_resources2.o',
+ input : widgetfactory_resources_binary,
+ output : 'widgetfactory_resources2.o',
+ command : [objcopy,
++ '--strip-all',
+ '--add-symbol','_g_binary_widgetfactory_resource_data=.data:0',
+ '@INPUT@',
+ '@OUTPUT@'])
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-03 19:42:48 UTC (rev 436130)
+++ PKGBUILD 2022-02-03 19:42:58 UTC (rev 436131)
@@ -1,135 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-
-pkgbase=gtk4
-pkgname=(gtk4 gtk-update-icon-cache gtk4-docs gtk4-demos)
-pkgver=4.6.0
-pkgrel=2
-epoch=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-url="https://www.gtk.org/"
-arch=(x86_64)
-license=(LGPL)
-depends=(glib2 cairo pango fribidi gdk-pixbuf2 libpng libtiff libjpeg libepoxy
- libgl libegl harfbuzz libxkbcommon graphene iso-codes tracker3
- libcolord wayland libxrandr libx11 libxrender libxi libxext libxcursor
- libxdamage libxfixes fontconfig libxinerama libcloudproviders libcups
- gst-plugins-bad-libs librsvg dconf shared-mime-info desktop-file-utils
- adwaita-icon-theme cantarell-fonts)
-makedepends=(git meson gi-docgen shaderc sassc gobject-introspection docbook-xsl
- wayland-protocols python-gobject python-docutils)
-checkdepends=(weston)
-_commit=70cb61fb7104c76a15bc6494a10e6ff1d470f6d8 # tags/4.6.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
- fix-resources.diff
- gtk-update-icon-cache.{hook,script} gtk4-querymodules.hook)
-sha256sums=('SKIP'
- 'd458d2b9621f5131510238f1167a758d1f6c4baabc2a7fe5f445c7bdba2b0802'
- '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541'
- 'cd8e607eddd9941f279084e1d15309941423d26cca1897f43524a02e58e48816')
-
-pkgver() {
- cd gtk
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd gtk
-
- # Ensure noexecstack
- git cherry-pick -n 46509b6dd28c58ae 17c2a1cb4ea2093d
- git apply -3 ../fix-resources.diff
-}
-
-build() {
- CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
- local meson_options=(
- -D broadway-backend=true
- -D cloudproviders=enabled
- -D tracker=enabled
- -D colord=enabled
- -D gtk_doc=true
- -D man-pages=true
- )
-
- arch-meson gtk build "${meson_options[@]}"
- meson compile -C build
-}
-
-check() (
- export XDG_RUNTIME_DIR="$PWD/runtime-dir" WAYLAND_DISPLAY=wayland-5
-
- mkdir -p -m 700 "$XDG_RUNTIME_DIR"
- weston --backend=headless-backend.so --socket=$WAYLAND_DISPLAY --idle-time=0 &
- _w=$!
-
- trap "kill $_w; wait" EXIT
-
- meson test -C build --print-errorlogs
-)
-
-_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_gtk4() {
- depends+=(gtk-update-icon-cache)
- provides=(libgtk-4.so)
-
- meson install -C build --destdir "$pkgdir"
-
- install -Dm644 /dev/stdin "$pkgdir/usr/share/gtk-4.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 gtk4-querymodules.hook
-
- cd "$pkgdir"
-
- _pick guic usr/bin/gtk4-update-icon-cache
- _pick guic usr/share/man/man1/gtk4-update-icon-cache.1
-
- _pick docs usr/share/doc
-
- _pick demo usr/bin/gtk4-{demo,demo-application,icon-browser,print-editor,widget-factory}
- _pick demo usr/share/applications/org.gtk.{Demo,IconBrowser,PrintEditor,WidgetFactory}4.desktop
- _pick demo usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
- _pick demo usr/share/icons/hicolor/*/apps/org.gtk.{Demo,IconBrowser,PrintEditor,WidgetFactory}4[-.]*
- _pick demo usr/share/man/man1/gtk4-{demo,demo-application,icon-browser,widget-factory}.1
- _pick demo usr/share/metainfo/org.gtk.{Demo,IconBrowser,PrintEditor,WidgetFactory}4.appdata.xml
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK icon cache updater"
- depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
-
- mv guic/* "$pkgdir"
- ln -s gtk4-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
- ln -s gtk4-update-icon-cache.1 "$pkgdir/usr/share/man/man1/gtk-update-icon-cache.1"
-
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
- install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-package_gtk4-docs() {
- pkgdesc+=" (documentation)"
- depends=()
- mv docs/* "$pkgdir"
-}
-
-package_gtk4-demos() {
- pkgdesc+=" (demo applications)"
- depends=(gtk4)
- mv demo/* "$pkgdir"
-}
-
-# vim:set sw=2 et:
Copied: gtk4/repos/extra-x86_64/PKGBUILD (from rev 436130, gtk4/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-02-03 19:42:58 UTC (rev 436131)
@@ -0,0 +1,138 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgbase=gtk4
+pkgname=(gtk4 gtk-update-icon-cache gtk4-docs gtk4-demos)
+pkgver=4.6.0
+pkgrel=3
+epoch=1
+pkgdesc="GObject-based multi-platform GUI toolkit"
+url="https://www.gtk.org/"
+arch=(x86_64)
+license=(LGPL)
+depends=(glib2 cairo pango fribidi gdk-pixbuf2 libpng libtiff libjpeg libepoxy
+ libgl libegl harfbuzz libxkbcommon graphene iso-codes tracker3
+ libcolord wayland libxrandr libx11 libxrender libxi libxext libxcursor
+ libxdamage libxfixes fontconfig libxinerama libcloudproviders libcups
+ gst-plugins-bad-libs librsvg dconf shared-mime-info desktop-file-utils
+ adwaita-icon-theme cantarell-fonts)
+makedepends=(git meson gi-docgen shaderc sassc gobject-introspection docbook-xsl
+ wayland-protocols python-gobject python-docutils)
+checkdepends=(weston)
+_commit=70cb61fb7104c76a15bc6494a10e6ff1d470f6d8 # tags/4.6.0^0
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+ 0001-demos-Make-our-stack-noexec.patch
+ gtk-update-icon-cache.{hook,script} gtk4-querymodules.hook)
+sha256sums=('SKIP'
+ '31b0dd527ab808e2a7b83168fff126116be4194f9e7784f6543fb593c47a1433'
+ '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
+ 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541'
+ 'cd8e607eddd9941f279084e1d15309941423d26cca1897f43524a02e58e48816')
+
+pkgver() {
+ cd gtk
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gtk
+
+ # Fix kerning with OpenGL
+ git cherry-pick -n cb1dd662204fe6c953a20dece74f78ec93a34a68
+
+ # Ensure noexecstack
+ git cherry-pick -n 46509b6dd28c58ae 17c2a1cb4ea2093d
+ git apply -3 ../0001-demos-Make-our-stack-noexec.patch
+}
+
+build() {
+ CFLAGS+=" -DG_DISABLE_CAST_CHECKS"
+ local meson_options=(
+ -D broadway-backend=true
+ -D cloudproviders=enabled
+ -D tracker=enabled
+ -D colord=enabled
+ -D gtk_doc=true
+ -D man-pages=true
+ )
+
+ arch-meson gtk build "${meson_options[@]}"
+ meson compile -C build
+}
+
+check() (
+ export XDG_RUNTIME_DIR="$PWD/runtime-dir" WAYLAND_DISPLAY=wayland-5
+
+ mkdir -p -m 700 "$XDG_RUNTIME_DIR"
+ weston --backend=headless-backend.so --socket=$WAYLAND_DISPLAY --idle-time=0 &
+ _w=$!
+
+ trap "kill $_w; wait" EXIT
+
+ meson test -C build --print-errorlogs
+)
+
+_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_gtk4() {
+ depends+=(gtk-update-icon-cache)
+ provides=(libgtk-4.so)
+
+ meson install -C build --destdir "$pkgdir"
+
+ install -Dm644 /dev/stdin "$pkgdir/usr/share/gtk-4.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 gtk4-querymodules.hook
+
+ cd "$pkgdir"
+
+ _pick guic usr/bin/gtk4-update-icon-cache
+ _pick guic usr/share/man/man1/gtk4-update-icon-cache.1
+
+ _pick docs usr/share/doc
+
+ _pick demo usr/bin/gtk4-{demo,demo-application,icon-browser,print-editor,widget-factory}
+ _pick demo usr/share/applications/org.gtk.{Demo,IconBrowser,PrintEditor,WidgetFactory}4.desktop
+ _pick demo usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
+ _pick demo usr/share/icons/hicolor/*/apps/org.gtk.{Demo,IconBrowser,PrintEditor,WidgetFactory}4[-.]*
+ _pick demo usr/share/man/man1/gtk4-{demo,demo-application,icon-browser,widget-factory}.1
+ _pick demo usr/share/metainfo/org.gtk.{Demo,IconBrowser,PrintEditor,WidgetFactory}4.appdata.xml
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK icon cache updater"
+ depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
+
+ mv guic/* "$pkgdir"
+ ln -s gtk4-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+ ln -s gtk4-update-icon-cache.1 "$pkgdir/usr/share/man/man1/gtk-update-icon-cache.1"
+
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
+ install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+package_gtk4-docs() {
+ pkgdesc+=" (documentation)"
+ depends=()
+ mv docs/* "$pkgdir"
+}
+
+package_gtk4-demos() {
+ pkgdesc+=" (demo applications)"
+ depends=(gtk4)
+ mv demo/* "$pkgdir"
+}
+
+# vim:set sw=2 et:
Deleted: fix-resources.diff
===================================================================
--- fix-resources.diff 2022-02-03 19:42:48 UTC (rev 436130)
+++ fix-resources.diff 2022-02-03 19:42:58 UTC (rev 436131)
@@ -1,102 +0,0 @@
-diff --git i/demos/gtk-demo/meson.build w/demos/gtk-demo/meson.build
-index 5b79dfad5f..7f82c2d6d6 100644
---- i/demos/gtk-demo/meson.build
-+++ w/demos/gtk-demo/meson.build
-@@ -174,42 +174,46 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
- depfile : 'gtkdemo.gresource.d',
- command : [glib_compile_resources,
- '--generate',
-+ '--internal',
- '--target=@OUTPUT@',
- '--dependency-file=@DEPFILE@',
- '--sourcedir=' + meson.current_source_dir(),
- '--sourcedir=' + meson.current_build_dir(),
- '@INPUT@'])
-
- # Create resource data file
- gtkdemo_resources_c = custom_target('gtkdemo_resources.c',
- input : 'demo.gresource.xml',
- output : 'gtkdemo_resources.c',
- depfile : 'gtkdemo_resources.c.d',
- command : [glib_compile_resources,
- '--generate-source',
-+ '--internal',
- '--target=@OUTPUT@',
- '--dependency-file=@DEPFILE@',
- '--sourcedir=' + meson.current_source_dir(),
- '--sourcedir=' + meson.current_build_dir(),
- '--external-data',
- '--c-name', '_g_binary_gtkdemo',
- '@INPUT@'])
-
- # Create object file containing resource data
- gtkdemo_resources_binary = custom_target('gtkdemo_resources.o',
- input : gtkdemo_gresource,
- output : 'gtkdemo_resources.o',
- command : [ld,
-+ '-z', 'noexecstack',
- '-r',
- '-b','binary',
- '@INPUT@',
- '-o','@OUTPUT@'])
-
- # Rename symbol to match the one in the C file
- gtkdemo_resources_o = custom_target('gtkdemo_resources2.o',
- input : gtkdemo_resources_binary,
- output : 'gtkdemo_resources2.o',
- command : [objcopy,
-+ '--strip-all',
- '--add-symbol','_g_binary_gtkdemo_resource_data=.data:0',
- '@INPUT@',
- '@OUTPUT@'])
-diff --git i/demos/widget-factory/meson.build w/demos/widget-factory/meson.build
-index 800230b512..9a083eb1ac 100644
---- i/demos/widget-factory/meson.build
-+++ w/demos/widget-factory/meson.build
-@@ -18,42 +18,46 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
- depfile: 'widgetfactory.gresource.d',
- command : [glib_compile_resources,
- '--generate',
-+ '--internal',
- '--target=@OUTPUT@',
- '--dependency-file=@DEPFILE@',
- '--sourcedir=' + meson.current_source_dir(),
- '--sourcedir=' + meson.current_build_dir(),
- '@INPUT@'])
-
- # Create resource data file
- widgetfactory_resources_c = custom_target('widgetfactory_resources.c',
- input : 'widget-factory.gresource.xml',
- output : 'widgetfactory_resources.c',
- depfile: 'widgetfactory_resources.c.d',
- command : [glib_compile_resources,
- '--generate-source',
-+ '--internal',
- '--target=@OUTPUT@',
- '--dependency-file=@DEPFILE@',
- '--sourcedir=' + meson.current_source_dir(),
- '--sourcedir=' + meson.current_build_dir(),
- '--external-data',
- '--c-name', '_g_binary_widgetfactory',
- '@INPUT@'])
-
- # Create object file containing resource data
- widgetfactory_resources_binary = custom_target('widgetfactory_resources.o',
- input : widgetfactory_gresource,
- output : 'widgetfactory_resources.o',
- command : [ld,
-+ '-z', 'noexecstack',
- '-r',
- '-b','binary',
- '@INPUT@',
- '-o','@OUTPUT@'])
-
- # Rename symbol to match the one in the C file
- widgetfactory_resources_o = custom_target('widgetfactory_resources2.o',
- input : widgetfactory_resources_binary,
- output : 'widgetfactory_resources2.o',
- command : [objcopy,
-+ '--strip-all',
- '--add-symbol','_g_binary_widgetfactory_resource_data=.data:0',
- '@INPUT@',
- '@OUTPUT@'])
Deleted: gtk-update-icon-cache.hook
===================================================================
--- gtk-update-icon-cache.hook 2022-02-03 19:42:48 UTC (rev 436130)
+++ gtk-update-icon-cache.hook 2022-02-03 19:42:58 UTC (rev 436131)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets
Copied: gtk4/repos/extra-x86_64/gtk-update-icon-cache.hook (from rev 436130, gtk4/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook (rev 0)
+++ gtk-update-icon-cache.hook 2022-02-03 19:42:58 UTC (rev 436131)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets
Deleted: gtk-update-icon-cache.script
===================================================================
--- gtk-update-icon-cache.script 2022-02-03 19:42:48 UTC (rev 436130)
+++ gtk-update-icon-cache.script 2022-02-03 19:42:58 UTC (rev 436131)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
- if [[ -e ${f}index.theme ]]; then
- gtk-update-icon-cache -q "$f"
- elif [[ -d $f ]]; then
- rm -f "${f}icon-theme.cache"
- rmdir --ignore-fail-on-non-empty "$f"
- fi
-done
Copied: gtk4/repos/extra-x86_64/gtk-update-icon-cache.script (from rev 436130, gtk4/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script (rev 0)
+++ gtk-update-icon-cache.script 2022-02-03 19:42:58 UTC (rev 436131)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+ if [[ -e ${f}index.theme ]]; then
+ gtk-update-icon-cache -q "$f"
+ elif [[ -d $f ]]; then
+ rm -f "${f}icon-theme.cache"
+ rmdir --ignore-fail-on-non-empty "$f"
+ fi
+done
Deleted: gtk4-querymodules.hook
===================================================================
--- gtk4-querymodules.hook 2022-02-03 19:42:48 UTC (rev 436130)
+++ gtk4-querymodules.hook 2022-02-03 19:42:58 UTC (rev 436131)
@@ -1,12 +0,0 @@
-[Trigger]
-Type = Path
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-4.0/4.0.0/*/
-
-[Action]
-Description = Updating GTK4 module cache...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gio-querymodules
-NeedsTargets
Copied: gtk4/repos/extra-x86_64/gtk4-querymodules.hook (from rev 436130, gtk4/trunk/gtk4-querymodules.hook)
===================================================================
--- gtk4-querymodules.hook (rev 0)
+++ gtk4-querymodules.hook 2022-02-03 19:42:58 UTC (rev 436131)
@@ -0,0 +1,12 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-4.0/4.0.0/*/
+
+[Action]
+Description = Updating GTK4 module cache...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gio-querymodules
+NeedsTargets
More information about the arch-commits
mailing list