diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch | 38 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
3 files changed, 13 insertions, 56 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jan 5 20:05:17 UTC 2018 +# Tue Mar 27 05:47:39 UTC 2018 pkgbase = gtk3-typeahead pkgdesc = GTK+ 3 with typeahead feature enabled for the file chooser widget - pkgver = 3.22.26+47+g3a1a7135a2 + pkgver = 3.22.29+4+gb485cf91b5 pkgrel = 1 url = http://www.gtk.org/ install = gtk3.install @@ -40,17 +40,16 @@ pkgbase = gtk3-typeahead depends = rest depends = libcups depends = libcanberra - provides = gtk3=3.22.26+47+g3a1a7135a2 + depends = libcloudproviders + provides = gtk3=3.22.29+4+gb485cf91b5 provides = gtk3-print-backends conflicts = gtk3 replaces = gtk3-print-backends<=3.22.26-1 - source = git://git.gnome.org/gtk+#commit=3a1a7135a276f2b6336c7566f6342da739a41d39 - source = 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch + source = git+https://gitlab.gnome.org/GNOME/gtk.git#commit=b485cf91b53cd21fad8b4ff35fef53e4d1a9f009 source = settings.ini source = gtk-query-immodules-3.0.hook source = typeahead.patch sha256sums = SKIP - sha256sums = 3a52d723db863564bea9245d5f65b1dc5c3ca20ee190fca249eb8bd8fdbc5c0b sha256sums = 01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202 sha256sums = de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845 sha256sums = 5006fa1dcea9aa74766196ec5c18e5172d7287195c2a49ffcd0adc13bc6e62c1 diff --git a/0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch b/0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch deleted file mode 100644 index 7df88c44617c..000000000000 --- a/0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9577618e2ae679988231cfa2162eb48cdb6ce5a0 Mon Sep 17 00:00:00 2001 -Message-Id: <9577618e2ae679988231cfa2162eb48cdb6ce5a0.1511732020.git.jan.steffens@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -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 - @@ -1,7 +1,7 @@ # Maintainer: twilinx <twilinx@mesecons.net> pkgname=gtk3-typeahead -pkgver=3.22.26+47+g3a1a7135a2 +pkgver=3.22.29+4+gb485cf91b5 pkgrel=1 conflicts=(gtk3) provides=("gtk3=$pkgver" gtk3-print-backends) @@ -13,40 +13,36 @@ install=gtk3.install depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa - cantarell-fonts colord rest libcups libcanberra) + cantarell-fonts colord rest libcups libcanberra libcloudproviders) makedepends=(gobject-introspection gtk-doc git glib2-docs sassc) license=(LGPL) -_commit=3a1a7135a276f2b6336c7566f6342da739a41d39 # gtk-3-22 -source=("git://git.gnome.org/gtk+#commit=$_commit" - 0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch +_commit=b485cf91b53cd21fad8b4ff35fef53e4d1a9f009 # gtk-3-22 +source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit" settings.ini gtk-query-immodules-3.0.hook typeahead.patch) sha256sums=('SKIP' - '3a52d723db863564bea9245d5f65b1dc5c3ca20ee190fca249eb8bd8fdbc5c0b' '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845' '5006fa1dcea9aa74766196ec5c18e5172d7287195c2a49ffcd0adc13bc6e62c1') prepare() { - cd gtk+ + cd gtk # Typeahead-specific changes patch gtk/gtkfilechooserwidget.c -i $srcdir/typeahead.patch - # https://bugs.archlinux.org/task/56474 - patch -Np1 -i ../0001-entry-Undo-ABI-breakage-from-addition-of-insert_emoj.patch - NOCONFIGURE=1 ./autogen.sh } build() { - cd gtk+ + cd gtk CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-schemas-compile \ + --enable-cloudproviders \ --enable-x11-backend \ --enable-broadway-backend \ --enable-wayland-backend \ @@ -61,7 +57,7 @@ build() { package() { install=gtk3.install - cd gtk+ + cd gtk make DESTDIR="$pkgdir" install install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini" install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook" |