From 8ef0a520c1b934479b19885dde0e131386871a70 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 6 Jan 2015 12:28:31 +0100 Subject: Update to 35.0 Build 1 --- mozilla-1051209.patch | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 mozilla-1051209.patch (limited to 'mozilla-1051209.patch') diff --git a/mozilla-1051209.patch b/mozilla-1051209.patch deleted file mode 100644 index df7f3a1..0000000 --- a/mozilla-1051209.patch +++ /dev/null @@ -1,47 +0,0 @@ -# HG changeset patch -# User Mike Hommey -# Date 1409907676 -32400 -# Fri Sep 05 18:01:16 2014 +0900 -# Node ID 4eac619b94070c8e854f6b3925879700430ab7f1 -# Parent 477f8748127a6f702616803e6c43632cb560f8a2 -Bug 1051209 - Properly link libxul.so on GTK+3 builds after bug 1045783 - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -4153,17 +4153,16 @@ cairo-gtk3) - MOZ_ENABLE_XREMOTE=1 - MOZ_GL_DEFAULT_PROVIDER=GLX - - AC_DEFINE(MOZ_X11) - MOZ_X11=1 - USE_FC_FREETYPE=1 - - TK_CFLAGS='$(MOZ_GTK3_CFLAGS)' -- TK_LIBS='$(MOZ_GTK3_LIBS)' - MOZ_WIDGET_GTK=3 - AC_DEFINE_UNQUOTED(MOZ_WIDGET_GTK,$MOZ_WIDGET_GTK) - MOZ_PDF_PRINTING=1 - MOZ_INSTRUMENT_EVENT_LOOP=1 - ;; - - cairo-gtk2|cairo-gtk2-x11) - MOZ_WIDGET_TOOLKIT=gtk2 -@@ -4266,16 +4265,17 @@ fi - if test "$MOZ_INSTRUMENT_EVENT_LOOP"; then - AC_DEFINE(MOZ_INSTRUMENT_EVENT_LOOP) - fi - - if test "$COMPILE_ENVIRONMENT"; then - if test "$MOZ_ENABLE_GTK3"; then - PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 $GDK_PACKAGES) - MOZ_GTK3_CFLAGS="-I${_topsrcdir}/widget/gtk/compat-gtk3 $MOZ_GTK3_CFLAGS" -+ TK_LIBS=$MOZ_GTK3_LIBS - fi - if test "$MOZ_ENABLE_GTK"; then - if test "$MOZ_X11"; then - GDK_PACKAGES=gdk-x11-2.0 - fi - - PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES) - MOZ_GTK2_CFLAGS="-I${_topsrcdir}/widget/gtk/compat $MOZ_GTK2_CFLAGS" -- cgit