# HG changeset patch # User Wolfgang Rosenauer # Date 1317823317 -7200 # Node ID aabcc78956952e7a704df645c2ceba87e95d3e75 # Parent 5b3e3dc8fb4062b27386308f1335e9fe6c99c752 update to version 8.0b1 (just merged stuff; build might still fail) diff -r 5b3e3dc8fb40 -r aabcc7895695 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Wed Oct 05 13:40:30 2011 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Wed Oct 05 16:01:57 2011 +0200 @@ -19,7 +19,7 @@ # norootforbuild %define major 7 -%define mainver %major.0 +%define mainver %major.99 Name: MozillaFirefox BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip @@ -33,9 +33,9 @@ BuildRequires: mozilla-nss-devel >= 3.12.10 BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: %{mainver}.1 +Version: %{mainver} Release: 1 -%define releasedate 2011092900 +%define releasedate 2011100400 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -66,14 +66,12 @@ Patch3: mozilla-prefer_plugin_pref.patch Patch4: mozilla-shared-nss-db.patch Patch5: mozilla-kde.patch -Patch7: mozilla-language.patch -Patch9: mozilla-cairo-return.patch -Patch10: mozilla-ntlm-full-path.patch -Patch12: mozilla-repo.patch -Patch13: mozilla-dump_syms-static.patch -Patch14: mozilla-sle11.patch -Patch15: mozilla-linux3.patch -Patch16: mozilla-curl.patch +Patch6: mozilla-language.patch +Patch7: mozilla-ntlm-full-path.patch +Patch8: mozilla-repo.patch +Patch9: mozilla-dump_syms-static.patch +Patch10: mozilla-sle11.patch +Patch11: mozilla-linux3.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -196,16 +194,14 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch7 -p1 +%patch8 -p1 %patch9 -p1 +%if %suse_version < 1120 %patch10 -p1 -%patch12 -p1 -%patch13 -p1 -%if %suse_version < 1120 -%patch14 -p1 %endif -%patch15 -p1 -%patch16 -p1 +%patch11 -p1 # %patch31 -p1 %patch32 -p1 @@ -267,7 +263,7 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=default +ac_add_options --enable-update-channel=beta EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG diff -r 5b3e3dc8fb40 -r aabcc7895695 MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Wed Oct 05 13:40:30 2011 +0200 +++ b/MozillaFirefox/create-tar.sh Wed Oct 05 16:01:57 2011 +0200 @@ -1,8 +1,9 @@ #!/bin/bash -BRANCH="releases/mozilla-release" -RELEASE_TAG="FIREFOX_7_0_1_RELEASE" -VERSION="7.0.1" +CHANNEL="beta" +BRANCH="releases/mozilla-$CHANNEL" +RELEASE_TAG="FIREFOX_8_0b1_RELEASE" +VERSION="7.99" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla @@ -23,7 +24,7 @@ ja-JP-mac|en-US) ;; *) - hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac diff -r 5b3e3dc8fb40 -r aabcc7895695 MozillaFirefox/mozilla-cairo-return.patch --- a/MozillaFirefox/mozilla-cairo-return.patch Wed Oct 05 13:40:30 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-cairo-return.patch \ No newline at end of file diff -r 5b3e3dc8fb40 -r aabcc7895695 MozillaFirefox/mozilla-curl.patch --- a/MozillaFirefox/mozilla-curl.patch Wed Oct 05 13:40:30 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-curl.patch \ No newline at end of file diff -r 5b3e3dc8fb40 -r aabcc7895695 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Wed Oct 05 13:40:30 2011 +0200 +++ b/firefox-branded-icons.patch Wed Oct 05 16:01:57 2011 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 6948d58326d5c2e46936e186079421e7d76445e2 +# Parent 87462739809ad0f41fd335f9a68203fd70f9883c diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -199,16 +199,21 @@ DEFINES += -DMOZILLA_OFFICIAL +@@ -194,16 +194,21 @@ DEFINES += -DMOZILLA_OFFICIAL endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -20,16 +20,16 @@ +endif endif - ifdef MOZ_SPLASHSCREEN - ifeq ($(MOZ_WIDGET_TOOLKIT),windows) - libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin - endif - endif + libs:: $(srcdir)/profile/prefs.js + $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile + + libs:: $(srcdir)/blocklist.xml + $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin + diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in -@@ -69,18 +69,21 @@ OSX_BRANDING_FILES = \ +@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ @@ -54,7 +54,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -421,18 +421,21 @@ +@@ -415,18 +415,21 @@ #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif diff -r 5b3e3dc8fb40 -r aabcc7895695 firefox-kde.patch --- a/firefox-kde.patch Wed Oct 05 13:40:30 2011 +0200 +++ b/firefox-kde.patch Wed Oct 05 16:01:57 2011 +0200 @@ -1056,13 +1056,13 @@ +* content/browser/browser-kde.xul (content/browser-kde.xul) +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) + * content/browser/content.js (content/content.js) * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) - content/browser/highlighter.xhtml (content/highlighter.xhtml) * content/browser/inspector.html (content/inspector.html) - * content/browser/scratchpad.xul (content/scratchpad.xul) - * content/browser/scratchpad.js (content/scratchpad.js) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) + * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) + * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1565,7 +1565,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -440,16 +440,17 @@ +@@ -434,16 +434,17 @@ #endif #endif diff -r 5b3e3dc8fb40 -r aabcc7895695 mozilla-cairo-return.patch --- a/mozilla-cairo-return.patch Wed Oct 05 13:40:30 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -# HG changeset patch -# User Wolfgang Rosenauer -# Parent 43cb27a012f2532add0e9791c1b5a7d0c3b03f9b -Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush' - -diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c ---- a/gfx/cairo/cairo/src/cairo-surface-wrapper.c -+++ b/gfx/cairo/cairo/src/cairo-surface-wrapper.c -@@ -526,9 +526,12 @@ _cairo_surface_wrapper_fini (cairo_surfa - } - - cairo_status_t - _cairo_surface_wrapper_flush (cairo_surface_wrapper_t *wrapper) - { - if (wrapper->target->backend->flush) { - return wrapper->target->backend->flush(wrapper->target); - } -+ -+ // this is preliminary to cool down gcc and build checks -+ return CAIRO_STATUS_SUCCESS; - } diff -r 5b3e3dc8fb40 -r aabcc7895695 mozilla-curl.patch --- a/mozilla-curl.patch Wed Oct 05 13:40:30 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,89 +0,0 @@ -# HG changeset patch -# User Evan Shaw -# Parent 891179411e19ab39f95bd7769c0e58db6f22f9e4 -bug 673072 - remove deprecated curl header curl/types.h from Breakpad includes. r=ted - -diff --git a/config/system-headers b/config/system-headers ---- a/config/system-headers -+++ b/config/system-headers -@@ -199,17 +199,16 @@ crypt.h - cstddef - cstdio - cstdlib - cstring - ctime - ctype.h - curl/curl.h - curl/easy.h --curl/types.h - curses.h - cxxabi.h - DateTimeUtils.h - dbus/dbus.h - dbus/dbus-glib.h - dbus/dbus-glib-lowlevel.h - ddeml.h - Debug.h -diff --git a/js/src/config/system-headers b/js/src/config/system-headers ---- a/js/src/config/system-headers -+++ b/js/src/config/system-headers -@@ -199,17 +199,16 @@ crypt.h - cstddef - cstdio - cstdlib - cstring - ctime - ctype.h - curl/curl.h - curl/easy.h --curl/types.h - curses.h - cxxabi.h - DateTimeUtils.h - dbus/dbus.h - dbus/dbus-glib.h - dbus/dbus-glib-lowlevel.h - ddeml.h - Debug.h -diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc ---- a/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc -+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc -@@ -28,17 +28,16 @@ - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include "common/linux/http_upload.h" - - #include - #include - #include - #include --#include - - namespace { - - // Callback to get the response data from server. - static size_t WriteCallback(void *ptr, size_t size, - size_t nmemb, void *userp) { - if (!userp) - return 0; -diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc ---- a/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc -+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc -@@ -24,17 +24,16 @@ - // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #include - #include --#include - #include - - #include - #include - - #include "common/linux/libcurl_wrapper.h" - - using std::string; diff -r 5b3e3dc8fb40 -r aabcc7895695 mozilla-kde.patch --- a/mozilla-kde.patch Wed Oct 05 13:40:30 2011 +0200 +++ b/mozilla-kde.patch Wed Oct 05 16:01:57 2011 +0200 @@ -39,7 +39,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -966,30 +967,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -956,30 +957,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char } static nsresult pref_LoadPrefsInDirList(const char *listId) @@ -89,51 +89,51 @@ } static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name) -@@ -1082,28 +1101,40 @@ static nsresult pref_InitInitialObjects( - /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ - static const char* specialFiles[] = { +@@ -1072,28 +1091,40 @@ static nsresult pref_InitInitialObjects( + /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ + static const char* specialFiles[] = { #if defined(XP_MACOSX) - "macprefs.js" + "macprefs.js" #elif defined(XP_WIN) - "winpref.js" + "winpref.js" #elif defined(XP_UNIX) - "unix.js" -+ , "" // placeholder for KDE (empty is otherwise harmless) + "unix.js" ++ , "" // placeholder for KDE (empty is otherwise harmless) #if defined(VMS) - , "openvms.js" + , "openvms.js" #elif defined(_AIX) - , "aix.js" + , "aix.js" #endif #elif defined(XP_OS2) - "os2pref.js" + "os2pref.js" #elif defined(XP_BEOS) - "beos.js" + "beos.js" #endif - }; + }; -+ if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? -+ for( int i = 0; -+ i < NS_ARRAY_LENGTH(specialFiles); -+ ++i ) { -+ if( *specialFiles[ i ] == '\0' ) { -+ specialFiles[ i ] = "kde.js"; -+ break; -+ } ++ if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? ++ for( int i = 0; ++ i < NS_ARRAY_LENGTH(specialFiles); ++ ++i ) { ++ if( *specialFiles[ i ] == '\0' ) { ++ specialFiles[ i ] = "kde.js"; ++ break; + } + } ++ } + - rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); - if (NS_FAILED(rv)) - NS_WARNING("Error parsing application default preferences."); - } + rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); + if (NS_FAILED(rv)) + NS_WARNING("Error parsing application default preferences."); // Load jar:$app/omni.jar!/defaults/preferences/*.js nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); if (appJarReader) { + rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr); diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in -@@ -77,8 +77,10 @@ EXTRA_COMPONENTS = \ +@@ -75,8 +75,10 @@ EXTRA_COMPONENTS = \ $(NULL) endif @@ -2178,7 +2178,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -98,17 +98,18 @@ EXPORTS = nsWindowsDllInterceptor.h +@@ -94,17 +94,18 @@ EXPORTS = nsWindowsDllInterceptor.h else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm @@ -3192,13 +3192,13 @@ diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in --- a/widget/src/gtk2/Makefile.in +++ b/widget/src/gtk2/Makefile.in -@@ -134,11 +134,14 @@ endif - - DEFINES += -DCAIRO_GFX +@@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX INCLUDES += \ -I$(srcdir)/../xpwidgets \ -I$(srcdir)/../shared \ + -I$(topsrcdir)/layout/generic \ + -I$(topsrcdir)/layout/xul/base/src \ -I$(topsrcdir)/other-licenses/atk-1.0 \ $(NULL) + @@ -3228,7 +3228,8 @@ #include "nsIStringBundle.h" #include "nsArrayEnumerator.h" -@@ -50,16 +51,17 @@ +@@ -49,16 +50,17 @@ + #include "nsNetUtil.h" #include "nsReadableUtils.h" #include "mozcontainer.h" @@ -3236,7 +3237,6 @@ #include "prlink.h" #include "nsFilePicker.h" - #include "nsAccessibilityHelper.h" +#include "nsKDEUtils.h" #if (MOZ_PLATFORM_MAEMO == 5) @@ -3246,7 +3246,7 @@ #define MAX_PREVIEW_SIZE 180 nsILocalFile *nsFilePicker::mPrevDisplayDirectory = nsnull; -@@ -282,17 +284,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil +@@ -281,17 +283,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3267,7 +3267,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -430,16 +434,19 @@ confirm_overwrite_file(GtkWidget *parent +@@ -429,16 +433,19 @@ confirm_overwrite_file(GtkWidget *parent gtk_widget_destroy(dialog); return result; @@ -3287,7 +3287,7 @@ GtkWindow *parent_widget = get_gtk_window_for_nsiwidget(mParentWidget); GtkFileChooserAction action = GetGtkFileChooserAction(mMode); -@@ -580,8 +587,234 @@ nsFilePicker::Show(PRInt16 *aReturn) +@@ -579,8 +586,234 @@ nsFilePicker::Show(PRInt16 *aReturn) *aReturn = nsIFilePicker::returnCancel; break; } @@ -3561,7 +3561,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp -@@ -59,16 +59,17 @@ +@@ -60,16 +60,17 @@ #include "nsTextFormatter.h" #include "nsVersionComparator.h" #include "nsXPCOMCIDInternal.h" @@ -3579,12 +3579,12 @@ // Some directives should only be delivered for NS_COMPONENT_LOCATION // manifests. -@@ -426,16 +427,17 @@ ParseManifestCommon(NSLocationType aType - +@@ -430,16 +431,17 @@ ParseManifestCommon(NSLocationType aType NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kApplication, "application"); NS_NAMED_LITERAL_STRING(kAppVersion, "appversion"); + NS_NAMED_LITERAL_STRING(kGeckoVersion, "platformversion"); NS_NAMED_LITERAL_STRING(kOs, "os"); NS_NAMED_LITERAL_STRING(kOsVersion, "osversion"); NS_NAMED_LITERAL_STRING(kABI, "abi"); @@ -3595,9 +3595,9 @@ nsAutoString appID; nsAutoString appVersion; + nsAutoString geckoVersion; nsAutoString osTarget; - nsAutoString abi; -@@ -465,39 +467,44 @@ ParseManifestCommon(NSLocationType aType +@@ -474,39 +476,44 @@ ParseManifestCommon(NSLocationType aType CopyUTF8toUTF16(s, abi); abi.Insert(PRUnichar('_'), 0); abi.Insert(osTarget, 0); @@ -3642,9 +3642,9 @@ char *token; char *newline = buf; -@@ -566,24 +573,26 @@ ParseManifestCommon(NSLocationType aType - bool ok = true; +@@ -585,24 +592,26 @@ ParseManifestCommon(NSLocationType aType TriState stAppVersion = eUnspecified; + TriState stGeckoVersion = eUnspecified; TriState stApp = eUnspecified; TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; @@ -3662,20 +3662,20 @@ CheckStringFlag(kABI, wtoken, abi, stABI) || + CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || - CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion)) + CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || + CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) continue; if (directive->contentflags && (CheckFlag(kPlatform, wtoken, platform) || CheckFlag(kContentAccessible, wtoken, contentAccessible))) - continue; -@@ -602,16 +611,17 @@ ParseManifestCommon(NSLocationType aType - ok = false; +@@ -623,16 +632,17 @@ ParseManifestCommon(NSLocationType aType } if (!ok || stApp == eBad || stAppVersion == eBad || + stGeckoVersion == eBad || stOs == eBad || stOsVersion == eBad || + stDesktop == eBad || @@ -3712,11 +3712,11 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -88,16 +88,17 @@ +@@ -87,16 +87,17 @@ + #include "nsXPIDLString.h" #include "prproces.h" #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" - #include "nsITimelineService.h" #ifdef MOZ_WIDGET_GTK2 #include "nsIGIOService.h" @@ -3730,7 +3730,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1769,44 +1770,50 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1785,44 +1786,50 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3795,7 +3795,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1832,16 +1839,23 @@ nsLocalFile::Launch() +@@ -1848,16 +1855,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; diff -r 5b3e3dc8fb40 -r aabcc7895695 mozilla-pkgconfig.patch --- a/mozilla-pkgconfig.patch Wed Oct 05 13:40:30 2011 +0200 +++ b/mozilla-pkgconfig.patch Wed Oct 05 16:01:57 2011 +0200 @@ -4,27 +4,27 @@ diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in -@@ -62,16 +62,19 @@ PKG_DMG_SOURCE = $(STAGEPATH)xulrunner-p - endif - - include $(topsrcdir)/config/rules.mk +@@ -66,16 +66,19 @@ include $(topsrcdir)/config/rules.mk INSTALL_SDK = 1 + GENERATE_CACHE = 1 include $(topsrcdir)/toolkit/mozapps/installer/packager.mk -+# the apilibdir always ends with 1.9 as every patch update will provide a link -+apilibdir = $(dir $(installdir))xulrunner-2.2 -+ # Add pkg-config files to the install:: target ++# the apilibdir always ends with 1.9 as every patch update will provide a link ++apilibdir = $(dir $(installdir))xulrunner-8 ++ pkg_config_files = \ libxul.pc \ libxul-embedding.pc \ mozilla-js.pc \ mozilla-plugin.pc \ mozilla-gtkmozembed.pc \ -@@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc + mozilla-gtkmozembed-embedding.pc \ + $(NULL) +@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) diff -r 5b3e3dc8fb40 -r aabcc7895695 mozilla-repo.patch --- a/mozilla-repo.patch Wed Oct 05 13:40:30 2011 +0200 +++ b/mozilla-repo.patch Wed Oct 05 16:01:57 2011 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 732243388ea9cc592d30e1951f29a94a0ce5a035 +# Parent 07dc7ea11c92368cb7c137a403feaaa6861abb3c diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -26,9 +26,9 @@ diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in -@@ -61,17 +61,17 @@ MOZ_SOURCE_STAMP ?= $(shell hg -R $(tops - ifdef MOZ_SOURCE_STAMP - DEFINES += -DSOURCE_CHANGESET="$(MOZ_SOURCE_STAMP)" +@@ -65,17 +65,17 @@ endif + ifeq (Android,$(OS_TARGET)) + DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) endif # strip a trailing slash from the repo URL because it's not always present, @@ -74,7 +74,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -231,17 +231,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR +@@ -227,17 +227,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR endif endif diff -r 5b3e3dc8fb40 -r aabcc7895695 mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Wed Oct 05 13:40:30 2011 +0200 +++ b/mozilla-shared-nss-db.patch Wed Oct 05 16:01:57 2011 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -579,16 +579,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS +@@ -577,16 +577,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8625,16 +8625,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8680,16 +8680,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -109,7 +109,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -@@ -1761,18 +1768,34 @@ nsNSSComponent::InitializeNSS(PRBool sho +@@ -1748,18 +1755,34 @@ nsNSSComponent::InitializeNSS(PRBool sho ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -167,4 +167,4 @@ -framework SystemConfiguration \ -framework QuickTime \ -framework IOKit \ - -lcrypto \ + -F/System/Library/PrivateFrameworks -framework CoreUI \ diff -r 5b3e3dc8fb40 -r aabcc7895695 series --- a/series Wed Oct 05 13:40:30 2011 +0200 +++ b/series Wed Oct 05 16:01:57 2011 +0200 @@ -10,13 +10,11 @@ #gecko-lockdown.patch #toolkit-ui-lockdown.patch mozilla-language.patch -mozilla-cairo-return.patch mozilla-ntlm-full-path.patch mozilla-repo.patch mozilla-dump_syms-static.patch mozilla-sle11.patch mozilla-linux3.patch -mozilla-curl.patch # Firefox patches firefox-browser-css.patch diff -r 5b3e3dc8fb40 -r aabcc7895695 xulrunner/create-tar.sh --- a/xulrunner/create-tar.sh Wed Oct 05 13:40:30 2011 +0200 +++ b/xulrunner/create-tar.sh Wed Oct 05 16:01:57 2011 +0200 @@ -1,8 +1,9 @@ #!/bin/bash -BRANCH="releases/mozilla-release" -RELEASE_TAG="FIREFOX_7_0_1_RELEASE" -VERSION="7.0.1" +CHANNEL="beta" +BRANCH="releases/mozilla-$CHANNEL" +RELEASE_TAG="FIREFOX_8_0b1_RELEASE" +VERSION="7.99" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla @@ -23,7 +24,7 @@ ja-JP-mac|en-US) ;; *) - hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac diff -r 5b3e3dc8fb40 -r aabcc7895695 xulrunner/mozilla-cairo-return.patch --- a/xulrunner/mozilla-cairo-return.patch Wed Oct 05 13:40:30 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-cairo-return.patch \ No newline at end of file diff -r 5b3e3dc8fb40 -r aabcc7895695 xulrunner/mozilla-curl.patch --- a/xulrunner/mozilla-curl.patch Wed Oct 05 13:40:30 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-curl.patch \ No newline at end of file diff -r 5b3e3dc8fb40 -r aabcc7895695 xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Wed Oct 05 13:40:30 2011 +0200 +++ b/xulrunner/xulrunner.spec Wed Oct 05 16:01:57 2011 +0200 @@ -30,12 +30,12 @@ BuildRequires: mozilla-nspr-devel >= 4.8.8 BuildRequires: mozilla-nss-devel >= 3.12.10 License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: 7.0.1 +Version: 7.99 Release: 1 -%define releasedate 2011092900 -%define version_internal 7.0.1 -%define apiversion 7 -%define uaweight 700001 +%define releasedate 2011100400 +%define version_internal 8.0b1 +%define apiversion 8 +%define uaweight 790001 Summary: Mozilla Runtime Environment Url: http://www.mozilla.org/ Group: Productivity/Other @@ -58,12 +58,10 @@ Patch4: mozilla-nongnome-proxies.patch Patch5: mozilla-prefer_plugin_pref.patch Patch9: mozilla-language.patch -Patch10: mozilla-cairo-return.patch Patch11: mozilla-ntlm-full-path.patch Patch12: mozilla-dump_syms-static.patch Patch13: mozilla-sle11.patch Patch14: mozilla-linux3.patch -Patch15: mozilla-curl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -180,14 +178,12 @@ %patch4 -p1 %patch5 -p1 %patch9 -p1 -%patch10 -p1 %patch11 -p1 %patch12 -p1 %if %suse_version < 1120 %patch13 -p1 %endif %patch14 -p1 -%patch15 -p1 %build # no need to add build time to binaries