diff --git a/gtk3/PKGBUILD b/gtk3/PKGBUILD index edc1841..8182476 100644 --- a/gtk3/PKGBUILD +++ b/gtk3/PKGBUILD @@ -8,16 +8,11 @@ #pkgbase=gtk3 pkgname=gtk3 # gtk3-docs gtk3-demos) pkgver=3.24.35 -pkgrel=01 +pkgrel=02 epoch=1 pkgdesc="GObject-based multi-platform GUI toolkit" arch=(x86_64) url="https://www.gtk.org/" -#depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 -# dconf libxcomposite libxdamage pango shared-mime-info at-spi2-core -# wayland libxkbcommon adwaita-icon-theme librsvg -# desktop-file-utils mesa cantarell-fonts libcolord libcups -# fribidi iso-codes libcloudproviders tracker3 gtk-update-icon-cache) 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 @@ -37,6 +32,7 @@ pkgver() { git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' } +# previous version patch -- see bottom of file for current Arch patch for gnome #prepare() { # cd gtk # @@ -85,7 +81,7 @@ package_gtk3() { [Settings] gtk-icon-theme-name = Adwaita gtk-theme-name = Adwaita -gtk-font-name = Cantarell 11 +gtk-font-name = Cantarell 12 END install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook @@ -128,3 +124,32 @@ 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 670add7..03b1efe 100644 --- a/gtk3/PKGBUILD-arch +++ b/gtk3/PKGBUILD-arch @@ -4,7 +4,7 @@ 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/" @@ -65,6 +65,14 @@ 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() { diff --git a/python-setuptools/PKGBUILD b/python-setuptools/PKGBUILD index 9382d54..7ffe8e5 100644 --- a/python-setuptools/PKGBUILD +++ b/python-setuptools/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=python-setuptools -pkgver=65.6.0 +pkgver=65.6.1 pkgrel=01 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -98,11 +98,12 @@ package() { license=('PSF') -sha256sums=(6e4bbb33b306105e25f1bee570a0b0c33cee2a08d79f0fa0832aa256d293a8d3 # python-setuptools-65.6.0.tar.gz +sha256sums=(98d1df190db615b7f97c253f1f60168944a80d2126a010cf5bad2f2ed317545c # python-setuptools-65.6.1.tar.gz 06e2f68aebedbaeb0b0fe923eae686568910cc3355b33bf619db9266eef83efb # system-validate-pyproject.patch e4634a028f3741aa06ca8a5e61bb4bbc293146e943bbd8d5605c49a4d886203a) # add-dependency.patch -sha512sums=('4ee08da80b7357adfaaf37b3164ae41841ec3ed0220541f33e870f8f188e5c499e28807d864c1bca3d4257ab0bf53c7a7b09f8224133d44099c61971b36129c8' +sha512sums=('43be758bb0201d59bd8c277d5a9bc56e3ddc33ad8f24303c9854c06c50ea85efd75290770c29f8ac4f8650385c2055fcf893cabb3b106260d7efe9b1544d4ff6' '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a' '4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b') - + + diff --git a/python-setuptools/PKGBUILD-arch b/python-setuptools/PKGBUILD-arch index b87d8b5..d3616a4 100644 --- a/python-setuptools/PKGBUILD-arch +++ b/python-setuptools/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Eli Schwartz pkgname=python-setuptools -pkgver=65.6.0 +pkgver=65.6.1 pkgrel=1 epoch=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" @@ -22,7 +22,7 @@ replaces=('python-distribute') source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz" system-validate-pyproject.patch add-dependency.patch) -sha512sums=('4ee08da80b7357adfaaf37b3164ae41841ec3ed0220541f33e870f8f188e5c499e28807d864c1bca3d4257ab0bf53c7a7b09f8224133d44099c61971b36129c8' +sha512sums=('43be758bb0201d59bd8c277d5a9bc56e3ddc33ad8f24303c9854c06c50ea85efd75290770c29f8ac4f8650385c2055fcf893cabb3b106260d7efe9b1544d4ff6' '390fea2c575a0042054f51d33e629b04a48f832f0a4a2dd07d34e23cdf330c382dba0f54bfb7c8a6a253bb248a4940f2a789672f715e4dc2aeb395fa185cae7a' '4277c983f17db19b0e499ceff7b6e24aad4f7956ec282bb7f5148f6f44e4e35077bfdfa219cbc04f49f37d0b9dc9c3e3075db7a36dbdc30944e1bd28efad0e0b')