[arch-commits] Commit in gtkhtml/repos (3 files)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 17:08:56
  Author: jgc
Revision: 55007

Merged revisions 55005 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/gtkhtml/trunk

........
  r55005 | jgc | 2009-10-11 23:08:17 +0200 (Sun, 11 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Added:
  gtkhtml/repos/extra-i686/fix-backspace.patch
    (from rev 55005, gtkhtml/trunk/fix-backspace.patch)
Modified:
  gtkhtml/repos/extra-i686/	(properties)
  gtkhtml/repos/extra-i686/PKGBUILD

---------------------+
 PKGBUILD            |   13 ++++++++-----
 fix-backspace.patch |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 5 deletions(-)


Property changes on: gtkhtml/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gtkhtml/trunk:1-44702
   + /gtkhtml/trunk:1-55006

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-11 21:08:38 UTC (rev 55006)
+++ extra-i686/PKGBUILD	2009-10-11 21:08:56 UTC (rev 55007)
@@ -2,20 +2,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtkhtml
-pkgver=3.26.3
-pkgrel=1
+pkgver=3.28.0
+pkgrel=2
 pkgdesc="A lightweight HTML renderer/editor widget"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.24.1' 'gnome-icon-theme>=2.26.0' 'enchant>=1.4.2' 'iso-codes>=3.10.1')
+depends=('gconf>=2.28.0' 'gnome-icon-theme>=2.28.0' 'enchant>=1.4.2' 'iso-codes>=3.10.1')
 makedepends=('pkgconfig' 'intltool')
 url="http://www.gnome.org"
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.26/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9a9586fa4581ad20f273952fb70e4101')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.28/${pkgname}-${pkgver}.tar.bz2
+        fix-backspace.patch)
+sha256sums=('6290424e51770fc09701ebaf89b7089214bbb9c81223430800160beee6f42288'
+            '96cb6ff6a8c5f1dc6251444cff94434c84d6d10b1abd4b55552e94d0a339b5a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-backspace.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gtkhtml \
       --localstatedir=/var --disable-static || return 1

Copied: gtkhtml/repos/extra-i686/fix-backspace.patch (from rev 55005, gtkhtml/trunk/fix-backspace.patch)
===================================================================
--- extra-i686/fix-backspace.patch	                        (rev 0)
+++ extra-i686/fix-backspace.patch	2009-10-11 21:08:56 UTC (rev 55007)
@@ -0,0 +1,22 @@
+From 835d5dee8aaf078960b16ebd9018da095b1bcfbd Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes at redhat.com>
+Date: Mon, 21 Sep 2009 14:37:33 +0000
+Subject: Fix an editing crash.
+
+Apparently G_VALUE_HOLDS() doesn't like NULL GValues.
+---
+diff --git a/components/editor/gtkhtml-editor.c b/components/editor/gtkhtml-editor.c
+index aca15f9..58ae08f 100644
+--- a/components/editor/gtkhtml-editor.c
++++ b/components/editor/gtkhtml-editor.c
+@@ -384,7 +384,7 @@ editor_method_event (GtkHTML *html,
+ 	guint signal_id;
+ 
+ 	/* GtkHTML event arguments are either NULL or a single string. */
+-	if (G_VALUE_HOLDS (args, G_TYPE_STRING))
++	if (args != NULL && G_VALUE_HOLDS (args, G_TYPE_STRING))
+ 		string = g_value_get_string (args);
+ 
+ 	switch (event) {
+--
+cgit v0.8.2