summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Fernyhough2020-08-17 02:01:45 +0100
committerJonathon Fernyhough2020-08-17 02:01:45 +0100
commit7728511a140e52c6081804ee80408867b07efba9 (patch)
tree7f181ecd6e08416ad62569241e5559bfb81d74ad
parent0e934a35c4ee404b93660f21be74ee0ba8cf39bc (diff)
downloadaur-7728511a140e52c6081804ee80408867b07efba9.tar.gz
Upstream 3.24.22
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD10
-rw-r--r--other__hide-insert-emoji.patch4
3 files changed, 17 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 44381989e011..b88d32d94da5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gtk3-classic
pkgdesc = GTK3 patched for classic desktops like XFCE or MATE. Please see README.
- pkgver = 3.24.21
+ pkgver = 3.24.22
pkgrel = 1
url = https://github.com/lah7/gtk3-mushrooms
install = gtk3.install
@@ -58,9 +58,9 @@ pkgbase = gtk3-classic
makedepends = lib32-libcups
makedepends = lib32-krb5
makedepends = lib32-e2fsprogs
- provides = gtk3=3.24.21
- provides = gtk3-typeahead=3.24.21
- provides = gtk3-mushrooms=3.24.21
+ provides = gtk3=3.24.22
+ provides = gtk3-typeahead=3.24.22
+ provides = gtk3-mushrooms=3.24.22
provides = gtk3-print-backends
provides = libgtk-3.so
provides = libgdk-3.so
@@ -90,9 +90,9 @@ pkgbase = gtk3-classic
source = popovers__file-chooser-list.patch
source = popovers__places-sidebar.patch
source = smaller-adwaita.css
- source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.21.tar.xz
- source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=dd59624b448ca6f6e48d4f1268fd3c871a20ae76
- source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=dd59624b448ca6f6e48d4f1268fd3c871a20ae76
+ source = https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.22.tar.xz
+ source = settings.ini::https://git.archlinux.org/svntogit/packages.git/plain/trunk/settings.ini?h=packages/gtk3&id=a539a763eb4b5b7a7dfb6605c37b71a87af2666d
+ source = gtk-query-immodules-3.0.hook::https://git.archlinux.org/svntogit/packages.git/plain/trunk/gtk-query-immodules-3.0.hook?h=packages/gtk3&id=a539a763eb4b5b7a7dfb6605c37b71a87af2666d
source = README.md
sha256sums = 4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c
sha256sums = 6de32e1bee6bf4307aaec072fc8431b044e73299720a490298b8c1b7c502e039
@@ -116,7 +116,7 @@ pkgbase = gtk3-classic
sha256sums = 17aa98262b96817396c74c303c83eee2a0c9c94b10e31d8de48a44cb17b08dc1
sha256sums = af2d2d4a0d876f9abc350a1cdb09ffc016a8894ee3c46030c3d90c6e99b27c5a
sha256sums = ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31
- sha256sums = aeea6ae7cd35e83dfc7699be716519faefca346c62e784dd1a37d9df94c08f52
+ sha256sums = bf18a4a5dff28a7b02aaef1b949c2d09c96c18387eddab152bb4cd55a5b67dda
sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202
sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845
sha256sums = 1d2e3c41c7de03a31d717b09e053c88cbaca2ae74eefd982549c49de81c21ada
@@ -173,7 +173,7 @@ pkgname = lib32-gtk3-classic
depends = lib32-libcups
depends = lib32-krb5
depends = lib32-e2fsprogs
- depends = gtk3-classic>=3.24.21
- provides = lib32-gtk3=3.24.21
+ depends = gtk3-classic>=3.24.22
+ provides = lib32-gtk3=3.24.22
conflicts = lib32-gtk3
diff --git a/PKGBUILD b/PKGBUILD
index 577568e6fabb..6b8b0034fabb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
# This file is based on original PKGBUILD of GTK3 package.
# https://git.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/gtk3
-__arch_pkg_commit="dd59624b448ca6f6e48d4f1268fd3c871a20ae76"
-_gtkver=3.24.21
+__arch_pkg_commit="a539a763eb4b5b7a7dfb6605c37b71a87af2666d"
+_gtkver=3.24.22
pkgbase=gtk3-classic
pkgname=($pkgbase lib32-$pkgbase)
@@ -85,15 +85,15 @@ sha256sums=('4935ec23cbd0150bd479fc457861d3a665354509c3ff933997827c7141c8657c'
'7157b665e2ae724bb6abe8fc382d7178dc4d8d00f29bc63ed2942307ff41914b'
'2b10b436ebcf8c124fac6e7867f0bf0573ecfb70130893fea37724c5f6719caf'
'eba56921250bbf6767dab9de219bf81763ed7891014d76c3a1fe6c82c32b7359'
- '570b2d6ada08c007ba3771a86863ea438cbc03e78997773782c742cacbe7fd8b'
+ '974374f2799aaa48b9ded985c47d2dda45d2fcdcd63f1749e74b243279467d49'
'9761a289cf93558ec67bb498b765ccb757027b10071da938ff14fca695a0103d'
'bf0e188ba6cfb24b506e4eab7e62a020348cce307d4eecde571227a058c441ad'
'17aa98262b96817396c74c303c83eee2a0c9c94b10e31d8de48a44cb17b08dc1'
'af2d2d4a0d876f9abc350a1cdb09ffc016a8894ee3c46030c3d90c6e99b27c5a'
'ba93f62e249f2713dbfe6c82de1be4ac655264d6407ed3dc5e05323027520f31'
- 'aeea6ae7cd35e83dfc7699be716519faefca346c62e784dd1a37d9df94c08f52'
+ 'bf18a4a5dff28a7b02aaef1b949c2d09c96c18387eddab152bb4cd55a5b67dda'
'01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ 'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
'1d2e3c41c7de03a31d717b09e053c88cbaca2ae74eefd982549c49de81c21ada')
prepare()
diff --git a/other__hide-insert-emoji.patch b/other__hide-insert-emoji.patch
index 98068a5a3dd5..4d6590623c1d 100644
--- a/other__hide-insert-emoji.patch
+++ b/other__hide-insert-emoji.patch
@@ -2,7 +2,7 @@ Index: b/gtk/gtkentry.c
===================================================================
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
-@@ -9626,7 +9626,8 @@ popup_targets_received (GtkClipboard
+@@ -9627,7 +9627,8 @@ popup_targets_received (GtkClipboard
g_signal_connect_swapped (menuitem, "activate",
G_CALLBACK (gtk_entry_insert_emoji), entry);
gtk_widget_show (menuitem);
@@ -16,7 +16,7 @@ Index: b/gtk/gtktextview.c
===================================================================
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
-@@ -9537,7 +9537,8 @@ popup_targets_received (GtkClipboard
+@@ -9555,7 +9555,8 @@ popup_targets_received (GtkClipboard
g_signal_connect_swapped (menuitem, "activate",
G_CALLBACK (gtk_text_view_insert_emoji), text_view);
gtk_widget_show (menuitem);