[arch-commits] Commit in gtk4/repos/extra-x86_64 (8 files)

Jan Steffens heftig at gemini.archlinux.org
Sun Apr 10 11:47:30 UTC 2022


    Date: Sunday, April 10, 2022 @ 11:47:29
  Author: heftig
Revision: 442264

archrelease: copy trunk to extra-x86_64

Added:
  gtk4/repos/extra-x86_64/PKGBUILD
    (from rev 442263, gtk4/trunk/PKGBUILD)
  gtk4/repos/extra-x86_64/gtk-update-icon-cache.hook
    (from rev 442263, gtk4/trunk/gtk-update-icon-cache.hook)
  gtk4/repos/extra-x86_64/gtk-update-icon-cache.script
    (from rev 442263, gtk4/trunk/gtk-update-icon-cache.script)
  gtk4/repos/extra-x86_64/gtk4-querymodules.hook
    (from rev 442263, gtk4/trunk/gtk4-querymodules.hook)
Deleted:
  gtk4/repos/extra-x86_64/PKGBUILD
  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

------------------------------+
 PKGBUILD                     |  265 ++++++++++++++++++++---------------------
 gtk-update-icon-cache.hook   |   26 ++--
 gtk-update-icon-cache.script |   20 +--
 gtk4-querymodules.hook       |   24 +--
 4 files changed, 169 insertions(+), 166 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-10 11:46:21 UTC (rev 442263)
+++ PKGBUILD	2022-04-10 11:47:29 UTC (rev 442264)
@@ -1,131 +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.2
-pkgrel=1
-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)
-options=(debug)
-_commit=aec7ca82007dbe07faee6be084d20758ebac2b91  # tags/4.6.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
-        gtk-update-icon-cache.{hook,script} gtk4-querymodules.hook)
-sha256sums=('SKIP'
-            '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
-            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541'
-            'cd8e607eddd9941f279084e1d15309941423d26cca1897f43524a02e58e48816')
-
-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=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)
-  optdepends=('evince: Default print preview command')
-  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 442263, gtk4/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-10 11:47:29 UTC (rev 442264)
@@ -0,0 +1,134 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgbase=gtk4
+pkgname=(gtk4 gtk-update-icon-cache gtk4-docs gtk4-demos)
+pkgver=4.6.2
+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)
+options=(debug)
+_commit=aec7ca82007dbe07faee6be084d20758ebac2b91  # tags/4.6.2^0
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
+        gtk-update-icon-cache.{hook,script} gtk4-querymodules.hook)
+sha256sums=('SKIP'
+            '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
+            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541'
+            'cd8e607eddd9941f279084e1d15309941423d26cca1897f43524a02e58e48816')
+
+pkgver() {
+  cd gtk
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd gtk
+
+  # https://bugs.archlinux.org/task/74419
+  git cherry-pick -n b67da38916b710ba6eedd65ffb569a29e47ddb4d
+}
+
+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)
+  optdepends=('evince: Default print preview command')
+  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: gtk-update-icon-cache.hook
===================================================================
--- gtk-update-icon-cache.hook	2022-04-10 11:46:21 UTC (rev 442263)
+++ gtk-update-icon-cache.hook	2022-04-10 11:47:29 UTC (rev 442264)
@@ -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 442263, gtk4/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook	                        (rev 0)
+++ gtk-update-icon-cache.hook	2022-04-10 11:47:29 UTC (rev 442264)
@@ -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-04-10 11:46:21 UTC (rev 442263)
+++ gtk-update-icon-cache.script	2022-04-10 11:47:29 UTC (rev 442264)
@@ -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 442263, gtk4/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script	                        (rev 0)
+++ gtk-update-icon-cache.script	2022-04-10 11:47:29 UTC (rev 442264)
@@ -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-04-10 11:46:21 UTC (rev 442263)
+++ gtk4-querymodules.hook	2022-04-10 11:47:29 UTC (rev 442264)
@@ -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 442263, gtk4/trunk/gtk4-querymodules.hook)
===================================================================
--- gtk4-querymodules.hook	                        (rev 0)
+++ gtk4-querymodules.hook	2022-04-10 11:47:29 UTC (rev 442264)
@@ -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