diff --git a/thunderbird-install-dir.patch b/thunderbird-install-dir.patch index 931e7ad..96342b9 100644 --- a/thunderbird-install-dir.patch +++ b/thunderbird-install-dir.patch @@ -1,7 +1,7 @@ -diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/config/autoconf.mk.in ---- thunderbird-7.0/comm-beta/config/autoconf.mk.in.old 2011-09-05 12:24:29.000000000 +0200 -+++ thunderbird-7.0/comm-beta/config/autoconf.mk.in 2011-09-12 12:21:09.304918326 +0200 -@@ -65,7 +65,7 @@ datadir = @datadir@ +diff -up thunderbird-16.0/comm-release/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/config/autoconf.mk.in +--- thunderbird-16.0/comm-release/config/autoconf.mk.in.dir 2012-10-05 23:20:26.000000000 +0200 ++++ thunderbird-16.0/comm-release/config/autoconf.mk.in 2012-10-09 12:57:24.290767832 +0200 +@@ -36,7 +36,7 @@ datadir = @datadir@ mandir = @mandir@ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) @@ -10,27 +10,28 @@ diff -up thunderbird-7.0/comm-beta/config/autoconf.mk.in.old thunderbird-7.0/com sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) MOZDEPTH = $(DEPTH)/mozilla -diff -up thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in ---- thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in.old 2011-09-05 12:38:22.000000000 +0200 -+++ thunderbird-7.0/comm-beta/mozilla/config/autoconf.mk.in 2011-09-12 12:21:24.192991555 +0200 -@@ -68,7 +68,7 @@ datadir = @datadir@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +diff -up thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/config/autoconf.mk.in +diff -up thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk +--- thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk.dir 2012-10-05 23:27:15.000000000 +0200 ++++ thunderbird-16.0/comm-release/mozilla/config/baseconfig.mk 2012-10-09 13:01:32.269317094 +0200 +@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1 --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + DIST = $(DEPTH)/dist - DIST = $(DEPTH)/dist -diff -up thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in ---- thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in.old 2011-09-05 12:38:30.000000000 +0200 -+++ thunderbird-7.0/comm-beta/mozilla/js/src/config/autoconf.mk.in 2011-09-12 12:21:37.409056596 +0200 -@@ -61,7 +61,7 @@ libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ +diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in.dir thunderbird-16.0/comm-release/mozilla/js/src/config/autoconf.mk.in +diff -up thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk +--- thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk.dir 2012-10-05 23:27:30.000000000 +0200 ++++ thunderbird-16.0/comm-release/mozilla/js/src/config/baseconfig.mk 2012-10-09 13:02:00.885495014 +0200 +@@ -1,6 +1,6 @@ + INCLUDED_AUTOCONF_MK = 1 --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/thunderbird.spec b/thunderbird.spec index a61f627..f1fa562 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -74,7 +74,7 @@ Patch104: xulrunner-10.0-gcc47.patch Patch200: thunderbird-8.0-enable-addons.patch # PPC fixes -Patch300: xulrunner-852698.patch +Patch300: xulrunner-16.0-jemalloc-ppc.patch Patch301: rhbz-855923.patch %if %{official_branding} diff --git a/xulrunner-852698.patch b/xulrunner-16.0-jemalloc-ppc.patch similarity index 59% rename from xulrunner-852698.patch rename to xulrunner-16.0-jemalloc-ppc.patch index 34aa147..e4fca79 100644 --- a/xulrunner-852698.patch +++ b/xulrunner-16.0-jemalloc-ppc.patch @@ -1,8 +1,8 @@ -Index: comm-release/mozilla/memory/jemalloc/jemalloc.c +Index: xulrunner-11.0/mozilla-release/memory/jemalloc/jemalloc.c =================================================================== ---- comm-release.orig/mozilla/memory/jemalloc/jemalloc.c -+++ comm-release/mozilla/memory/jemalloc/jemalloc.c -@@ -1091,7 +1091,9 @@ static unsigned ncpus; +--- a/mozilla/memory/mozjemalloc/jemalloc.c ++++ b/mozilla/memory/mozjemalloc/jemalloc.c +@@ -1089,7 +1089,9 @@ static unsigned ncpus; * controlling the malloc behavior are defined as compile-time constants * for best performance and cannot be altered at runtime. */