diff options
author | Saleem Abdulrasool <compnerd@gentoo.org> | 2006-01-12 22:34:20 +0000 |
---|---|---|
committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2006-01-12 22:34:20 +0000 |
commit | 8cea7ddb1e1810a3e5c8afd439a7f1cd671efd6a (patch) | |
tree | d1e8464482ba9840d2a3186baa376afd0d468404 /gnome-extra/gtkhtml/files | |
parent | app-text/poppler provides pdftohtml as well. (diff) | |
download | gentoo-2-8cea7ddb1e1810a3e5c8afd439a7f1cd671efd6a.tar.gz gentoo-2-8cea7ddb1e1810a3e5c8afd439a7f1cd671efd6a.tar.bz2 gentoo-2-8cea7ddb1e1810a3e5c8afd439a7f1cd671efd6a.zip |
Moving gnome-extra/libgtkhtml to gnome-extra/gtkhtml
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'gnome-extra/gtkhtml/files')
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.3 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.1 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2 | 1 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff | 11 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch | 20 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch | 45 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch | 10 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch | 82 | ||||
-rw-r--r-- | gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch | 11 |
16 files changed, 189 insertions, 0 deletions
diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0 b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0 new file mode 100644 index 000000000000..3c620b2dbac2 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.0 @@ -0,0 +1 @@ +MD5 100d747ee9dce852e313c4f9fa202813 libgtkhtml-2.6.0.tar.bz2 426126 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.3 b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.3 new file mode 100644 index 000000000000..c0525274c535 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-2.6.3 @@ -0,0 +1 @@ +MD5 c77789241d725e189ffc0391eda94361 libgtkhtml-2.6.3.tar.bz2 392127 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10 new file mode 100644 index 000000000000..1533aceb51d9 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10 @@ -0,0 +1 @@ +MD5 b05b8551f7803f32ecfcf505a6310f3f gtkhtml-3.0.10.tar.bz2 1074973 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1 new file mode 100644 index 000000000000..1533aceb51d9 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.0.10-r1 @@ -0,0 +1 @@ +MD5 b05b8551f7803f32ecfcf505a6310f3f gtkhtml-3.0.10.tar.bz2 1074973 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4 new file mode 100644 index 000000000000..f8b455572697 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.4 @@ -0,0 +1 @@ +MD5 1978a1ef8f376593e579ab3ad9f48426 gtkhtml-3.2.4.tar.bz2 1311427 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5 new file mode 100644 index 000000000000..5da267fcd81e --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.2.5 @@ -0,0 +1 @@ +MD5 86e1ce32fed536bce5b2d6e8d41b0c65 gtkhtml-3.2.5.tar.bz2 1315567 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1 new file mode 100644 index 000000000000..6f17c00f66bf --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.1 @@ -0,0 +1 @@ +MD5 df30dbbd12b6a3f1355a9a82aa430781 gtkhtml-3.6.1.tar.bz2 1356878 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2 new file mode 100644 index 000000000000..f049928dbe78 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.6.2 @@ -0,0 +1 @@ +MD5 37465fde0f1e1d7ba2284c5a4fd06fe7 gtkhtml-3.6.2.tar.bz2 1416041 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.1 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.1 new file mode 100644 index 000000000000..82db427a79f5 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.1 @@ -0,0 +1 @@ +MD5 4c66f0eb30d6c26a09ee2c8d60d9c520 gtkhtml-3.8.1.tar.bz2 1527241 diff --git a/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2 b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2 new file mode 100644 index 000000000000..9f2c8adf3a77 --- /dev/null +++ b/gnome-extra/gtkhtml/files/digest-gtkhtml-3.8.2 @@ -0,0 +1 @@ +MD5 4455e24142cc914f00f1e8b81940df68 gtkhtml-3.8.2.tar.bz2 1247395 diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff b/gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff new file mode 100644 index 000000000000..ba6875c22afa --- /dev/null +++ b/gnome-extra/gtkhtml/files/gtkhtml-3.0.10-no-extern-cluealigned.diff @@ -0,0 +1,11 @@ +diff --exclude='*~' --exclude='.*' -I '$Id:' -urN gtkhtml-3.0.10.orig/src/htmlcluealigned.h gtkhtml-3.0.10/src/htmlcluealigned.h +--- gtkhtml-3.0.10.orig/src/htmlcluealigned.h 2005-08-10 00:27:22.000000000 -0400 ++++ gtkhtml-3.0.10/src/htmlcluealigned.h 2005-08-10 08:03:00.000000000 -0400 +@@ -38,7 +38,6 @@ + }; + + +-extern HTMLClueAlignedClass html_cluealigned_class; + + + void html_cluealigned_type_init (void); diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch new file mode 100644 index 000000000000..4839a3f1f2ab --- /dev/null +++ b/gnome-extra/gtkhtml/files/gtkhtml-3.0.7-libtool.patch @@ -0,0 +1,20 @@ +--- libtool~ 2003-07-11 10:21:31.000000000 +0100 ++++ libtool 2003-07-11 10:22:33.000000000 +0100 +@@ -1859,7 +1859,7 @@ + old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + # PKGW +- dependency_libs= ++ #dependency_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + case "$tmp_libs " in +@@ -1976,7 +1976,7 @@ + + tmp_libs= + #PKGW +- dependency_libs= ++ #dependency_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch new file mode 100644 index 000000000000..e4ad9a3f8123 --- /dev/null +++ b/gnome-extra/gtkhtml/files/gtkhtml-3.2-i18n.patch @@ -0,0 +1,45 @@ +--- gtkhtml-3.2.5/src/gtkhtml.c.orig 2005-03-13 16:04:23.000000000 +0000 ++++ gtkhtml-3.2.5/src/gtkhtml.c 2005-03-13 16:07:42.000000000 +0000 +@@ -27,7 +27,7 @@ + #include <gdk-pixbuf/gdk-pixbuf.h> + #include <gtk/gtk.h> + #include <string.h> +- ++#include <glib/gi18n-lib.h> + #include <gnome.h> + + #include "../a11y/factory.h" +--- gtkhtml-3.2.5/src/htmlbutton.c.orig 2005-03-13 16:03:52.000000000 +0000 ++++ gtkhtml-3.2.5/src/htmlbutton.c 2005-03-13 16:08:00.000000000 +0000 +@@ -26,6 +26,7 @@ + #include "htmlform.h" + #include <string.h> + #include <libgnome/gnome-i18n.h> ++#include <glib/gi18n-lib.h> + + HTMLButtonClass html_button_class; + +--- gtkhtml-3.2.5/src/htmlengine-print.c.orig 2005-03-13 16:06:27.000000000 +0000 ++++ gtkhtml-3.2.5/src/htmlengine-print.c 2005-03-13 16:09:36.000000000 +0000 +@@ -23,6 +23,8 @@ + #include <gtk/gtk.h> + #include <libgnome/gnome-i18n.h> + #include <libgnomeui/gnome-dialog-util.h> ++#include <glib/gi18n-lib.h> ++ + #include "gtkhtml.h" + #include "gtkhtml-private.h" + #include "gtkhtml-properties.h" +--- gtkhtml-3.2.5/src/test.c.orig 2005-03-13 16:10:20.000000000 +0000 ++++ gtkhtml-3.2.5/src/test.c 2005-03-13 16:12:28.000000000 +0000 +@@ -36,8 +36,10 @@ + #include <gtk/gtkbutton.h> + #include <gtk/gtksignal.h> + ++#include <config.h> + #include <libgnome/gnome-i18n.h> + #include <libgnomeui/gnome-ui-init.h> ++#include <glib/gi18n-lib.h> + + #include "gtkhtml.h" + #include "gtkhtmldebug.h" diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch new file mode 100644 index 000000000000..df4fac948548 --- /dev/null +++ b/gnome-extra/gtkhtml/files/gtkhtml-3.6.2-fbsd.patch @@ -0,0 +1,10 @@ +--- po/Makefile.in.in.orig Tue Nov 23 17:53:53 2004 ++++ po/Makefile.in.in Tue Nov 23 17:58:38 2004 +@@ -31,6 +31,7 @@ + localedir = $(libdir)/locale + gnulocaledir = $(datadir)/locale + gettextsrcdir = $(datadir)/glib-2.0/gettext/po ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + subdir = po + + INSTALL = @INSTALL@ diff --git a/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch b/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch new file mode 100644 index 000000000000..96c2af2db9e2 --- /dev/null +++ b/gnome-extra/gtkhtml/files/gtkhtml-fix_preedit.patch @@ -0,0 +1,82 @@ +--- gtkhtml.c Sat Jun 28 16:40:03 2003 ++++ gtkhtml_new.c Sat Jun 28 15:54:30 2003 +@@ -789,10 +790,17 @@ + void + gtk_html_im_reset (GtkHTML *html) + { ++ /* I don't know why this is called for every keypress, but it f***s up the preedit totally. ++ gtk_im_context_reset() should only be called if we really want to do a reset, ++ e.g. a selection is made with somewhere else in the text. ++ Adding a character to the text shouldn't trigger this. => FIXME ++ */ ++ /* + if (html->priv->need_im_reset) { + html->priv->need_im_reset = FALSE; +- gtk_im_context_reset (html->priv->im_context); ++ gtk_im_context_reset (html->priv->im_context); + } ++ */ + } + + static gint +@@ -2662,16 +2670,57 @@ + } + } + ++static gint last_length; /* FIXME: put these somewhere else */ ++static gint last_pos; ++static void ++gtk_html_delete_preedit(GtkHTML *html) ++{ ++ /* delete previous preedit string */ ++ if ((last_pos - last_length >= 0) && (last_length > 0)) { ++ html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, last_pos - last_length); ++ html_engine_set_mark (html->engine); ++ html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, last_pos); ++ html_engine_delete (html->engine); ++ } ++} ++ + static void + gtk_html_im_commit_cb (GtkIMContext *context, const gchar *str, GtkHTML *html) + { ++ gint orig_position = html->engine->cursor->position; ++ gtk_html_delete_preedit(html); ++ + html_engine_paste_text (html->engine, str, -1); ++ last_length = 0; ++ last_pos = html->engine->cursor->position; + } + + static void + gtk_html_im_preedit_changed_cb (GtkIMContext *context, GtkHTML *html) + { +- g_warning ("preedit changed callback: implement me"); ++ gint position; ++ gchar *str; ++ PangoAttrList *attribs; ++ gint preedit_cursor_position; ++ ++ gtk_im_context_get_preedit_string (context, &str, &attribs, &preedit_cursor_position); ++ ++ gtk_html_delete_preedit(html); ++ ++ last_length = g_utf8_strlen(str, -1); /* store new string length */ ++ ++ position = html->engine->cursor->position + preedit_cursor_position; ++ ++ /* FIXME: Apply the pango attributes to the string */ ++ html_engine_insert_text (html->engine, str, -1); ++ last_pos = html->engine->cursor->position; ++ ++ /* Move the cursor inside the preedit string as requested */ ++ if (position >= 0) html_cursor_jump_to_position_no_spell (html->engine->cursor, html->engine, position); ++ ++ pango_attr_list_unref (attribs); ++ g_free (str); ++ + } + + static gchar * + + diff --git a/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch b/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch new file mode 100644 index 000000000000..488c1b116f75 --- /dev/null +++ b/gnome-extra/gtkhtml/files/libgtkhtml-2.2.0-alpha.patch @@ -0,0 +1,11 @@ +--- libgtkhtml-2.2.0/libgtkhtml/layout/htmlboxtable.c.old 2003-01-06 11:06:15.000000000 -0500 ++++ libgtkhtml-2.2.0/libgtkhtml/layout/htmlboxtable.c 2003-02-24 18:17:59.000000000 -0500 +@@ -503,7 +503,7 @@ + for (i=0; i< table->cols; i++) { + if (table->col_info[i].style_width.type == type) { + /* Make the space added proportional against the max width of the column */ +- gint to_add = (gint)((float) table->col_info[i].max / (float) max_width * (float)tmp); ++ gint to_add = max_width ? (gint)((float) table->col_info[i].max / (float) max_width * (float)tmp) : 0; // don't div by zero on alpha + if (to_add == 0) + to_add = 1; + |