Date: Tuesday, January 30, 2018 @ 10:04:04 Author: heftig Revision: 315611
3.22.26+161+g60750b3ffd-1 Modified: gtk3/trunk/PKGBUILD Deleted: gtk3/trunk/0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch -----------------------------------------------------------------+ 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch | 38 ---------- PKGBUILD | 14 +-- 2 files changed, 4 insertions(+), 48 deletions(-) Deleted: 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch =================================================================== --- 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch 2018-01-30 09:35:21 UTC (rev 315610) +++ 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch 2018-01-30 10:04:04 UTC (rev 315611) @@ -1,38 +0,0 @@ -From 9577618e2ae679988231cfa2162eb48cdb6ce5a0 Mon Sep 17 00:00:00 2001 -Message-Id: <9577618e2ae679988231cfa2162eb48cdb6ce5a0.1511732020.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <[email protected]> -Date: Sun, 26 Nov 2017 22:32:36 +0100 -Subject: [PATCH] entry: Undo ABI breakage from addition of insert_emoji - ---- - gtk/gtkentry.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h -index 073e703d0deea6a6..0372752f2963c940 100644 ---- a/gtk/gtkentry.h -+++ b/gtk/gtkentry.h -@@ -146,19 +146,19 @@ struct _GtkEntryClass - void (* copy_clipboard) (GtkEntry *entry); - void (* paste_clipboard) (GtkEntry *entry); - void (* toggle_overwrite) (GtkEntry *entry); -- void (* insert_emoji) (GtkEntry *entry); - - /* hooks to add other objects beside the entry (like in GtkSpinButton) */ - void (* get_text_area_size) (GtkEntry *entry, - gint *x, - gint *y, - gint *width, - gint *height); - void (* get_frame_size) (GtkEntry *entry, - gint *x, - gint *y, - gint *width, - gint *height); -+ void (* insert_emoji) (GtkEntry *entry); - - /*< private >*/ - --- -2.15.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-01-30 09:35:21 UTC (rev 315610) +++ PKGBUILD 2018-01-30 10:04:04 UTC (rev 315611) @@ -4,8 +4,8 @@ pkgbase=gtk3 pkgname=(gtk3 gtk-update-icon-cache) -pkgver=3.22.26+47+g3a1a7135a2 -pkgrel=3 +pkgver=3.22.26+161+g60750b3ffd +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit" arch=(x86_64) url="http://www.gtk.org/"; @@ -15,15 +15,13 @@ cantarell-fonts colord rest libcups libcanberra) makedepends=(gobject-introspection gtk-doc git glib2-docs sassc) license=(LGPL) -_commit=3a1a7135a276f2b6336c7566f6342da739a41d39 # gtk-3-22 +_commit=60750b3ffda1c27f47cdcd7dc97f863e08391b32 # gtk-3-22 source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"; - 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch settings.ini gtk-query-immodules-3.0.hook gtk-update-icon-cache.hook gtk-update-icon-cache.script) sha256sums=('SKIP' - '3a52d723db863564bea9245d5f65b1dc5c3ca20ee190fca249eb8bd8fdbc5c0b' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308' @@ -36,10 +34,6 @@ prepare() { cd gtk+ - - # https://bugs.archlinux.org/task/56474 - patch -Np1 -i ../0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch - NOCONFIGURE=1 ./autogen.sh } @@ -80,7 +74,7 @@ package_gtk-update-icon-cache() { pkgdesc="GTK+ icon cache updater" - depends=(gdk-pixbuf2 hicolor-icon-theme) + depends=(gdk-pixbuf2 librsvg hicolor-icon-theme) cd gtk+ install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
