diff options
Diffstat (limited to 'extra/gtkhtml4')
| -rw-r--r-- | extra/gtkhtml4/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch | 35 |
2 files changed, 3 insertions, 38 deletions
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index d04173aa9..b9b8c25df 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175194 2013-01-16 11:05:56Z jgc $ +# $Id: PKGBUILD 178231 2013-02-18 16:07:47Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.2 +pkgver=4.6.4 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('d0578892a5755f3ab661f0312d1a1376f4926afe72e65d83b6890011bc1f9fd7') +sha256sums=('8c75278a4382150ae2d6e477cbcebf541367be05176edd05669f046e24736a0d') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch b/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch deleted file mode 100644 index 06bce4a0f..000000000 --- a/extra/gtkhtml4/fix-selection-behaviour-in-iframe.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9ec36544203d4c1b98aa843c2c3ff0a4f725da68 Mon Sep 17 00:00:00 2001 -From: Sam Thursfield <sam.thursfield@codethink.co.uk> -Date: Thu, 03 May 2012 19:04:20 +0000 -Subject: Bug 672582 - Fix selection behavior inside <iframe> - -Since kinetic scrolling was introduced in Gtk+, GtkScrolledWindow -has had its own GdkWindow. This means we need to use the allocation -of the GtkScrolledWindow rather than its child GtkHTML widget when we -want to translate pointer coordinates relative to the iframe, because -a widget's GtkAllocation is relative to the parent GdkWindow. - -(cherry picked from commit 7b7b37745d2f46914be314e4d7aef7a575529345) ---- -diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c -index 697b16e..6284855 100644 ---- a/gtkhtml/gtkhtml.c -+++ b/gtkhtml/gtkhtml.c -@@ -1823,9 +1823,14 @@ shift_to_iframe_parent (GtkWidget *widget, - gint *y) - { - while (GTK_HTML (widget)->iframe_parent) { -+ GtkWidget *scrolled_window; - GtkAllocation allocation; - -- gtk_widget_get_allocation (widget, &allocation); -+ scrolled_window = gtk_widget_get_parent (widget); -+ -+ g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (scrolled_window), widget); -+ -+ gtk_widget_get_allocation (scrolled_window, &allocation); - - if (x) - *x += allocation.x - GTK_HTML (widget)->engine->x_offset; --- -cgit v0.9.0.2 |