Kill some more patches that aren't needed anymore
This commit is contained in:
parent
96c52298ee
commit
643d4981bb
@ -1,37 +0,0 @@
|
||||
--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2004-11-07 18:59:23.000000000 -0500
|
||||
+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2006-08-06 18:24:37.000000000 -0400
|
||||
@@ -40,10 +40,9 @@
|
||||
#define PANGO_ENABLE_ENGINE
|
||||
|
||||
#include "mozilla-decoder.h"
|
||||
-#include <pango/pangoxft.h>
|
||||
#include <pango/pangofc-fontmap.h>
|
||||
#include <pango/pangofc-font.h>
|
||||
-#include <gdk/gdkx.h>
|
||||
+#include <gdk/gdkpango.h>
|
||||
|
||||
#include "nsString.h"
|
||||
#include "nsIPersistentProperties2.h"
|
||||
@@ -145,6 +144,13 @@ mozilla_decoders_init(void)
|
||||
if (initialized)
|
||||
return 0;
|
||||
|
||||
+ PangoContext* context = gdk_pango_context_get ();
|
||||
+ PangoFontMap* fontmap = pango_context_get_font_map (context);
|
||||
+ g_object_unref (context);
|
||||
+
|
||||
+ if (!PANGO_IS_FC_FONT_MAP (fontmap))
|
||||
+ return -1;
|
||||
+
|
||||
encoder_hash = g_hash_table_new(g_str_hash, g_str_equal);
|
||||
cmap_hash = g_hash_table_new(g_str_hash, g_str_equal);
|
||||
wide_hash = g_hash_table_new(g_str_hash, g_str_equal);
|
||||
@@ -208,7 +214,7 @@ mozilla_decoders_init(void)
|
||||
}
|
||||
}
|
||||
|
||||
- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
|
||||
+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(fontmap),
|
||||
mozilla_find_decoder,
|
||||
NULL,
|
||||
NULL);
|
@ -1,15 +0,0 @@
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=389801
|
||||
|
||||
--- mozilla/gfx/src/gtk/gtk2drawing.c.fixgtk212 2005-09-13 05:30:53.000000000 +0200
|
||||
+++ mozilla/gfx/src/gtk/gtk2drawing.c 2007-09-06 09:42:34.000000000 +0200
|
||||
@@ -551,8 +551,8 @@ moz_gtk_option_menu_get_metrics(gboolean
|
||||
else
|
||||
*indicator_spacing = default_indicator_spacing;
|
||||
|
||||
- g_free(tmp_indicator_size);
|
||||
- g_free(tmp_indicator_spacing);
|
||||
+ gtk_requisition_free(tmp_indicator_size);
|
||||
+ gtk_border_free(tmp_indicator_spacing);
|
||||
|
||||
return MOZ_GTK_SUCCESS;
|
||||
}
|
@ -45,7 +45,6 @@ Patch41: firefox-2.0.0.4-undo-uriloader.patch
|
||||
Patch42: firefox-1.1-uriloader.patch
|
||||
|
||||
# font system fixes
|
||||
Patch81: firefox-1.5-nopangoxft.patch
|
||||
Patch82: firefox-1.5-pango-mathml.patch
|
||||
Patch83: firefox-1.5-pango-cursor-position.patch
|
||||
Patch84: firefox-2.0-pango-printing.patch
|
||||
@ -58,7 +57,6 @@ Patch89: firefox-2.0-pango-ligatures.patch
|
||||
# Other
|
||||
Patch102: firefox-1.5-theme-change.patch
|
||||
Patch103: thunderbird-1.5-profile-migrator.patch
|
||||
Patch106: firefox-2.0-indicator-crash.patch
|
||||
Patch111: thunderbird-path.patch
|
||||
Patch112: thunderbird-2.0-enable-debug.patch
|
||||
|
||||
@ -118,7 +116,6 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
|
||||
%patch42 -p0
|
||||
|
||||
# font system fixes
|
||||
%patch81 -p1 -b .nopangoxft
|
||||
#%patch82 -p1 -b .pango-mathml
|
||||
%patch83 -p1 -b .pango-cursor-position
|
||||
%patch84 -p0 -b .pango-printing
|
||||
@ -138,7 +135,6 @@ popd
|
||||
|
||||
%patch102 -p0 -b .theme-change
|
||||
%patch103 -p1 -b .profile-migrator
|
||||
%patch106 -p1 -b .indicator-crash
|
||||
%patch111 -p1 -b .path
|
||||
%patch112 -p1 -b .debug
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user