Author: remi Update of /cvs/free/rpms/thunderbird-enigmail/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv793 Modified Files: .cvsignore sources thunderbird-enigmail.spec thunderbird-mozconfig Added Files: thunderbird-clipboard-crash.patch Log Message: update to anigmail 1.0.1 (build against thunderbird 3.0.1) thunderbird-clipboard-crash.patch: nsClipboard.cpp | 4 ++-- nsDragService.cpp | 21 +++++++++------------ 2 files changed, 11 insertions(+), 14 deletions(-) --- NEW FILE thunderbird-clipboard-crash.patch --- 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 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Nov 2009 17:09:06 -0000 1.5 +++ .cvsignore 1 Feb 2010 16:13:54 -0000 1.6 @@ -1,2 +1,2 @@ -thunderbird-3.0rc1.source.tar.bz2 -enigmail-1.0.0.tar.gz +thunderbird-3.0.1.source.tar.bz2 +enigmail-1.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Nov 2009 17:09:06 -0000 1.5 +++ sources 1 Feb 2010 16:13:54 -0000 1.6 @@ -1,2 +1,2 @@ -f9da82698c8171a4cf68bdd234065844 thunderbird-3.0rc1.source.tar.bz2 -e3a6d379f1a72ac023751bdde2de750a enigmail-1.0.0.tar.gz +f004aa5ddf2a30b5df96e06df416b0c9 thunderbird-3.0.1.source.tar.bz2 +508ca9ab0396afb49e82eda88014924b enigmail-1.0.1.tar.gz Index: thunderbird-enigmail.spec =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-enigmail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- thunderbird-enigmail.spec 30 Nov 2009 17:09:06 -0000 1.4 +++ thunderbird-enigmail.spec 1 Feb 2010 16:13:54 -0000 1.5 @@ -1,13 +1,12 @@ -%define nspr_version 4.8 -%define nss_version 3.12.3.99 -%define cairo_version 1.6.0 -%define freetype_version 2.1.9 -%define sqlite_version 3.6.14 -%define version_internal 3.0rc1 -%define build_langpacks 1 -%define moz_objdir objdir-tb +%global nspr_version 4.8 +%global nss_version 3.12.3.99 +%global cairo_version 1.8.8 +%global freetype_version 2.1.9 +%global sqlite_version 3.6.14 +%global build_langpacks 1 +%global moz_objdir objdir-tb -%global thunver 3.0 +%global thunver 3.0.1 #global CVS 20091121 # The tarball is pretty inconsistent with directory structure. @@ -16,14 +15,16 @@ # IMPORTANT: If there is no top level directory, this should be # set to the cwd, ie: '.' #%define tarballdir . -%define tarballdir comm-1.9.1 +%global tarballdir comm-1.9.1 -%define mozappdir %{_libdir}/thunderbird-%{thunver} -%define official_branding 1 +%global official_branding 1 + +%global version_internal 3.0 +%global mozappdir %{_libdir}/%{name}-%{version_internal} Summary: Authentication and encryption extension for Mozilla Thunderbird Name: thunderbird-enigmail -Version: 1.0.0 +Version: 1.0.1 %if 0%{?CVS} Release: 0.1.cvs%{CVS}%{?dist} %else @@ -32,7 +33,7 @@ URL: http://enigmail.mozdev.org/ License: MPLv1.1 or GPLv2+ Group: Applications/Internet -Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{versio... +Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunve... Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded @@ -57,7 +58,9 @@ # Build patches Patch1: mozilla-jemalloc.patch Patch2: thunderbird-shared-error.patch -Patch3: thunderbird-3.0-ppc64.patch +Patch4: thunderbird-clipboard-crash.patch + +Patch9: thunderbird-3.0-ppc64.patch %if %{official_branding} @@ -136,7 +139,9 @@ %patch1 -p0 -b .jemalloc %patch2 -p1 -b .shared-error -%patch3 -p0 -b .ppc64 +%patch4 -p1 -b .clipboard-crash + +%patch9 -p0 -b .ppc64 %if %{official_branding} # Required by Mozilla Corporation @@ -275,6 +280,9 @@ #=============================================================================== %changelog +* Mon Feb 01 2010 Remi Collet <rpms(a)famillecollet.com&gt; 1.0.1-1 +- Enigmail 1.0.1 (against thunderbird 3.0.1) + * Mon Nov 30 2009 Remi Collet <rpms(a)famillecollet.com&gt; 1.0.0-1 - Enigmail 1.0 (against thunderbird 3.0rc1) Index: thunderbird-mozconfig =================================================================== RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/thunderbird-mozconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thunderbird-mozconfig 21 Nov 2009 12:38:17 -0000 1.2 +++ thunderbird-mozconfig 1 Feb 2010 16:13:54 -0000 1.3 @@ -25,8 +25,8 @@ ac_add_options --enable-system-cairo ac_add_options --enable-svg ac_add_options --enable-canvas -ac_add_options --disable-crashreporter ac_add_options --enable-system-hunspell +ac_add_options --disable-crashreporter export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1