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

[Jan de Groot]

    Date: Wednesday, October 21, 2009 @ 14:42:15
  Author: jgc
Revision: 56367

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

........
  r56058 | jgc | 2009-10-18 20:40:15 +0200 (Sun, 18 Oct 2009) | 2 lines
  
  upgpkg: gtkhtml 3.28.1-1
      Update to 3.28.1 - remove upstream applied patch
........

Modified:
  gtkhtml/repos/extra-i686/	(properties)
  gtkhtml/repos/extra-i686/PKGBUILD
Deleted:
  gtkhtml/repos/extra-i686/fix-backspace.patch

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


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-21 18:39:33 UTC (rev 56366)
+++ extra-i686/PKGBUILD	2009-10-21 18:42:15 UTC (rev 56367)
@@ -2,23 +2,20 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gtkhtml
-pkgver=3.28.0
-pkgrel=2
+pkgver=3.28.1
+pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gconf>=2.28.0' 'gnome-icon-theme>=2.28.0' 'enchant>=1.4.2' 'iso-codes>=3.10.1')
+depends=('gconf>=2.28.0' 'gnome-icon-theme>=2.28.0' 'enchant>=1.5.0' '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.28/${pkgname}-${pkgver}.tar.bz2
-        fix-backspace.patch)
-sha256sums=('6290424e51770fc09701ebaf89b7089214bbb9c81223430800160beee6f42288'
-            '96cb6ff6a8c5f1dc6251444cff94434c84d6d10b1abd4b55552e94d0a339b5a5')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.28/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('7a39302134b405c2427b0b43afc06b6168074bfbd24bd4a9600d19fbc9aea084')
 
 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

Deleted: extra-i686/fix-backspace.patch
===================================================================
--- extra-i686/fix-backspace.patch	2009-10-21 18:39:33 UTC (rev 56366)
+++ extra-i686/fix-backspace.patch	2009-10-21 18:42:15 UTC (rev 56367)
@@ -1,22 +0,0 @@
-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