diff options
| -rw-r--r-- | mozilla-706724.patch | 12 | ||||
| -rw-r--r-- | mozilla-722127.patch | 74 | ||||
| -rw-r--r-- | wmclass.patch | 29 | ||||
| -rw-r--r-- | xulrunner-mozconfig | 3 | ||||
| -rw-r--r-- | xulrunner.spec | 49 |
5 files changed, 25 insertions, 142 deletions
diff --git a/mozilla-706724.patch b/mozilla-706724.patch deleted file mode 100644 index b0792ed..0000000 --- a/mozilla-706724.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mozilla-beta/ipc/chromium/src/base/file_util.cc.old mozilla-beta/ipc/chromium/src/base/file_util.cc ---- mozilla-beta/ipc/chromium/src/base/file_util.cc.old 2012-01-25 13:48:11.000000000 +0100 -+++ mozilla-beta/ipc/chromium/src/base/file_util.cc 2012-01-25 13:52:25.096659244 +0100 -@@ -8,7 +8,7 @@ - #include <io.h> - #endif - #include <stdio.h> --#if defined(ANDROID) -+#if defined(ANDROID) || defined(OS_POSIX) - #include <unistd.h> - #endif - diff --git a/mozilla-722127.patch b/mozilla-722127.patch deleted file mode 100644 index f86fcae..0000000 --- a/mozilla-722127.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure.in ---- xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 2012-03-09 01:39:31.000000000 +0100 -+++ xulrunner-11.0/mozilla-beta/configure.in 2012-03-09 15:03:51.246031329 +0100 -@@ -5710,20 +5710,20 @@ if test -n "$MOZ_WEBM"; then - [MOZ_NATIVE_LIBVPX_DEC_TEST=1], - ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) - if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then -- AC_MSG_CHECKING([for libvpx version >= v0.9.7]) -- dnl We need at least v0.9.7 to fix several crash bugs (for which we -- dnl had local patches prior to v0.9.7). -+ AC_MSG_CHECKING([for libvpx version >= v1.0.0]) -+ dnl We need at least v1.0.0 to fix several crash bugs (for which we -+ dnl had local patches prior to v1.0.0). - dnl - dnl This is a terrible test for the library version, but we don't - dnl have a good one. There is no version number in a public header, - dnl and testing the headers still doesn't guarantee we link against - dnl the right version. While we could call vpx_codec_version() at - dnl run-time, that would break cross-compiling. There are no -- dnl additional exported symbols between the v0.9.7 release and the -- dnl v0.9.6 one to check for. -+ dnl additional exported decoder symbols between the v1.0.0 release -+ dnl and the v0.9.7 one to check for. - AC_TRY_COMPILE([ - #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) -+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) - #error "test failed." - #endif - ], -@@ -5734,7 +5734,7 @@ if test -n "$MOZ_WEBM"; then - MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" - MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], - [AC_MSG_RESULT([no]) -- AC_MSG_ERROR([--with-system-libvpx requested but it is not v0.9.7 or later])]) -+ AC_MSG_ERROR([--with-system-libvpx requested but it is not v1.0.0 or later])]) - fi - CFLAGS=$_SAVE_CFLAGS - LDFLAGS=$_SAVE_LDFLAGS -diff -up xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure ---- xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 2012-03-09 01:58:50.000000000 +0100 -+++ xulrunner-11.0/mozilla-beta/configure 2012-03-09 15:15:42.537585632 +0100 -@@ -17761,14 +17761,14 @@ else - fi - - if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then -- echo $ac_n "checking for libvpx version >= v0.9.7""... $ac_c" 1>&6 --echo "configure:17766: checking for libvpx version >= v0.9.7" >&5 -+ echo $ac_n "checking for libvpx version >= v1.0.0""... $ac_c" 1>&6 -+echo "configure:17766: checking for libvpx version >= v1.0.0" >&5 - cat > conftest.$ac_ext <<EOF - #line 17768 "configure" - #include "confdefs.h" - - #include <vpx/vpx_decoder.h> -- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) -+ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) - #error "test failed." - #endif - -@@ -17791,7 +17791,7 @@ else - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 -- { echo "configure: error: --with-system-libvpx requested but it is not v0.9.7 or later" 1>&2; exit 1; } -+ { echo "configure: error: --with-system-libvpx requested but it is not v1.0.0 or later" 1>&2; exit 1; } - fi - rm -f conftest* - fi -@@ -25794,4 +25794,3 @@ if cmp -s config/autoconf.mk config/auto - else - rm -f config/autoconf.mk.orig 2> /dev/null - fi -- diff --git a/wmclass.patch b/wmclass.patch deleted file mode 100644 index 5fe76ac..0000000 --- a/wmclass.patch +++ /dev/null @@ -1,29 +0,0 @@ -# -# Online Desktop expects WMCLASS to match the .desktop file -# Since renaming the .desktop file is bad, work around this here -# - -diff -up ./widget/src/gtk2/nsWindow.cpp.wmclass ./widget/src/gtk2/nsWindow.cpp ---- ./widget/src/gtk2/nsWindow.cpp.wmclass 2010-10-25 11:33:21.649433261 -0700 -+++ ./widget/src/gtk2/nsWindow.cpp 2010-10-25 11:36:19.864431870 -0700 -@@ -3738,6 +3738,10 @@ nsWindow::Create(nsIWidget *aPare - GetBrandName(brandName); - NS_ConvertUTF16toUTF8 cBrand(brandName); - -+ if (brandName.EqualsLiteral("Minefield")) { -+ cBrand.Assign("Firefox"); -+ } -+ - if (mWindowType == eWindowType_dialog) { - mShell = gtk_window_new(GTK_WINDOW_TOPLEVEL); - SetDefaultIcon(); -@@ -4109,6 +4113,9 @@ nsWindow::SetWindowClass(const nsAString - #ifdef MOZ_X11 - nsXPIDLString brandName; - GetBrandName(brandName); -+ if (brandName.EqualsLiteral("Minefield")) { -+ brandName.AssignLiteral("Firefox"); -+ } - - XClassHint *class_hint = XAllocClassHint(); - if (!class_hint) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index b58f39e..bed6ee5 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -9,14 +9,11 @@ ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell -ac_add_options --enable-system-cairo ac_add_options --with-pthreads ac_add_options --disable-strip ac_add_options --disable-tests ac_add_options --disable-mochitest ac_add_options --disable-installer -ac_add_options --disable-debug -ac_add_options --enable-optimize ac_add_options --enable-xinerama ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-pango diff --git a/xulrunner.spec b/xulrunner.spec index a565f63..e0ddec5 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -1,21 +1,22 @@ # Use system nspr/nss? %if 0%{?fedora} < 15 %define system_nss 0 -%define system_cairo 0 %define system_vpx 0 %else %define system_nss 1 -%define system_cairo 1 %define system_vpx 1 %endif # Use system sqlite? -%if 0%{?fedora} <= 15 +%if 0%{?fedora} <= 17 %define system_sqlite 0 %else %define system_sqlite 1 %endif +# Use system cairo? +%define system_cairo 0 + %global shortname xulrunner # Build as a debug package? @@ -43,7 +44,7 @@ # alpha_version should be set to the alpha number if using an alpha, 0 otherwise # beta_version should be set to the beta number if using a beta, 0 otherwise # rc_version should be set to the RC number if using an RC, 0 otherwise -%global gecko_dir_ver 11 +%global gecko_dir_ver 12 %global alpha_version 0 %global beta_version 0 %global rc_version 0 @@ -80,7 +81,7 @@ Summary: XUL Runtime for Gecko Applications Name: %{shortname}%{gecko_dir_ver} -Version: 11.0 +Version: 12.0 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -102,17 +103,12 @@ Patch17: xulrunner-10.0-gcc47.patch # Fedora specific patches Patch20: mozilla-193-pkgconfig.patch -Patch23: wmclass.patch Patch24: crashreporter-remove-static.patch # Upstream patches # https://bugzilla.mozilla.org/show_bug.cgi?id=707993 Patch39: xulrunner-8.0-fix-maemo-checks-in-npapi.patch -Patch42: mozilla-706724.patch Patch43: mozilla-file.patch -# Needed to detect/use libvpx-1.0.0 -# https://bugzilla.mozilla.org/show_bug.cgi?id=722127 -Patch44: mozilla-722127.patch Patch46: mozilla-724615.patch Patch47: mozilla-691898.patch @@ -123,7 +119,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} %endif -%if %{system_cairo} +%if %{?system_cairo} BuildRequires: cairo-devel >= %{cairo_version} %endif BuildRequires: libpng-devel @@ -160,13 +156,10 @@ Requires: nss >= %{nss_version} %endif Provides: gecko-libs = %{gecko_verrel} Provides: gecko-libs%{?_isa} = %{gecko_verrel} -Obsoletes: xulrunner2 -Obsoletes: xulrunner5 -Obsoletes: xulrunner6 -Obsoletes: xulrunner7 Obsoletes: xulrunner8 Obsoletes: xulrunner9 Obsoletes: xulrunner10 +Obsoletes: xulrunner11 %if %{?system_sqlite} BuildRequires: sqlite-devel >= %{sqlite_version} @@ -186,6 +179,10 @@ Group: Development/Libraries Obsoletes: mozilla-devel < 1.9 Obsoletes: firefox-devel < 2.1 Obsoletes: xulrunner-devel-unstable +Obsoletes: xulrunner8-devel +Obsoletes: xulrunner9-devel +Obsoletes: xulrunner10-devel +Obsoletes: xulrunner11-devel Provides: gecko-devel = %{gecko_verrel} Provides: gecko-devel%{?_isa} = %{gecko_verrel} Provides: gecko-devel-unstable = %{gecko_verrel} @@ -196,7 +193,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: nspr-devel >= %{nspr_version} Requires: nss-devel >= %{nss_version} %endif -%if %{system_cairo} +%if %{?system_cairo} # Library requirements (cairo-tee >= 1.10) Requires: cairo-devel >= %{cairo_version} %endif @@ -272,23 +269,15 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \ %patch17 -p1 -b .gcc47 %patch20 -p2 -b .pk -%patch23 -p1 -b .wmclass %patch24 -p1 -b .static %patch39 -p1 -b .707993 -%patch42 -p1 -b .706724 %patch43 -p1 -b .file -%if %{system_vpx} -%patch44 -p2 -b .vpx1.0.0 -%endif %patch46 -p1 -b .724615 #%patch47 -p1 -b .691898 %{__rm} -f .mozconfig %{__cat} %{SOURCE10} \ -%if ! %{system_cairo} - | grep -v enable-system-cairo \ -%endif %ifarch %{ix86} x86_64 | grep -v disable-necko-wifi \ %endif @@ -317,6 +306,12 @@ echo "ac_add_options --enable-system-sqlite" >> .mozconfig echo "ac_add_options --disable-system-sqlite" >> .mozconfig %endif +%if %{?system_cairo} +echo "ac_add_options --enable-system-cairo" >> .mozconfig +%else +echo "ac_add_options --disable-system-cairo" >> .mozconfig +%endif + %if %{?debug_build} echo "ac_add_options --enable-debug" >> .mozconfig echo "ac_add_options --disable-optimize" >> .mozconfig @@ -568,6 +563,12 @@ fi #--------------------------------------------------------------------- %changelog +* Sun Apr 29 2012 Remi Collet <RPMS@FamilleCollet.com> - 12.0-1 +- Sync with rawhide, update to 12.0 + +* Tue Apr 24 2012 Martin Stransky <stransky@redhat.com> - 12.0-1 +- Update to 12.0 + * Sat Mar 17 2012 Remi Collet <RPMS@FamilleCollet.com> - 11.0-1 - update to 11.0, sync with rawhide |