Changeset 25949


Ignore:
Timestamp:
2011-03-08T10:13:28+01:00 (7 years ago)
Author:
jow
Message:

[desktop] gtkhtml: extend 000-disable-editor.patch to cover configure.ac, refresh patches

Location:
feeds/desktop/libs/gtkhtml/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • feeds/desktop/libs/gtkhtml/patches/000-disable-editor.patch

    r21057 r25949  
    1 diff -ruN gtkhtml-3.29.1/components/Makefile.am gtkhtml-3.29.1.mod/components/Makefile.am 
    2 --- gtkhtml-3.29.1/components/Makefile.am       2009-10-23 12:25:35.000000000 +0200 
    3 +++ gtkhtml-3.29.1.mod/components/Makefile.am   2009-10-30 18:33:25.000000000 +0100 
     1--- a/components/Makefile.am 
     2+++ b/components/Makefile.am 
    43@@ -1,4 +1,4 @@ 
    54  
     
    87  
    98 -include $(top_srcdir)/git.mk 
    10 diff -ruN gtkhtml-3.29.1/components/Makefile.in gtkhtml-3.29.1.mod/components/Makefile.in 
    11 --- gtkhtml-3.29.1/components/Makefile.in       2009-10-26 09:22:21.000000000 +0100 
    12 +++ gtkhtml-3.29.1.mod/components/Makefile.in   2009-10-30 18:32:41.000000000 +0100 
    13 @@ -265,7 +265,7 @@ 
     9--- a/components/Makefile.in 
     10+++ b/components/Makefile.in 
     11@@ -265,7 +265,7 @@ target_alias = @target_alias@ 
    1412 top_build_prefix = @top_build_prefix@ 
    1513 top_builddir = @top_builddir@ 
     
    2018  
    2119 .SUFFIXES: 
    22 diff -ruN gtkhtml-3.29.1/configure gtkhtml-3.29.1.mod/configure 
    23 --- gtkhtml-3.29.1/configure    2009-10-26 09:22:19.000000000 +0100 
    24 +++ gtkhtml-3.29.1.mod/configure        2009-10-30 18:39:32.000000000 +0100 
    25 @@ -21911,7 +21911,7 @@ 
     20--- a/configure 
     21+++ b/configure 
     22@@ -21911,7 +21911,7 @@ fi 
    2623  
    2724  
     
    3229 pkg_failed=no 
    3330 { $as_echo "$as_me:$LINENO: checking for GTKHTML" >&5 
     31--- a/configure.ac 
     32+++ b/configure.ac 
     33@@ -136,7 +136,7 @@ PKG_CHECK_MODULES(GTHREAD, $GTHREAD_MODU 
     34 AC_SUBST(GTHREAD_CFLAGS) 
     35 AC_SUBST(GTHREAD_LIBS) 
     36  
     37-GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version enchant gconf-2.0 iso-codes" 
     38+GTKHTML_MODULES="gtk+-2.0 >= gtk_minimum_version gconf-2.0" 
     39 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES) 
     40 AC_SUBST(GTKHTML_CFLAGS) 
     41 AC_SUBST(GTKHTML_LIBS) 
  • feeds/desktop/libs/gtkhtml/patches/010-disable-gconf.patch

    r21057 r25949  
    1 --- gtkhtml-3.29.1/gtkhtml/gtkhtml.c    2009-10-26 07:49:58.000000000 +0100 
    2 +++ gtkhtml-3.29.1.mod/gtkhtml/gtkhtml.c        2009-11-22 12:46:18.000000000 +0100 
    3 @@ -128,8 +128,8 @@ 
     1--- a/gtkhtml/gtkhtml.c 
     2+++ b/gtkhtml/gtkhtml.c 
     3@@ -128,8 +128,8 @@ struct _ClipboardContents { 
    44  
    55 static GtkLayoutClass *parent_class = NULL; 
     
    1212 enum { 
    1313        TITLE_CHANGED, 
    14 @@ -791,7 +791,7 @@ 
     14@@ -791,7 +791,7 @@ destroy (GtkObject *object) 
    1515                } 
    1616  
     
    2121                } 
    2222  
    23 @@ -832,61 +832,64 @@ 
     23@@ -832,61 +832,64 @@ gtk_html_get_top_html (GtkHTML *html) 
    2424 static cairo_font_options_t * 
    2525 get_font_options (void) 
     
    138138 } 
    139139  
    140 @@ -913,36 +916,36 @@ 
     140@@ -913,36 +916,36 @@ gtk_html_set_fonts (GtkHTML *html, HTMLP 
    141141        font_var_points = !pango_font_description_get_size_is_absolute (style->font_desc); 
    142142  
     
    205205        if (!fixed_name) { 
    206206                fixed_family = "Monospace"; 
    207 @@ -2365,22 +2368,22 @@ 
     207@@ -2365,22 +2368,22 @@ setup_class_properties (GtkHTML *html) 
    208208        if (!klass->properties) { 
    209209                klass->properties = gtk_html_class_properties_new (GTK_WIDGET (html)); 
     
    243243 } 
    244244  
    245 @@ -2748,41 +2751,41 @@ 
     245@@ -2748,41 +2751,41 @@ drag_motion (GtkWidget *widget, GdkDragC 
    246246  
    247247 /* dnd end */ 
     
    320320 static void 
    321321 gtk_html_direction_changed (GtkWidget *widget, GtkTextDirection previous_dir) 
    322 @@ -2823,7 +2826,7 @@ 
     322@@ -2823,7 +2826,7 @@ gtk_html_class_init (GtkHTMLClass *klass 
    323323        GtkLayoutClass    *layout_class; 
    324324        GtkContainerClass *container_class; 
     
    329329        html_class = (GtkHTMLClass *) klass; 
    330330 #ifdef USE_PROPS 
    331 @@ -3176,18 +3179,18 @@ 
     331@@ -3176,18 +3179,18 @@ gtk_html_class_init (GtkHTMLClass *klass 
    332332        gtk_rc_parse (filename); 
    333333        g_free (filename); 
     
    356356  
    357357 static void 
    358 @@ -3195,8 +3198,8 @@ 
     358@@ -3195,8 +3198,8 @@ init_properties_widget (GtkHTML *html) 
    359359 { 
    360360        setup_class_properties (html); 
     
    367367 } 
    368368  
    369 @@ -3478,9 +3481,9 @@ 
     369@@ -3478,9 +3481,9 @@ gtk_html_init (GtkHTML* html) 
    370370        g_signal_connect (G_OBJECT (html->priv->im_context), "delete_surrounding", 
    371371                          G_CALLBACK (gtk_html_im_delete_surrounding_cb), html); 
     
    380380        gtk_html_construct (html); 
    381381 } 
    382 @@ -3579,7 +3582,7 @@ 
     382@@ -3579,7 +3582,7 @@ gtk_html_construct (GtkHTML *html) 
    383383        g_signal_connect (G_OBJECT (html->engine), "object_requested", 
    384384                          G_CALLBACK (html_engine_object_requested_cb), html); 
     
    390390  
    391391 
    392 @@ -6044,7 +6047,7 @@ 
     392@@ -6044,7 +6047,7 @@ gtk_html_edit_make_cursor_visible (GtkHT 
    393393 gboolean 
    394394 gtk_html_build_with_gconf (void) 
     
    399399  
    400400 static void 
    401 --- gtkhtml-3.29.1/gtkhtml/gtkhtml-properties.h 2009-06-26 13:14:48.000000000 +0200 
    402 +++ gtkhtml-3.29.1.mod/gtkhtml/gtkhtml-properties.h     2009-11-22 12:20:54.000000000 +0100 
     401--- a/gtkhtml/gtkhtml-properties.h 
     402+++ b/gtkhtml/gtkhtml-properties.h 
    403403@@ -27,7 +27,7 @@ 
    404404 #define GTK_HTML_GNOME_CONFIG_PREFIX "/gtkhtml/Settings/" 
     
    410410 #include "gtkhtml-types.h" 
    411411 #include "gtkhtml.h" 
    412 @@ -51,11 +51,11 @@ 
     412@@ -51,11 +51,11 @@ GtkHTMLClassProperties * gtk_html_class_ 
    413413 void                     gtk_html_class_properties_destroy   (GtkHTMLClassProperties *p); 
    414414 void                     gtk_html_class_properties_copy      (GtkHTMLClassProperties *p1, 
     
    427427 /* enum types */ 
    428428  
    429 --- gtkhtml-3.29.1/gtkhtml/gtkhtml-properties.c 2009-10-23 12:26:15.000000000 +0200 
    430 +++ gtkhtml-3.29.1.mod/gtkhtml/gtkhtml-properties.c     2009-12-11 00:57:25.000000000 +0100 
    431 @@ -102,20 +102,20 @@ 
     429--- a/gtkhtml/gtkhtml-properties.c 
     430+++ b/gtkhtml/gtkhtml-properties.c 
     431@@ -102,20 +102,20 @@ gtk_html_class_properties_destroy (GtkHT 
    432432        g_free (p); 
    433433 } 
Note: See TracChangeset for help on using the changeset viewer.