Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=e29a22b63d7beedf1a97c25680b049b89dff026d
commit e29a22b63d7beedf1a97c25680b049b89dff026d
Author: bouleetbil
Date: Tue Sep 28 22:29:51 2010 +
gtkhtml-3.32.0-1-i686
*version bump
diff --git a/source/gnome/gtkhtml/FrugalBuild b/source/gnome/gtkhtml/FrugalBuild
index 90164c9..f2c8132 100644
--- a/source/gnome/gtkhtml/FrugalBuild
+++ b/source/gnome/gtkhtml/FrugalBuild
@@ -2,19 +2,17 @@
# Maintainer: bouleetbil
pkgname=gtkhtml
-pkgver=3.31.92
+pkgver=3.32.0
pkgrel=1
pkgdesc="A lightweight HTML rendering/printing/editing engine"
depends=('libgnomeui>=2.24.0' 'gtk+2' \
- 'libsoup>=2.31.92' 'gnome-icon-theme>=2.30.0' \
- 'libbonobo>=2.31.91' 'enchant' 'iso-codes')
+ 'libsoup>=2.32.0' 'gnome-icon-theme>=2.30.0' \
+ 'libbonobo>=2.32.0' 'enchant' 'iso-codes')
makedepends=('intltool')
groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64' 'ppc')
Finclude gnome
-source=($source gdk_fix.diff)
-sha1sums=('2e1139381ba0977d8cbbe448c06080300c482b1c' \
- '035f1c9a67b8adbb91a7094af275c6ed992967c0')
+sha1sums=('0f011a8b201fbef01c0959a929bade27a3ed4bcb')
replaces=('gtkhtml312')
provides=('gtkhtml312')
# TODO : switch to gtk3
diff --git a/source/gnome/gtkhtml/gdk_fix.diff
b/source/gnome/gtkhtml/gdk_fix.diff
deleted file mode 100644
index 9ca7704..000
--- a/source/gnome/gtkhtml/gdk_fix.diff
+++ /dev/null
@@ -1,413 +0,0 @@
-From b956b89617a1a39c66edd736b81dcba1b31c5a1b Mon Sep 17 00:00:00 2001
-From: Matthew Barnes
-Date: Fri, 17 Sep 2010 18:01:01 +
-Subject: Use new GDK keysym names if available.
-
-In GTK+ 2.21.8, the keysym names were renamed from GDK_* to GDK_KEY_*.
-
-I've added backward-compatibility macros to gtk-compat.h, which can be
-dumped as soon as we require GTK+ >= 2.22.0.
-diff --git a/components/editor/gtkhtml-color-combo.c
b/components/editor/gtkhtml-color-combo.c
-index 9c074b2..59d1ef3 100644
a/components/editor/gtkhtml-color-combo.c
-+++ b/components/editor/gtkhtml-color-combo.c
-@@ -28,6 +28,9 @@
- #include
- #include "gtkhtml-color-swatch.h"
-
-+/* backward-compatibility cruft */
-+#include "gtkhtml/gtk-compat.h"
-+
- #define NUM_CUSTOM_COLORS 8
-
- #define GTKHTML_COLOR_COMBO_GET_PRIVATE(obj) \
-@@ -815,20 +818,20 @@ color_combo_class_init (GtkhtmlColorComboClass *class)
-
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_Down, GDK_MOD1_MASK, "popup", 0);
-+ GDK_KEY_Down, GDK_MOD1_MASK, "popup", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_KP_Down, GDK_MOD1_MASK, "popup", 0);
-+ GDK_KEY_KP_Down, GDK_MOD1_MASK, "popup", 0);
-
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_Up, GDK_MOD1_MASK, "popdown", 0);
-+ GDK_KEY_Up, GDK_MOD1_MASK, "popdown", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_KP_Up, GDK_MOD1_MASK, "popdown", 0);
-+ GDK_KEY_KP_Up, GDK_MOD1_MASK, "popdown", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_Escape, 0, "popdown", 0);
-+ GDK_KEY_Escape, 0, "popdown", 0);
- }
-
- static void
-diff --git a/components/editor/gtkhtml-face-tool-button.c
b/components/editor/gtkhtml-face-tool-button.c
-index bd2d2fe..e3eef0f 100644
a/components/editor/gtkhtml-face-tool-button.c
-+++ b/components/editor/gtkhtml-face-tool-button.c
-@@ -30,6 +30,9 @@
-
- #include "gtkhtml-face-chooser.h"
-
-+/* backward-compatibility cruft */
-+#include "gtkhtml/gtk-compat.h"
-+
- #define GTKHTML_FACE_TOOL_BUTTON_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), GTKHTML_TYPE_FACE_TOOL_BUTTON, GtkhtmlFaceToolButtonPrivate))
-@@ -486,20 +489,20 @@ face_tool_button_class_init (GtkhtmlFaceToolButtonClass
*class)
-
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_Down, GDK_MOD1_MASK, "popup", 0);
-+ GDK_KEY_Down, GDK_MOD1_MASK, "popup", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_KP_Down, GDK_MOD1_MASK, "popup", 0);
-+ GDK_KEY_KP_Down, GDK_MOD1_MASK, "popup", 0);
-
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_Up, GDK_MOD1_MASK, "popdown", 0);
-+ GDK_KEY_Up, GDK_MOD1_MASK, "popdown", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_KP_Up, GDK_MOD1_MASK, "popdown", 0);
-+ GDK_KEY_KP_Up, GDK_MOD1_MASK, "popdown", 0);
- gtk_binding_entry_add_signal (
- gtk_binding_set_by_class (class),
-- GDK_Escape, 0, "popdown", 0);
-+
