enigmail: sync patches, move to /usr/lib64/mozilla/extensions

8 files changed, 39 insertions, 235 deletions

diff --git a/remove-static.patch b/remove-static.patch
new file mode 100644
index 0000000..9cc94fb
--- /dev/null
+++ b/remove-static.patch
@@ -0,0 +1,11 @@
+diff -up comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+--- comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in.static	2010-06-23 19:47:11.000000000 +0200
++++ comm-1.9.2/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in	2010-07-12 15:51:41.000000000 +0200
+@@ -64,6 +64,6 @@ FORCE_USE_PIC = 1
+ 
+ #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
+ # due to them having an older libstdc++
+-HOST_LDFLAGS += -static
++#HOST_LDFLAGS += -static
+ 
+ include $(topsrcdir)/config/rules.mk
diff --git a/thunderbird-3.0-ppc64.patch b/thunderbird-3.0-ppc64.patch
deleted file mode 100644
index 394524d..0000000
--- a/thunderbird-3.0-ppc64.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in.ppc64	2009-07-21 14:01:25.000000000 +0200
-+++ configure.in	2009-07-21 14:01:51.000000000 +0200
-@@ -1451,7 +1451,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+x86_64 | ia64 | ppc64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- esac
-@@ -4148,6 +4148,9 @@
- if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then
-     TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}"
- fi
-+echo CPU_ARCH=${CPU_ARCH}
-+echo TARGET_COMPILER_ABI=${TARGET_COMPILER_ABI}
-+echo TARGET_XPCOM_ABI=$TARGET_XPCOM_ABI
- 
- dnl Mozilla specific options
- dnl ========================================================
---- mozilla/configure.in.ppc64	2009-07-15 22:36:48.000000000 +0200
-+++ mozilla/configure.in	2009-07-21 13:57:46.000000000 +0200
-@@ -1317,7 +1317,7 @@
-     CPU_ARCH=sparc
-     ;;
- 
--x86_64 | ia64)
-+x86_64 | ia64 | ppc64)
-     CPU_ARCH="$OS_TEST"
-     ;;
- esac
-@@ -4033,6 +4033,9 @@
- if test -n "${CPU_ARCH}" -a -n "${TARGET_COMPILER_ABI}"; then
-     TARGET_XPCOM_ABI="${CPU_ARCH}-${TARGET_COMPILER_ABI}"
- fi
-+echo CPU_ARCH=${CPU_ARCH}
-+echo TARGET_COMPILER_ABI=${TARGET_COMPILER_ABI}
-+echo TARGET_XPCOM_ABI=$TARGET_XPCOM_ABI
- 
- dnl Mozilla specific options
- dnl ========================================================
diff --git a/thunderbird-clipboard-crash.patch b/thunderbird-clipboard-crash.patch
deleted file mode 100644
index d2861b8..0000000
--- a/thunderbird-clipboard-crash.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -r 7f1f309a34f8 widget/src/gtk2/nsClipboard.cpp
---- a/mozilla/widget/src/gtk2/nsClipboard.cpp	Thu Oct 22 12:45:52 2009 +0800
-+++ b/mozilla/widget/src/gtk2/nsClipboard.cpp	Fri Nov 13 11:19:27 2009 +0100
-@@ -424,25 +424,25 @@ nsClipboard::HasDataMatchingFlavors(cons
-     for (PRUint32 i = 0; i < aLength && !*_retval; i++) {
-         // We special case text/unicode here.
-         if (!strcmp(aFlavorList[i], kUnicodeMime) && 
-             gtk_selection_data_targets_include_text(selection_data)) {
-             *_retval = PR_TRUE;
-             break;
-         }
- 
-         for (PRInt32 j = 0; j < n_targets; j++) {
-             gchar *atom_name = gdk_atom_name(targets[j]);
--            if (!strcmp(atom_name, aFlavorList[i]))
-+            if (!g_strcmp0(atom_name, aFlavorList[i]))
-                 *_retval = PR_TRUE;
- 
-             // X clipboard wants image/jpeg, not image/jpg
--            if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg"))
-+            if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg"))
-                 *_retval = PR_TRUE;
- 
-             g_free(atom_name);
- 
-             if (*_retval)
-                 break;
-         }
-     }
-     gtk_selection_data_free(selection_data);
-     g_free(targets);
-diff -r 7f1f309a34f8 widget/src/gtk2/nsDragService.cpp
---- a/mozilla/widget/src/gtk2/nsDragService.cpp	Thu Oct 22 12:45:52 2009 +0800
-+++ b/mozilla/widget/src/gtk2/nsDragService.cpp	Fri Nov 13 11:19:27 2009 +0100
-@@ -824,50 +824,47 @@ nsDragService::IsDataFlavorSupported(con
- 
-     // check the target context vs. this flavor, one at a time
-     GList *tmp;
-     for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) {
-         /* Bug 331198 */
-         GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data);
-         gchar *name = NULL;
-         name = gdk_atom_name(atom);
-         PR_LOG(sDragLm, PR_LOG_DEBUG,
-                ("checking %s against %s\n", name, aDataFlavor));
--        if (name && (strcmp(name, aDataFlavor) == 0)) {
-+        if (g_strcmp0(name, aDataFlavor) == 0) {
-             PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n"));
-             *_retval = PR_TRUE;
-         }
-         // check for automatic text/uri-list -> text/x-moz-url mapping
-         if (*_retval == PR_FALSE && 
--            name &&
--            (strcmp(name, gTextUriListType) == 0) &&
--            (strcmp(aDataFlavor, kURLMime) == 0)) {
-+            (g_strcmp0(name, gTextUriListType) == 0) &&
-+            (g_strcmp0(aDataFlavor, kURLMime) == 0)) {
-             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                    ("good! ( it's text/uri-list and \
-                    we're checking against text/x-moz-url )\n"));
-             *_retval = PR_TRUE;
-         }
-         // check for automatic _NETSCAPE_URL -> text/x-moz-url mapping
-         if (*_retval == PR_FALSE && 
--            name &&
--            (strcmp(name, gMozUrlType) == 0) &&
--            (strcmp(aDataFlavor, kURLMime) == 0)) {
-+            (g_strcmp0(name, gMozUrlType) == 0) &&
-+            (g_strcmp0(aDataFlavor, kURLMime) == 0)) {
-             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                    ("good! ( it's _NETSCAPE_URL and \
-                    we're checking against text/x-moz-url )\n"));
-             *_retval = PR_TRUE;
-         }
-         // check for auto text/plain -> text/unicode mapping
-         if (*_retval == PR_FALSE && 
--            name &&
--            (strcmp(name, kTextMime) == 0) &&
--            ((strcmp(aDataFlavor, kUnicodeMime) == 0) ||
--             (strcmp(aDataFlavor, kFileMime) == 0))) {
-+            (g_strcmp0(name, kTextMime) == 0) &&
-+            ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) ||
-+             (g_strcmp0(aDataFlavor, kFileMime) == 0))) {
-             PR_LOG(sDragLm, PR_LOG_DEBUG,
-                    ("good! ( it's text plain and we're checking \
-                    against text/unicode or application/x-moz-file)\n"));
-             *_retval = PR_TRUE;
-         }
-         g_free(name);
-     }
-     return NS_OK;
- }
- 
-@@ -974,21 +971,21 @@ nsDragService::IsTargetContextList(void)
- 
-     GList *tmp;
- 
-     // walk the list of context targets and see if one of them is a list
-     // of items.
-     for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) {
-         /* Bug 331198 */
-         GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data);
-         gchar *name = NULL;
-         name = gdk_atom_name(atom);
--        if (strcmp(name, gMimeListType) == 0)
-+        if (g_strcmp0(name, gMimeListType) == 0)
-             retval = PR_TRUE;
-         g_free(name);
-         if (retval)
-             break;
-     }
-     return retval;
- }
- 
- // Maximum time to wait for a "drag_received" arrived, in microseconds
- #define NS_DND_TIMEOUT 500000
diff --git a/thunderbird-debuginfo-fix-include.patch b/thunderbird-debuginfo-fix-include.patch
deleted file mode 100644
index 843a46a..0000000
--- a/thunderbird-debuginfo-fix-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc.include comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
---- comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc.include	2009-09-16 02:57:07.000000000 +0200
-+++ comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc	2009-10-12 09:47:59.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <stdio.h>
- 
- #include <cassert>
- #include <cstdlib>
-diff -up comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc.include comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc
---- comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc.include	2009-09-16 02:57:07.000000000 +0200
-+++ comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc	2009-10-12 09:47:59.000000000 +0200
-@@ -37,6 +37,7 @@
- #include <unistd.h>
- #include <sys/utsname.h>
- #include <sys/wait.h>
-+#include <stdio.h>
- 
- #include <cstdlib>
- #include <ctime>
-diff -up comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc.include comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
---- comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc.include	2009-09-16 02:57:07.000000000 +0200
-+++ comm-central/mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2009-10-12 10:09:56.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <sys/types.h>
- #include <unistd.h>
- #include <algorithm>
-+#include <stdio.h>
- 
- #include <functional>
- #include <list>
diff --git a/thunderbird-enigmail.spec b/thunderbird-enigmail.spec
index 4196daa..ba27121 100644
--- a/thunderbird-enigmail.spec
+++ b/thunderbird-enigmail.spec
@@ -7,7 +7,7 @@
 %define libnotify_version 0.4
 %define moz_objdir objdir-tb
 
-%global thunver  3.1
+%global thunver  3.1.1
 #global thunbeta rc1
 #global CVS     20091121
 #global prever  rc1
@@ -24,7 +24,7 @@
 
 %define version_internal  3.1
 %define mozappdir         %{_libdir}/thunderbird-%{version_internal}
-%global enigmail_extname  \{847b3a00-7ab1-11d4-8f02-006008948af5\}
+%global enigmail_extname  %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{847b3a00-7ab1-11d4-8f02-006008948af5}
 
 
 Summary:        Authentication and encryption extension for Mozilla Thunderbird
@@ -33,7 +33,7 @@ Version:        1.1.2
 %if 0%{?prever:1}
 Release:        0.1.%{prever}%{?dist}
 %else
-Release:        2%{?dist}
+Release:        3%{?dist}
 %endif
 URL:            http://enigmail.mozdev.org/
 License:        MPLv1.1 or GPLv2+
@@ -67,6 +67,9 @@ Patch1:         mozilla-jemalloc.patch
 Patch2:         thunderbird-shared-error.patch
 # Fixes gcc complain that nsFrame::delete is protected
 Patch4:         xulrunner-1.9.2.1-build.patch
+# Fix missing includes for crash reporter, remove in 3.1 final
+Patch5:         xulrunner-missing-headers.patch
+Patch6:         remove-static.patch
 
 # Enigmail patch
 Patch101:       enigmail-1.1.2-perm.patch
@@ -159,6 +162,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
 %patch4 -p1 -b .protected
+%patch5 -p0 -b .stat
+%patch6 -p1 -b .static
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -281,31 +286,29 @@ popd
 cd %{tarballdir}
 %{__rm} -rf $RPM_BUILD_ROOT
 
-%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions/%{enigmail_extname}
+%{__mkdir_p} $RPM_BUILD_ROOT%{enigmail_extname}
 
-%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{mozappdir}/extensions/%{enigmail_extname}
-%{__chmod} +x $RPM_BUILD_ROOT%{mozappdir}/extensions/%{enigmail_extname}/wrappers/*.sh
+%{__unzip} -q %{moz_objdir}/mozilla/dist/bin/enigmail-*-linux-*.xpi -d $RPM_BUILD_ROOT%{enigmail_extname}
+%{__chmod} +x $RPM_BUILD_ROOT%{enigmail_extname}/wrappers/*.sh
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
-%pre
-# Remomve link from previous installation
-if [ -L %{mozappdir}/extensions/%{enigmail_extname} ]; then
-    %{__rm} %{mozappdir}/extensions/%{enigmail_extname}
-fi
-
-
 %files
 %defattr(-,root,root,-)
-%{mozappdir}/extensions/%{enigmail_extname}
+%{enigmail_extname}
 
 
 #===============================================================================
 
 %changelog
+* Thu Jul 22 2010 Remi Collet <rpms@famillecollet.com> 1.1.2-3
+- move to /usr/lib/mozilla/extensions (as lightning)
+- build against thunderbird 3.1.1 sources
+- sync patches with F-13
+
 * Sat Jul 10 2010 Remi Collet <rpms@famillecollet.com> 1.1.2-2
 - remove link mecanism as thundebird dir is now stable (see #608511)
 
diff --git a/thunderbird-mozconfig-debuginfo b/thunderbird-mozconfig-debuginfo
deleted file mode 100644
index a0ef07a..0000000
--- a/thunderbird-mozconfig-debuginfo
+++ /dev/null
@@ -1,5 +0,0 @@
-# For mozilla's debuginfo:
-export CFLAGS="-gstabs+"
-export CXXFLAGS="-gstabs+"
-export MOZ_DEBUG_SYMBOLS=1
-ac_add_options --enable-crashreporter
diff --git a/thunderbird-mozconfig.fc4 b/thunderbird-mozconfig.fc4
deleted file mode 100644
index 26a2def..0000000
--- a/thunderbird-mozconfig.fc4
+++ /dev/null
@@ -1,25 +0,0 @@
-. $topsrcdir/mail/config/mozconfig
-
-ac_add_options --prefix="$PREFIX"
-ac_add_options --libdir="$LIBDIR"
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-png
-ac_add_options --with-pthreads
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-installer
-ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
-ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=gtk2
-ac_add_options --disable-xprint
-ac_add_options --disable-strip
-ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-
diff --git a/xulrunner-missing-headers.patch b/xulrunner-missing-headers.patch
new file mode 100644
index 0000000..946c35c
--- /dev/null
+++ b/xulrunner-missing-headers.patch
@@ -0,0 +1,11 @@
+diff -up mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc
+--- mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc.stat	2010-06-16 15:12:57.000000000 +0200
++++ mozilla/toolkit/crashreporter/google-breakpad/src/common/linux/file_id.cc	2010-06-16 15:13:02.000000000 +0200
+@@ -42,6 +42,7 @@
+ #include <link.h>
+ #include <string.h>
+ #include <sys/mman.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ 
+ #include <algorithm>