rpms/thunderbird-enigmail/F-16 mozilla-696393.patch, NONE,
1.1 thunderbird-8.0-enable-addons.patch, NONE,
1.1 xulrunner-9.0-secondary-ipc.patch, NONE, 1.1 .cvsignore,
1.13, 1.14 sources, 1.14, 1.15 thunderbird-enigmail.spec, 1.17,
1.18 thunderbird-mozconfig, 1.5,
1.6 xulrunner-6.0-secondary-ipc.patch, 1.1,
NONE xulrunner-install.patch, 1.1, NONE
Remi Collet
remi at rpmfusion.org
Wed Dec 21 23:07:51 CET 2011
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7853
Modified Files:
.cvsignore sources thunderbird-enigmail.spec
thunderbird-mozconfig
Added Files:
mozilla-696393.patch thunderbird-8.0-enable-addons.patch
xulrunner-9.0-secondary-ipc.patch
Removed Files:
xulrunner-6.0-secondary-ipc.patch xulrunner-install.patch
Log Message:
update to 1.3.4 for thunderbird 9.4
mozilla-696393.patch:
xptcinvoke_linux_s390.cpp | 49 +++++++------------------------------------
xptcinvoke_linux_s390x.cpp | 51 +++++++--------------------------------------
2 files changed, 18 insertions(+), 82 deletions(-)
--- NEW FILE mozilla-696393.patch ---
diff -up xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp.696393 xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp
--- xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp.696393 2011-12-07 07:28:08.000000000 +0100
+++ xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp 2011-12-09 15:06:10.584998410 +0100
@@ -200,52 +200,21 @@ invoke_copy_to_stack(PRUint32 paramCount
}
}
+typedef nsresult (*vtable_func)(nsISupports *, PRUint32, PRUint32, PRUint32, PRUint32, double, double);
+
EXPORT_XPCOM_API(nsresult)
NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
PRUint32 paramCount, nsXPTCVariant* params)
{
- PRUint32 *vtable = *(PRUint32 **)that;
- PRUint32 method = vtable[methodIndex];
+ vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
+ vtable_func method = vtable[methodIndex];
PRUint32 overflow = invoke_count_words (paramCount, params);
- PRUint32 result;
-
- __asm__ __volatile__
- (
- "lr 7,15\n\t"
- "ahi 7,-32\n\t"
-
- "lr 3,%3\n\t"
- "sll 3,2\n\t"
- "lcr 3,3\n\t"
- "l 2,0(15)\n\t"
- "la 15,0(3,7)\n\t"
- "st 2,0(15)\n\t"
+ PRUint32 *stack_space = reinterpret_cast<PRUint32 *>(__builtin_alloca((overflow + 8 /* 4 32-bits gpr + 2 64-bits fpr */) * 4));
- "lr 2,%1\n\t"
- "lr 3,%2\n\t"
- "la 4,96(15)\n\t"
- "lr 5,%3\n\t"
- "basr 14,%4\n\t"
+ invoke_copy_to_stack(paramCount, params, stack_space, overflow);
- "lr 2,%5\n\t"
- "ld 0,112(7)\n\t"
- "ld 2,120(7)\n\t"
- "lm 3,6,96(7)\n\t"
- "basr 14,%6\n\t"
+ PRUint32 *d_gpr = stack_space + overflow;
+ double *d_fpr = reinterpret_cast<double *>(d_gpr + 4);
- "la 15,32(7)\n\t"
-
- "lr %0,2\n\t"
- : "=r" (result)
- : "r" (paramCount),
- "r" (params),
- "r" (overflow),
- "a" (invoke_copy_to_stack),
- "a" (that),
- "a" (method)
- : "2", "3", "4", "5", "6", "7", "14", "cc", "memory", "%f0", "%f2"
- );
-
- return result;
+ return method(that, d_gpr[0], d_gpr[1], d_gpr[2], d_gpr[3], d_fpr[0], d_fpr[1]);
}
-
diff -up xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp.696393 xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp
--- xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp.696393 2011-12-07 07:28:08.000000000 +0100
+++ xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp 2011-12-09 15:07:07.609097348 +0100
@@ -194,55 +194,22 @@ invoke_copy_to_stack(PRUint32 paramCount
}
}
+typedef nsresult (*vtable_func)(nsISupports *, PRUint64, PRUint64, PRUint64, PRUint64, double, double, double, double);
+
EXPORT_XPCOM_API(nsresult)
NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
PRUint32 paramCount, nsXPTCVariant* params)
{
- PRUint64 *vtable = *(PRUint64 **)that;
- PRUint64 method = vtable[methodIndex];
+ vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
+ vtable_func method = vtable[methodIndex];
PRUint64 overflow = invoke_count_words (paramCount, params);
+ PRUint64 *stack_space = reinterpret_cast<PRUint64 *>(__builtin_alloca((overflow + 8 /* 4 64-bits gpr + 4 64-bits fpr */) * 8));
PRUint64 result;
- __asm__ __volatile__
- (
- "lgr 7,15\n\t"
- "aghi 7,-64\n\t"
-
- "lgr 3,%3\n\t"
- "sllg 3,3,3\n\t"
- "lcgr 3,3\n\t"
- "lg 2,0(15)\n\t"
- "la 15,0(3,7)\n\t"
- "stg 2,0(15)\n\t"
-
- "lgr 2,%1\n\t"
- "lgr 3,%2\n\t"
- "la 4,160(15)\n\t"
- "lgr 5,%3\n\t"
- "basr 14,%4\n\t"
+ invoke_copy_to_stack(paramCount, params, stack_space, overflow);
- "lgr 2,%5\n\t"
- "ld 0,192(7)\n\t"
- "ld 2,200(7)\n\t"
- "ld 4,208(7)\n\t"
- "ld 6,216(7)\n\t"
- "lmg 3,6,160(7)\n\t"
- "basr 14,%6\n\t"
+ PRUint64 *d_gpr = stack_space + overflow;
+ double *d_fpr = reinterpret_cast<double *>(d_gpr + 4);
- "la 15,64(7)\n\t"
-
- "lgr %0,2\n\t"
- : "=r" (result)
- : "r" ((PRUint64)paramCount),
- "r" (params),
- "r" (overflow),
- "a" (invoke_copy_to_stack),
- "a" (that),
- "a" (method)
- : "2", "3", "4", "5", "6", "7", "14", "cc", "memory",
- "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7"
- );
-
- return result;
+ return method(that, d_gpr[0], d_gpr[1], d_gpr[2], d_gpr[3], d_fpr[0], d_fpr[1], d_fpr[2], d_fpr[3]);
}
-
thunderbird-8.0-enable-addons.patch:
mail/app/profile/all-thunderbird.js | 2 +-
mozilla/toolkit/mozapps/extensions/XPIProvider.jsm | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE thunderbird-8.0-enable-addons.patch ---
diff -up comm-release/mail/app/profile/all-thunderbird.js.addons comm-release/mail/app/profile/all-thunderbird.js
--- comm-release/mail/app/profile/all-thunderbird.js.addons 2011-11-15 10:36:03.868551158 +0100
+++ comm-release/mail/app/profile/all-thunderbird.js 2011-11-15 10:36:20.555397903 +0100
@@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul
// Disable add-ons installed into the shared user and shared system areas by
// default. This does not include the application directory. See the SCOPE
// constants in AddonManager.jsm for values to use here
-pref("extensions.autoDisableScopes", 15);
+pref("extensions.autoDisableScopes", 0);
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
diff -up comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm
--- comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2011-11-15 11:15:06.518905245 +0100
+++ comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm 2011-11-15 11:15:40.399934236 +0100
@@ -1591,8 +1591,8 @@ var XPIProvider = {
this.showUpgradeUI();
flushCaches = true;
}
- else if (aAppChanged === undefined) {
- // For new profiles we will never need to show the add-on selection UI
+ else {
+ // For all profiles we will never need to show the add-on selection UI
Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
}
xulrunner-9.0-secondary-ipc.patch:
base/data_pack.cc | 9 +--------
build/build_config.h | 14 +++++++++++++-
chrome/common/ipc_message_utils.h | 3 ++-
3 files changed, 16 insertions(+), 10 deletions(-)
--- NEW FILE xulrunner-9.0-secondary-ipc.patch ---
diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc
--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
+++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc 2011-12-09 14:35:50.397220865 +0100
@@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path
bool DataPack::Get(uint32_t resource_id, StringPiece* data) {
// It won't be hard to make this endian-agnostic, but it's not worth
// bothering to do right now.
-#if defined(__BYTE_ORDER)
- // Linux check
- COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN,
- datapack_assumes_little_endian);
-#elif defined(__BIG_ENDIAN__)
- // Mac check
- #error DataPack assumes little endian
-#endif
+#warning DoTheRightThingMakingThisEndianAgnostic!
DataPackEntry* target = reinterpret_cast<DataPackEntry*>(
bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h
--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
+++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h 2011-12-09 14:39:44.922231601 +0100
@@ -59,11 +59,23 @@
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
#define WCHAR_T_IS_UNSIGNED 1
+#elif defined(__powerpc64__)
+#define ARCH_CPU_PPC64 1
+#define ARCH_CPU_64_BITS 1
#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
-#elif defined(__sparc64__)
+#elif defined(__s390x__)
+#define ARCH_CPU_S390X 1
+#define ARCH_CPU_64_BITS 1
+#elif defined(__s390__)
+#define ARCH_CPU_S390 1
+#define ARCH_CPU_32_BITS 1
+#elif defined(__sparc__) && !defined(__arch64)
#define ARCH_CPU_SPARC 1
+#define ARCH_CPU_32_BITS 1
+#elif defined(__sparc__) && defined(__arch64)
+#define ARCH_CPU_SPARC64 1
#define ARCH_CPU_64_BITS 1
#else
#error Please add support for your architecture in build/build_config.h
diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h
--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
+++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h 2011-12-09 14:40:59.602679278 +0100
@@ -195,7 +195,8 @@ struct ParamTraits<unsigned long long> {
};
#endif
-#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
+// Although s390 is a 32-bit system it defines size_t as unsigned long
+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && (defined(ARCH_CPU_64_BITS) || defined(ARCH_CPU_S390))))
// There size_t is a synonym for |unsigned long| ...
template <>
struct ParamTraits<size_t> {
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 12 Nov 2011 18:26:36 -0000 1.13
+++ .cvsignore 21 Dec 2011 22:07:51 -0000 1.14
@@ -1,2 +1,2 @@
-enigmail-1.3.3.tar.gz
-thunderbird-8.0.source.tar.bz2
+enigmail-1.3.4.tar.gz
+thunderbird-9.0.source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 12 Nov 2011 18:26:36 -0000 1.14
+++ sources 21 Dec 2011 22:07:51 -0000 1.15
@@ -1,2 +1,2 @@
-f62cf6b574ed34a550069ab339d15c59 enigmail-1.3.3.tar.gz
-332f60036aebdce7dec6ee2b1af4941d thunderbird-8.0.source.tar.bz2
+2b5f188791811d248b6ff1fc51a5806a enigmail-1.3.4.tar.gz
+681bdf6362945b59b2bec23f8aecc7e7 thunderbird-9.0.source.tar.bz2
Index: thunderbird-enigmail.spec
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-enigmail.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- thunderbird-enigmail.spec 12 Nov 2011 20:46:20 -0000 1.17
+++ thunderbird-enigmail.spec 21 Dec 2011 22:07:51 -0000 1.18
@@ -1,13 +1,19 @@
%define nspr_version 4.8.8
-%define nss_version 3.12.10
+%define nss_version 3.13.1
%define cairo_version 1.10.0
%define freetype_version 2.1.9
-%define sqlite_version 3.6.22
+%define sqlite_version 3.7.7.1
%define libnotify_version 0.4
%define build_langpacks 1
%define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global thunver 8.0
+%if 0%{?fedora} <= 15
+%define system_sqlite 0
+%else
+%define system_sqlite 1
+%endif
+
+%global thunver 9.0
# The tarball is pretty inconsistent with directory structure.
# Sometimes there is a top level directory. That goes here.
@@ -25,11 +31,11 @@
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
-Version: 1.3.3
+Version: 1.3.4
%if 0%{?prever:1}
Release: 0.1.%{prever}%{?dist}
%else
-Release: 1%{?dist}.1
+Release: 1%{?dist}
%endif
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
@@ -57,13 +63,15 @@
# Mozilla (XULRunner) patches
Patch0: thunderbird-install-dir.patch
Patch7: crashreporter-remove-static.patch
-Patch8: xulrunner-6.0-secondary-ipc.patch
-Patch9: mozilla-670719.patch
+Patch8: xulrunner-9.0-secondary-ipc.patch
Patch10: xulrunner-2.0-network-link-service.patch
Patch11: xulrunner-2.0-NetworkManager09.patch
+Patch12: mozilla-696393.patch
# Build patches
-Patch100: xulrunner-install.patch
+
+# Linux specific
+Patch200: thunderbird-8.0-enable-addons.patch
%if %{official_branding}
@@ -95,7 +103,9 @@
BuildRequires: libXt-devel
BuildRequires: libXrender-devel
BuildRequires: hunspell-devel
+%if %{?system_sqlite}
BuildRequires: sqlite-devel >= %{sqlite_version}
+%endif
BuildRequires: startup-notification-devel
BuildRequires: alsa-lib-devel
BuildRequires: autoconf213
@@ -136,31 +146,36 @@
cd mozilla
%patch7 -p2 -b .static
%patch8 -p2 -b .secondary-ipc
-%patch9 -p1 -b .moz670719
%patch10 -p1 -b .link-service
%patch11 -p1 -b .NetworkManager09
-%patch100 -p2 -b .install
+%patch12 -p2 -b .696393
cd ..
+%patch200 -p1 -b .addons
+
%if %{official_branding}
# Required by Mozilla Corporation
%else
-# Not yet approved by Mozillla Corporation
+# Not yet approved by Mozilla Corporation
%endif
%{__rm} -f .mozconfig
-# From Thunderbnird
+# From Thunderbird
%{__cp} %{SOURCE10} .mozconfig
%if %{official_branding}
%{__cat} %{SOURCE11} >> .mozconfig
%endif
-# ===== Enigmail work =====
-echo 'ac_add_options --enable-chrome-format=jar' >>.mozconfig
+%if %{?system_sqlite}
+echo "ac_add_options --enable-system-sqlite" >> .mozconfig
+%else
+echo "ac_add_options --disable-system-sqlite" >> .mozconfig
+%endif
+# ===== Enigmail work =====
%if 0%{?CVS}
mkdir mailnews/extensions/enigmail
tar xzf %{SOURCE100} -C mailnews/extensions/enigmail
@@ -255,6 +270,9 @@
#===============================================================================
%changelog
+* Wed Dec 21 2011 Remi Collet <remi at fedoraproject.org> 1.3.4-1
+- Enigmail 1.3.4 for Thunderbird 9.0
+
* Sat Nov 12 2011 Remi Collet <remi at fedoraproject.org> 1.3.3-1
- Enigmail 1.3.3 for Thunderbird 8.0
Index: thunderbird-mozconfig
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/F-16/thunderbird-mozconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- thunderbird-mozconfig 17 Jul 2011 20:43:47 -0000 1.5
+++ thunderbird-mozconfig 21 Dec 2011 22:07:51 -0000 1.6
@@ -29,8 +29,9 @@
ac_add_options --disable-crashreporter
ac_add_options --disable-necko-wifi
ac_add_options --disable-updater
-#ac_add_options --enable-static
ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+ac_add_options --disable-gnomevfs
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
--- xulrunner-6.0-secondary-ipc.patch DELETED ---
--- xulrunner-install.patch DELETED ---
More information about the rpmfusion-commits
mailing list