From 142686f52ad1a7658a5e9a8884357723b6e16bd1 Mon Sep 17 00:00:00 2001 From: Joe Bo Run Date: Fri, 23 Dec 2022 18:34:45 +0200 Subject: [PATCH] upg bind gtk3 add gtk4 --- bind/PKGBUILD | 9 +- bind/PKGBUILD-arch | 6 +- bind/key | 3 +- bullet/PKGBUILD | 9 ++ gtk3/PKGBUILD | 79 +++++------- gtk3/PKGBUILD-arch | 61 ++++++---- gtk3/deps | 52 ++++---- gtk4/PKGBUILD | 150 +++++++++++++++++++++++ gtk4/PKGBUILD-arch | 191 ++++++++++++++++++++++++++++++ gtk4/clean | 1 + gtk4/deps | 46 +++++++ gtk4/disable-failing-test.diff | 12 ++ gtk4/gtk-update-icon-cache.hook | 13 ++ gtk4/gtk-update-icon-cache.script | 10 ++ gtk4/gtk4-querymodules.hook | 12 ++ gtk4/time | 6 + 16 files changed, 552 insertions(+), 108 deletions(-) create mode 100644 gtk4/PKGBUILD create mode 100644 gtk4/PKGBUILD-arch create mode 100644 gtk4/clean create mode 100644 gtk4/deps create mode 100644 gtk4/disable-failing-test.diff create mode 100644 gtk4/gtk-update-icon-cache.hook create mode 100644 gtk4/gtk-update-icon-cache.script create mode 100644 gtk4/gtk4-querymodules.hook create mode 100644 gtk4/time diff --git a/bind/PKGBUILD b/bind/PKGBUILD index 2bdffe3..4ff1cf6 100644 --- a/bind/PKGBUILD +++ b/bind/PKGBUILD @@ -5,7 +5,7 @@ # Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- -_pkgver=9.18.9 +_pkgver=9.18.10 pkgname=bind pkgver=${_pkgver//-/.} pkgrel=01 @@ -101,10 +101,11 @@ package() { license=('MPL2') -validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') #ISC Code Signing Key 2021 – 2022 (codesign@isc.org) +#validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') #ISC Code Signing Key 2021 – 2022 (codesign@isc.org) +validpgpkeys=('706B6C28620E76F91D11F7DF510A642A06C52CEC') #Michał Kępień (Code-Signing Key) -sha256sums=(6a9665998d568604460df0918fc8ccfad7d29388d4d842560c056cc211cbb243 # bind-9.18.9.tar.xz - 9af4db07e1c230ef9947c53a6371627fe31ecde3736f323e2e390b4fa672a774 # bind-9.18.9.tar.xz.asc +sha256sums=(f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6 # bind-9.18.10.tar.xz + b52018c9fd629a898196ebc86e86bec8f844a89ab55aabaf995d30408de67108 # bind-9.18.10.tar.xz.asc f0423c4ee8495da487e07e9144bec1d25f46a0cd2dfa7cfd7a761ef15bfefc98 # tmpfiles.conf 7c0acefcfcc3ae093550caed7ec90fe84bec8f7477459ffa7e71dda76bcbdb2c # sysusers.conf e08a01d41b18bdb771d534daca99642314939aafdb088e5cfcf0ef2d33f8e7eb # named.conf diff --git a/bind/PKGBUILD-arch b/bind/PKGBUILD-arch index 367da1c..70fe974 100644 --- a/bind/PKGBUILD-arch +++ b/bind/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: judd # Contributor: Mario Vazquez -_pkgver=9.18.9 +_pkgver=9.18.10 pkgname=bind pkgver=${_pkgver//-/.} pkgrel=1 @@ -26,7 +26,7 @@ backup=('etc/named.conf' 'var/named/localhost.zone' 'var/named/localhost.ip6.zone') install=bind.install -validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') #ISC Code Signing Key 2021 – 2022 (codesign@isc.org) +validpgpkeys=('706B6C28620E76F91D11F7DF510A642A06C52CEC') #Michał Kępień (Code-Signing Key) source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.xz"{,.asc} 'tmpfiles.conf' 'sysusers.conf' @@ -35,7 +35,7 @@ source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.xz"{,.asc} 'localhost.zone' 'localhost.ip6.zone' '127.0.0.zone') -sha256sums=('6a9665998d568604460df0918fc8ccfad7d29388d4d842560c056cc211cbb243' +sha256sums=('f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6' 'SKIP' 'f0423c4ee8495da487e07e9144bec1d25f46a0cd2dfa7cfd7a761ef15bfefc98' '7c0acefcfcc3ae093550caed7ec90fe84bec8f7477459ffa7e71dda76bcbdb2c' diff --git a/bind/key b/bind/key index 3857957..bca3efb 100644 --- a/bind/key +++ b/bind/key @@ -1 +1,2 @@ -gpg -v --recv-key 750F3C87723E4012 +#gpg -v --recv-key 750F3C87723E4012 +gpg -v --recv-key 510A642A06C52CEC diff --git a/bullet/PKGBUILD b/bullet/PKGBUILD index e8ee7dc..7f20e71 100644 --- a/bullet/PKGBUILD +++ b/bullet/PKGBUILD @@ -137,3 +137,12 @@ sha256sums=(6b1e987d6f8156fa8a6468652f4eaad17b3e11252c9870359e5bca693e35780b # b 68ca940af489f7e9718fe9199cf0c3428c8e4d2b4ae1576847fffe56c0da50f7) # bullet3_examplebrowser.sh + + +####### diffs between old and new Arch PKGBUILD + + + + +#### systemd crap in new PKGBUILD +scan for systemd ipv6 service & socket diff --git a/gtk3/PKGBUILD b/gtk3/PKGBUILD index 0e74618..b3bbacf 100644 --- a/gtk3/PKGBUILD +++ b/gtk3/PKGBUILD @@ -7,23 +7,25 @@ #pkgbase=gtk3 pkgname=gtk3 # gtk3-docs gtk3-demos) -pkgver=3.24.35 -pkgrel=02 +pkgver=3.24.36 +pkgrel=01 epoch=1 pkgdesc="GObject-based multi-platform GUI toolkit" -arch=(x86_64) url="https://www.gtk.org/" -depends=(adwaita-icon-theme at-spi2-atk atk cairo cantarell-fonts dconf - desktop-file-utils fribidi gdk-pixbuf2 gtk-update-icon-cache - iso-codes libcloudproviders libcolord libcups libepoxy librsvg - libxcomposite libxcursor libxdamage libxi libxinerama - libxkbcommon libxrandr mesa pango shared-mime-info tracker3 +arch=(x86_64) +depends=(adwaita-icon-theme atk cairo cantarell-fonts dconf + desktop-file-utils fontconfig fribidi + gdk-pixbuf2 glib2 harfbuzz + iso-codes libcloudproviders libcolord libcups + libegl libepoxy libgl +librsvg + libxcomposite libx11 libxcursor libxdamage libxfixes libxi libxinerama + libxkbcommon libxrandr pango shared-mime-info tracker3 wayland) makedepends=(git glib2-docs gobject-introspection gtk-doc meson sassc wayland-protocols) #options=(debug) # uncomment to produce the gtk3-debug pkg -optdepends=('evince: Default print preview command') -_commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119 # tags/3.24.35^0 +_commit=35516a5e866cd77390eb71d72d5b67f45dc4302c # tags/3.24.36^0 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" gtk-query-immodules-3.0.hook) @@ -47,7 +49,7 @@ build() { -D broadway_backend=true -D cloudproviders=true -D colord=yes - -D gtk_doc=true + -D gtk_doc=false -D introspection=true -D man=true -D tracker3=true @@ -68,9 +70,12 @@ _pick() { done } -package_gtk3() { +#package_gtk3() { +package() { + depends+=(gtk-update-icon-cache) + optdepends=('evince: Default print preview command') - provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so) + provides=(gtk3-print-backends libgailutil-3.so libgdk-3.so libgtk-3.so) conflicts=(gtk3-print-backends) replaces=("gtk3-print-backends<=3.22.26-1") install=gtk3.install @@ -81,27 +86,29 @@ package_gtk3() { [Settings] gtk-icon-theme-name = Adwaita gtk-theme-name = Adwaita -gtk-font-name = Cantarell 12 +gtk-font-name = Cantarell 13 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 + +# _pick docs usr/share/gtk-doc + + # Built by GTK 4, shared with GTK 3 + rm usr/bin/gtk-update-icon-cache + rm usr/share/man/man1/gtk-update-icon-cache.1 } ######### -# To make the following pkgs uncomment the pkgbase and pkgnames and the following two sections +# - To make the following pkgs uncomment the pkgbase and pkgnames and the following two sections +# # # #package_gtk3-docs() { @@ -123,34 +130,6 @@ license=(LGPL) sha256sums=(SKIP a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229) # gtk-query-immodules-3.0.hook - - -# Total waste of time and resources to add a patch to benefit Gnome users alone # -# Joborun maintains little sympathy to anyone choosing Gnome as an environment # -####### diffs between pkgrel 1 and 2 PKGBUILD -# -# pkgbase=gtk3 -# pkgname=(gtk3 gtk3-docs gtk3-demos) -# pkgver=3.24.35 -#-pkgrel=1 -#+pkgrel=2 -# epoch=1 -# pkgdesc="GObject-based multi-platform GUI toolkit" -# url="https://www.gtk.org/" -# -# prepare() { -# cd gtk -#+ -#+ # Crash in gnome-screenshot -#+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/4456 -#+ git cherry-pick -n e413f5c43259a22269aa1e75767dd545e10119b5 -#+ -#+ # https://bugs.archlinux.org/task/76651 -#+ # https://gitlab.gnome.org/GNOME/gtk/-/issues/5365 -#+ git cherry-pick -n 3f1536632f682c355d0c3abe1afc80cf975c2cce -# } -# -# build() { -# - + + diff --git a/gtk3/PKGBUILD-arch b/gtk3/PKGBUILD-arch index 03b1efe..b652b4d 100644 --- a/gtk3/PKGBUILD-arch +++ b/gtk3/PKGBUILD-arch @@ -2,9 +2,13 @@ # Contributor: Ionut Biru pkgbase=gtk3 -pkgname=(gtk3 gtk3-docs gtk3-demos) -pkgver=3.24.35 -pkgrel=2 +pkgname=( + gtk3 + gtk3-demos + gtk3-docs +) +pkgver=3.24.36 +pkgrel=1 epoch=1 pkgdesc="GObject-based multi-platform GUI toolkit" url="https://www.gtk.org/" @@ -12,29 +16,35 @@ arch=(x86_64) license=(LGPL) depends=( adwaita-icon-theme - at-spi2-atk atk cairo cantarell-fonts dconf desktop-file-utils + fontconfig fribidi gdk-pixbuf2 - gtk-update-icon-cache + glib2 + harfbuzz iso-codes libcloudproviders libcolord libcups + libegl libepoxy + libgl librsvg libxcomposite + libx11 libxcursor libxdamage + libxext + libxfixes libxi libxinerama libxkbcommon libxrandr - mesa + libxrender pango shared-mime-info tracker3 @@ -50,7 +60,7 @@ makedepends=( wayland-protocols ) options=(debug) -_commit=14cf55f98ddd71ad3f91487eda1c7f14d67de119 # tags/3.24.35^0 +_commit=35516a5e866cd77390eb71d72d5b67f45dc4302c # tags/3.24.36^0 source=( "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" gtk-query-immodules-3.0.hook @@ -65,14 +75,6 @@ pkgver() { prepare() { cd gtk - - # Crash in gnome-screenshot - # https://gitlab.gnome.org/GNOME/gtk/-/issues/4456 - git cherry-pick -n e413f5c43259a22269aa1e75767dd545e10119b5 - - # https://bugs.archlinux.org/task/76651 - # https://gitlab.gnome.org/GNOME/gtk/-/issues/5365 - git cherry-pick -n 3f1536632f682c355d0c3abe1afc80cf975c2cce } build() { @@ -102,8 +104,14 @@ _pick() { } package_gtk3() { + depends+=(gtk-update-icon-cache) optdepends=('evince: Default print preview command') - provides=(gtk3-print-backends libgtk-3.so libgdk-3.so libgailutil-3.so) + provides=( + gtk3-print-backends + libgailutil-3.so + libgdk-3.so + libgtk-3.so + ) conflicts=(gtk3-print-backends) replaces=("gtk3-print-backends<=3.22.26-1") install=gtk3.install @@ -121,22 +129,17 @@ END 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" + _pick docs usr/share/gtk-doc + + # Built by GTK 4, shared with GTK 3 + rm usr/bin/gtk-update-icon-cache + rm usr/share/man/man1/gtk-update-icon-cache.1 } package_gtk3-demos() { @@ -145,4 +148,10 @@ package_gtk3-demos() { mv demo/* "$pkgdir" } +package_gtk3-docs() { + pkgdesc+=" (documentation)" + depends=() + mv docs/* "$pkgdir" +} + # vim:set sw=2 sts=-1 et: diff --git a/gtk3/deps b/gtk3/deps index bdc55fd..b1034a2 100644 --- a/gtk3/deps +++ b/gtk3/deps @@ -1,37 +1,41 @@ -at-spi2-core -cairo -libxcursor -libxinerama -libxrandr -libxi -libepoxy -gdk-pixbuf2 -dconf -libxcomposite -libxdamage -pango -shared-mime-info -wayland -libxkbcommon -adwaita-icon-theme -librsvg -desktop-file-utils mesa +at-spi2-core +adwaita-icon-theme +cairo cantarell-fonts -libcolord -libcups +dconf +desktop-file-utils +fontconfig fribidi +gdk-pixbuf2 +harfbuzz iso-codes libcloudproviders +libcolord +libcups +libepoxy +librsvg +libxcomposite +libx11 +libxcursor +libxdamage +libxfixes +libxi +libxinerama +libxkbcommon +libxrandr +pango +shared-mime-info tracker3 -gtk-update-icon-cache -gobject-introspection -gtk-doc +wayland git glib2-docs -sassc +gobject-introspection +gtk-doc meson +sassc wayland-protocols gettext +libglvnd diff --git a/gtk4/PKGBUILD b/gtk4/PKGBUILD new file mode 100644 index 0000000..d6b2f97 --- /dev/null +++ b/gtk4/PKGBUILD @@ -0,0 +1,150 @@ +#!/usr/bin/bash +# JOBoRun : Jwm OpenBox Obarun RUNit +# Maintainer : Joe Bo Run +# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu +#-----------------------------------------| DESCRIPTION |--------------------------------------- + +#pkgbase=gtk4 +pkgname=(gtk4) +pkgver=4.8.3 +pkgrel=01 +epoch=1 +pkgdesc="GObject-based multi-platform GUI toolkit" +url="https://www.gtk.org/" +arch=(x86_64) +depends=(adwaita-icon-theme cairo cantarell-fonts dconf desktop-file-utils fontconfig + fribidi gdk-pixbuf2 glib2 graphene gst-plugins-bad-libs harfbuzz iso-codes + libcloudproviders libcolord libcups libegl libepoxy libgl libjpeg libpng + librsvg libtiff libx11 libxcursor libxdamage libxext libxfixes libxi + libxinerama libxkbcommon libxrandr libxrender pango shared-mime-info + tracker3 wayland) +makedepends=(docbook-xsl gi-docgen git gobject-introspection meson python-docutils + python-gobject sassc shaderc wayland-protocols) +checkdepends=(weston) +# options=(debug) ## uncomment this for the debug pkg +_commit=793831af8a224545495f0c56a184f4ee28e5cc55 # tags/4.8.3^0 +source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" + gtk-update-icon-cache.{hook,script} + gtk4-querymodules.hook + disable-failing-test.diff) + +pkgver() { + cd gtk + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' +} + +prepare() { + cd gtk + + # Disable unaligned-offscreen tests, minimal differences (1 gray level, so + # rounding error?) in a few pixels of anti-aliased text makes them fail + git apply -3 ../disable-failing-test.diff +} + +build() { + local meson_options=( + -D broadway-backend=true + -D cloudproviders=enabled + -D colord=enabled + -D gtk_doc=false + -D man-pages=true + -D tracker=enabled + ) + + CFLAGS+=" -DG_DISABLE_CAST_CHECKS" + 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() { +package() { + 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" < + +pkgbase=gtk4 +pkgname=( + gtk4 + gtk4-demos + gtk4-docs + gtk-update-icon-cache +) +pkgver=4.8.3 +pkgrel=1 +epoch=1 +pkgdesc="GObject-based multi-platform GUI toolkit" +url="https://www.gtk.org/" +arch=(x86_64) +license=(LGPL) +depends=( + adwaita-icon-theme + cairo + cantarell-fonts + dconf + desktop-file-utils + fontconfig + fribidi + gdk-pixbuf2 + glib2 + graphene + gst-plugins-bad-libs + harfbuzz + iso-codes + libcloudproviders + libcolord + libcups + libegl + libepoxy + libgl + libjpeg + libpng + librsvg + libtiff + libx11 + libxcursor + libxdamage + libxext + libxfixes + libxi + libxinerama + libxkbcommon + libxrandr + libxrender + pango + shared-mime-info + tracker3 + wayland +) +makedepends=( + docbook-xsl + gi-docgen + git + gobject-introspection + meson + python-docutils + python-gobject + sassc + shaderc + wayland-protocols +) +checkdepends=(weston) +options=(debug) +_commit=793831af8a224545495f0c56a184f4ee28e5cc55 # tags/4.8.3^0 +source=( + "git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" + gtk-update-icon-cache.{hook,script} + gtk4-querymodules.hook + disable-failing-test.diff +) +sha256sums=('SKIP' + '2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8' + 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541' + 'cd8e607eddd9941f279084e1d15309941423d26cca1897f43524a02e58e48816' + '657ca310dd85277be6e3e0faf4f3c54a1d66f6b0badf3624089da21653b8bf17') + +pkgver() { + cd gtk + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' +} + +prepare() { + cd gtk + + # Disable unaligned-offscreen tests, minimal differences (1 gray level, so + # rounding error?) in a few pixels of anti-aliased text makes them fail + git apply -3 ../disable-failing-test.diff +} + +build() { + local meson_options=( + -D broadway-backend=true + -D cloudproviders=enabled + -D colord=enabled + -D gtk_doc=true + -D man-pages=true + -D tracker=enabled + ) + + CFLAGS+=" -DG_DISABLE_CAST_CHECKS" + 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" <