6:42 p.m.
Author: remi
Update of /cvs/free/rpms/thunderbird-enigmail/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv480/devel
Modified Files:
.cvsignore sources
Added Files:
enigmail-fixlang.php mozilla-extension-update.sh
mozilla-jemalloc.patch thunderbird-enigmail.spec
thunderbird-imap-startup-crash.patch thunderbird-mozconfig
thunderbird-mozconfig-branded thunderbird-pango.patch
thunderbird-shared-error.patch xulrunner-elif.patch
Log Message:
New package
--- NEW FILE enigmail-fixlang.php ---
#!/usr/bin/php
<?php
function loaddtd ($file, &$tab) {
echo "+ Loading $file\n";
$tab=array();
$fic=fopen($file, "r");
$prev=false;
if ($fic) while ($buf=fgets($fic)) {
if (empty($buf) || $buf=="\n") {
//echo "+ empty\n";
} else if (preg_match('/^<!ENTITY (.*)"(.*)">$/', $buf, $res))
{
//echo "+ Line '".$res[1]."'\n";
$ind=trim($res[1]);
$tab[$ind] = $res[1].'"'.$res[2].'">';
$prev=false;
} else if (preg_match('/^<!ENTITY (.*)"(.*)$/', $buf, $res)) {
//echo "+ Start '".$res[1]."'\n";
$ind=trim($res[1]);
$tab[$ind] = $res[1].'"'.$res[2];
$prev=$ind;
} else if ($prev && preg_match('/^(.*)">$/', $buf, $res)) {
//echo "+ End '".$prev."'\n";
$tab[$prev] .= "\n".$res[1].'">';
$prev=false;
} else if ($prev && preg_match('/^(.*)$/', $buf, $res)) {
//echo "+ Cont. '".$prev."'\n";
$tab[$prev] .= "\n".$res[1];
} else {
die("- unkonwn ($buf) !\n");
}
}
}
function loadprop ($file, &$tab) {
echo "+ Loading $file\n";
$tab=array();
$fic=fopen($file, "r");
if ($fic) while ($buf=fgets($fic)) {
if (empty($buf) || $buf=="\n") {
//echo "+ empty\n";
} else if (preg_match('/^#/', $buf, $res)) {
//echo "+ comments\n";
} else if (preg_match('/^([A-Za-z0-9._]*)[[:space:]]*=[[:space:]]*(.*)/', $buf,
$res)) {
//echo "+ Value '".$res[1]."'\n";
$ind=trim($res[1]);
$tab[$ind] = $res[1].'='.$res[2];
} else {
echo("\tIgnored ($buf) !\n");
}
}
}
if ($_SERVER["argc"]<3) die ("usage enigmail-fixlang.php fromdir
destdir\n");
$from=$_SERVER["argv"][1];
$dest=$_SERVER["argv"][2];
if (!is_file("$from/enigmail.dtd")) die ("$from/enigmail.dtd not
found\n");
if (!is_file("$from/enigmail.properties")) die ("$from/enigmail.properties
not found\n");
if (!is_file("$dest/enigmail.dtd")) die ("$dest/enigmail.dtd not
found\n");
if (!is_file("$dest/enigmail.properties")) die ("$dest/enigmail.properties
not found\n");
loaddtd("$from/enigmail.dtd", $endtd);
loaddtd("$dest/enigmail.dtd", $frdtd);
echo "+ Writing $dest/enigmail.dtd\n";
$fic=fopen("$dest/enigmail.dtd", "w");
foreach($endtd as $ind => $line)
if (isset($frdtd[$ind])) {
fputs($fic, "<!ENTITY ".$frdtd[$ind]."\n");
} else {
echo "\tAdding missing $ind\n";
fputs($fic, "<!ENTITY ".$endtd[$ind]."\n");
}
fclose($fic);
loadprop("$from/enigmail.properties", $enprop);
loadprop("$dest/enigmail.properties", $frprop);
echo "+ Writing $dest/enigmail.properties\n";
$fic=fopen("$dest/enigmail.properties", "w");
foreach($enprop as $ind => $line)
if (isset($frprop[$ind])) {
fputs($fic, $frprop[$ind]."\n");
} else {
echo "\tAdding missing $ind\n";
fputs($fic, $enprop[$ind]."\n");
}
fclose($fic);
?>
--- NEW FILE mozilla-extension-update.sh ---
#!/bin/sh
#
# This script is used to add and remove our extension from one of the Mozilla
# products directory, and is run from 'triggers' when the product is installed or
# upgraded, as well as when our package is installed. It is needed because
# Mozilla products are installed into versioned directories in
/usr/lib[64]/<product>
# so we have to make a new symlink into the right directory when the
# application is installed or upgraded. But we would rather not leave
# our old symlinks behind, since that will cause the application
# directories not to be removed. (flash-player leaves its old symlinks behind,
# but that's no excuse for us to do the same...)
#
# Because I don't know any way of finding out what the new version
# is on installation or old version on uninstallation, we have
# to do things in a somewhat non-intuitive way
#
# The order on upgrade of the mozilla application is:
#
# 1. new package installed
# 2. triggerin for new package - we add all symlinks
# 3. triggerun for old package - we remove all symlinks
# 4. old package uninstalled
# 5. triggerpostun for old package - we add all symlinks
#
# Triggers are also run on self-upgrade, in that case we do:
#
# 1. new package installed
# 2. triggerin for new package - we add all symlinks
# 3. triggerun for old package - we remove all symlinks
# 4. old package uninstalled
# 5. postun for old package - we add all symlinks
# 6. triggerpostun for old package - NOT RUN (contrary to RPM docs)
#
#
# Script arguments:
# --appname: the mozilla application that this extension should register into.
# Usually firefox or thunderbird.
# --extname: the name of the extension. It can be determined by looking at
# the install.rdf file, in the extension directory. This file
# contains several <em:id> tags. The extname parameter is the
# content of the em:id tag which is not contained in the
# em:targetApplication tag
# --extpath: the path where the extension will be installed
# --action: either "install" or "remove"
# --basedir: the dirname of the directory where the target application is
# installed. Usually /usr/lib or /usr/lib64>, it defaults to
# /usr/lib
#
#
# Here's an example implementation in rpm scriptlets:
#
# %define tbupdate %{_libdir}/lightning/mozilla-extension-update.sh --appname thunderbird
--extname {e2fda1a4-762b-4020-b5ad-a41df1933103} --basedir %{_libdir} --extpath
%{_libdir}/lightning --action
#
# %post
# %{tbupdate} install || true
#
# %preun
# # On removal (but not upgrade), remove the extention
# if [ $1 = 0 ] ; then
# %{tbupdate} remove || true
# fi
#
# %postun
# # This is needed not to reverse the effect of our preun, which
# # is guarded against upgrade, but because of our triggerun,
# # which is run on self-upgrade, though triggerpostun isn't
# if [ $1 != 0 ] ; then
# %{tbupdate} install || true
# fi
#
# %triggerin -- thunderbird
# %{tbupdate} install || true
#
# %triggerun -- thunderbird
# %{tbupdate} remove || true
#
# %triggerpostun -- thunderbird
# # Guard against being run post-self-uninstall, even though that
# # doesn't happen currently (see comment above)
# if [ "$1" != 0 ] ; then
# %{tbupdate} install || true
# fi
die() {
echo >&2 "$@"
exit 0
}
usage() {
die "Usage: $0 --appname <application-name> --extname <extension-name>
--extpath <extension-path> --action <install|remove> [--basedir
</usr/lib|/usr/lib64>]"
}
appname=
extname=
extpath=
action=
basedir=/usr/lib
while [ "$#" -gt "0" ]; do
case "$1" in
--appname)
shift; appname="$1" ;;
--extname)
shift; extname="$1" ;;
--extpath)
shift; extpath="$1" ;;
--action)
shift; action="$1" ;;
--basedir)
shift; basedir="$1" ;;
*) usage ;;
esac
shift
done
if [ "$action" = "install" ] ; then
# Add symlinks to any mozilla directory that looks like it is part of a
# currently installed package
for d in $basedir/${appname}*; do
if [ "$d" = "$basedir/${appname}*" ] ; then
continue
fi
link=$d/extensions/$extname
if [ -e $extpath -a -e $d/$appname-bin -a -d $d/extensions -a ! -L $link ] ; then
ln -s $extpath $link
fi
done
elif [ "$action" = "remove" ] ; then
# Remove any symlinks we've created into any mozilla directory
for d in $basedir/${appname}*; do
if [ "$d" = "$basedir/${appname}*" ] ; then
continue
fi
link=$d/extensions/$extname
if [ -L $link ] ; then
rm $link
fi
done
else
usage
fi
exit 0
mozilla-jemalloc.patch:
--- NEW FILE mozilla-jemalloc.patch ---
diff -r f1af606531f5 memory/jemalloc/jemalloc.h
--- mozilla/memory/jemalloc/jemalloc.h Sat Nov 22 20:22:22 2008 +0100
+++ mozilla/memory/jemalloc/jemalloc.h Mon Dec 01 16:53:06 2008 -0500
@@ -45,14 +45,14 @@
} jemalloc_stats_t;
#ifndef MOZ_MEMORY_DARWIN
-void *malloc(size_t size);
-void *valloc(size_t size);
-void *calloc(size_t num, size_t size);
-void *realloc(void *ptr, size_t size);
-void free(void *ptr);
+void *malloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *valloc(size_t size) __THROW __attribute_malloc__ __wur;
+void *calloc(size_t num, size_t size) __THROW __attribute_malloc__ __wur;
+void *realloc(void *ptr, size_t size) __THROW __attribute_malloc__ __wur;
+void free(void *ptr) __THROW __attribute_malloc__ __wur;
#endif
-int posix_memalign(void **memptr, size_t alignment, size_t size);
+int posix_memalign(void **memptr, size_t alignment, size_t size) __THROW
__attribute_malloc__ __wur;
void *memalign(size_t alignment, size_t size);
size_t malloc_usable_size(const void *ptr);
void jemalloc_stats(jemalloc_stats_t *stats);
--- NEW FILE thunderbird-enigmail.spec ---
%define nspr_version 4.6
%define nss_version 3.10
%define cairo_version 1.0
%define dbus_glib_version 0.6
%define official_branding 1
%define thunver 3.0
%define CVS 20090521
Summary: Authentication and encryption extension for Mozilla Thunderbird
Name: thunderbird-enigmail
Version: 0.96a
Release: 0.3.cvs%{CVS}%{?dist}
URL: http://enigmail.mozdev.org/
License: MPLv1.1 or GPLv2+
Group: Applications/Internet
Source0:
http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{thunve...
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
# ===== Enigmail files =====
#Source100: http://www.mozilla-enigmail.org/downloads/src/enigmail-%{version}.tar.gz
# cvs -d :pserver:guest@mozdev.org:/cvs login
# => password is guest
# cvs -d :pserver:guest@mozdev.org:/cvs co enigmail/src
# tar czf /home/rpmbuild/SOURCES/enigmail-20090521.tgz -C enigmail/src .
Source100: enigmail-%{CVS}.tgz
# http://www.mozdev.org/pipermail/enigmail/2009-April/011018.html
Source101: enigmail-fixlang.php
# From sunbird.src.rpm
Source102: mozilla-extension-update.sh
# Build patches
Patch1: mozilla-jemalloc.patch
Patch2: thunderbird-shared-error.patch
Patch3: xulrunner-elif.patch
Patch4: thunderbird-pango.patch
Patch5: thunderbird-imap-startup-crash.patch
%if %{official_branding}
# Required by Mozilla Corporation
%else
# Not yet approved by Mozillla Corporation
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libcurl-devel
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel
BuildRequires: zlib-devel, gzip, zip, unzip
BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-devel >= %{nss_version}
BuildRequires: libIDL-devel
BuildRequires: desktop-file-utils
BuildRequires: pango-devel >= 1.22
BuildRequires: freetype-devel >= 2.1.9
BuildRequires: libXt-devel
BuildRequires: libXrender-devel
BuildRequires: alsa-lib-devel
BuildRequires: autoconf213
BuildRequires: GConf2-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: libgnomeui-devel
%define mozappdir %{_libdir}/thunderbird-%{thunver}b2
## For fixing lang
BuildRequires: dos2unix, php-cli
# Without this enigmmail will require libxpcom.so and other .so
# which are not provided by thunderbird (to avoid mistake,
# because provided by xulrunner).
AutoReq: 0
# All others deps already required by thunderbird
Requires: gnupg, thunderbird >= %{thunver}
# Nothing usefull provided
AutoProv: 0
%global enigmail_extname '{847b3a00-7ab1-11d4-8f02-006008948af5}'
%global tbupdate \\\
%{_libdir}/%{name}/mozilla-extension-update.sh \\\
--appname thunderbird \\\
--extname %{enigmail_extname} \\\
--basedir %{_libdir} \\\
--extpath %{_libdir}/%{name} \\\
--action
%description
Enigmail is an extension to the mail client Mozilla Thunderbird
which allows users to access the authentication and encryption
features provided by GnuPG
#===============================================================================
%prep
%setup -q -c
#cd mozilla
%patch1 -p0 -b .jemalloc
%patch2 -p1 -b .shared-error
%patch3 -p0 -b .xulrunner-elif
%patch4 -p1 -b .pango-fix
%patch5 -p1 -b .imap-startup-crash
%if %{official_branding}
# Required by Mozilla Corporation
%else
# Not yet approved by Mozillla Corporation
%endif
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
%if %{official_branding}
%{__cat} %{SOURCE11} >> .mozconfig
%endif
# ===== Enigmail work =====
mkdir mailnews/extensions/enigmail
tar xzf %{SOURCE100} -C mailnews/extensions/enigmail
# ===== Fixing langpack
pushd mailnews/extensions/enigmail
for rep in $(cat lang/current-languages.txt)
do
dos2unix lang/$rep/enigmail.dtd
dos2unix lang/$rep/enigmail.properties
php %{SOURCE101} ui/locale/en-US lang/$rep
done
popd
#===============================================================================
%build
#cd mozilla
# Build with -Os as it helps the browser; also, don't override mozilla's warning
# level; they use -Wall but disable a few warnings that show up _everywhere_
MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e
's/-Wall//')
export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
export PREFIX='%{_prefix}'
export LIBDIR='%{_libdir}'
%define moz_make_flags -j1
#%ifarch ppc ppc64 s390 s390x
#%define moz_make_flags -j1
#%else
#%define moz_make_flags %{?_smp_mflags}
#%endif
export LDFLAGS="-Wl,-rpath,%{mozappdir}"
export MAKE="gmake %{moz_make_flags}"
# ===== Minimal build =====
make -f client.mk export
pushd objdir-tb/mozilla/modules/libreg
make
cd ../../xpcom/string
make
cd ..
make
cd obsolete
make
popd
# ===== Enigmail work =====
pushd mailnews/extensions/enigmail
./makemake -r
popd
pushd objdir-tb/mailnews/extensions/enigmail
make
make xpi
popd
#===============================================================================
%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}
%{__unzip} -q objdir-tb/mozilla/dist/bin/enigmail-%{version}-linux-*.xpi -d
$RPM_BUILD_ROOT%{_libdir}/%{name}
%{__install} -p -m 755 %{SOURCE102}
$RPM_BUILD_ROOT%{_libdir}/%{name}/mozilla-extension-update.sh
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%post
%{tbupdate} install || :
%preun
if [ $1 = 0 ]; then
%{tbupdate} remove || :
fi
%postun
# This is needed not to reverse the effect of our preun, which
# is guarded against upgrade, but because of our triggerun,
# which is run on self-upgrade, though triggerpostun isn't
if [ $1 != 0 ]; then
%{tbupdate} install || :
fi
%triggerin -- thunderbird
%{tbupdate} install || :
%triggerun -- thunderbird
%{tbupdate} remove || :
%triggerpostun -- thunderbird
# Guard against being run post-self-uninstall, even though that
# doesn't happen currently (see comment above)
if [ $1 != 0 ]; then
%{tbupdate} install || :
fi
%files
%defattr(-,root,root,-)
%{_libdir}/%{name}
#===============================================================================
%changelog
* Thu May 21 2009 Remi Collet <rpms(a)famillecollet.com> 0.96a-0.3.cvs20090521
- new CVS snapshot
- fix License and Sumnary
* Mon May 18 2009 Remi Collet <rpms(a)famillecollet.com> 0.96a-0.2.cvs20090516
- use mozilla-extension-update.sh from thunderbird-lightning
* Sat May 16 2009 Remi Collet <rpms(a)famillecollet.com> 0.96a-0.1.cvs20090516
- new CVS snapshot
- rpmfusion review proposal
* Thu Apr 30 2009 Remi Collet <rpms(a)famillecollet.com>
0.96a-0.1.cvs20090430.fc11.remi
- new CVS snapshot
- F11 build
* Mon Mar 16 2009 Remi Collet <rpms(a)famillecollet.com>
0.96a-0.1.cvs20090316.fc#.remi
- new CVS snapshot
- add enigmail-fixlang.php
* Sun Mar 15 2009 Remi Collet <rpms(a)famillecollet.com>
0.96a-0.1.cvs20090315.fc#.remi
- enigmail 0.96a (CVS), Thunderbird 3.0b2
thunderbird-imap-startup-crash.patch:
--- NEW FILE thunderbird-imap-startup-crash.patch ---
# HG changeset patch
# User David Bienvenu <bienvenu(a)nventure.com>
# Date 1236181428 28800
# Node ID 513295ae0230e3d0baa73b1ee98627d4b2f97d24
# Parent f290d90a853210f29f7b9306abf657dd81f0d6b5
fix crash on startup when imap server sends list response with trailing delimiter (not /),
r/sr=standard8, 480870
--- a/mailnews/imap/src/nsImapIncomingServer.cpp Wed Mar 04 10:59:11 2009 +0000
+++ b/mailnews/imap/src/nsImapIncomingServer.cpp Wed Mar 04 07:43:48 2009 -0800
@@ -1109,7 +1109,7 @@ NS_IMETHODIMP nsImapIncomingServer::Poss
return rv;
nsCAutoString dupFolderPath(folderPath);
- if (dupFolderPath.Last() == hierarchyDelimiter)
+ if (dupFolderPath.Last() == '/')
{
dupFolderPath.SetLength(dupFolderPath.Length()-1);
// *** this is what we did in 4.x in order to list uw folder only
--- NEW FILE thunderbird-mozconfig ---
mk_add_options MOZ_CO_PROJECT=mail
ac_add_options --enable-application=mail
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir-tb/
mk_add_options AUTOCONF=autoconf-2.13
#ac_add_options --with-system-png
ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR"
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
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=cairo-gtk2
ac_add_options --disable-xprint
ac_add_options --disable-strip
ac_add_options --disable-install-strip
ac_add_options --enable-pango
ac_add_options --enable-system-cairo
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --disable-crashreporter
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
--- NEW FILE thunderbird-mozconfig-branded ---
ac_add_options --enable-official-branding
thunderbird-pango.patch:
--- NEW FILE thunderbird-pango.patch ---
diff -upU8 thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix
thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp
--- thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp.pango-fix 2009-03-03
12:04:16.000000000 +0100
+++ thunderbird-3.0/mozilla/gfx/thebes/src/gfxPangoFonts.cpp 2009-03-03 12:05:37.000000000
+0100
@@ -1798,22 +1798,21 @@ gfx_pango_font_map_context_substitute(Pa
double size = pango_font_description_get_size(desc) / FLOAT_PANGO_SCALE;
gfxPangoFontGroup *fontGroup = GetFontGroup(context);
PRBool usePrinterFont = fontGroup &&
fontGroup->GetStyle()->printerFont;
PrepareSortPattern(pattern, size, 1.0, usePrinterFont);
}
static PangoFcFont *
gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
- PangoContext *context,
- const PangoFontDescription *desc,
- FcPattern *pattern)
+ PangoFcFontKey *fontkey)
{
+ const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
- "pattern", pattern, NULL));
+ "pattern", p_pattern, NULL));
}
static void
gfx_pango_font_map_class_init(gfxPangoFontMapClass *klass)
{
// inherit GObjectClass::finalize from parent as this class adds no data.
PangoFontMapClass *fontmap_class = PANGO_FONT_MAP_CLASS (klass);
@@ -1823,19 +1822,18 @@ gfx_pango_font_map_class_init(gfxPangoFo
fontmap_class->load_fontset = gfx_pango_font_map_load_fontset;
// inherit fontmap_class->shape_engine_type from PangoFcFontMap
PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
fcfontmap_class->get_resolution = gfx_pango_font_map_get_resolution;
// context_key_* virtual functions are only necessary if we want to
// dynamically respond to changes in the screen cairo_font_options_t.
- // context_substitute and get_font are not likely to be used but
+ // get_font are not likely to be used but
// implemented because the class makes them available.
- fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
fcfontmap_class->create_font = gfx_pango_font_map_create_font;
}
/**
** gfxPangoFontGroup
**/
struct FamilyCallbackData {
thunderbird-shared-error.patch:
--- NEW FILE thunderbird-shared-error.patch ---
diff -upU8 thunderbird-3.0/mail/installer/Makefile.in.shared-error
thunderbird-3.0/mail/installer/Makefile.in
--- thunderbird-3.0/mail/installer/Makefile.in.shared-error 2009-02-24 03:16:03.000000000
+0100
+++ thunderbird-3.0/mail/installer/Makefile.in 2009-02-27 16:02:31.000000000 +0100
@@ -56,16 +56,17 @@ NO_PKG_FILES = \
PalmSyncInstall.exe \
$(NULL)
include $(topsrcdir)/config/rules.mk
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
ifdef BUILD_STATIC_LIBS
+ifeq (BUILD_STATIC_LIBS, 1)
ifeq (WINNT,$(OS_ARCH))
MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static
endif
else
$(error you need a "--enable-static --disable-shared" build to create an
installer)
endif
MOZ_NONLOCALIZED_PKG_LIST = \
@@ -80,16 +81,17 @@ MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
DEFINES += -DAB_CD=$(AB_CD)
ifdef MOZ_PKG_MANIFEST_P
MOZ_PKG_MANIFEST = packages-static
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $< > $@
endif
+endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
MOZ_PKG_MAC_DSSTORE=branding/dsstore
MOZ_PKG_MAC_BACKGROUND=branding/background.png
MOZ_PKG_MAC_ICON=branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
endif
xulrunner-elif.patch:
--- NEW FILE xulrunner-elif.patch ---
diff -up mozilla/toolkit/xre/nsAppRunner.cpp.old mozilla/toolkit/xre/nsAppRunner.cpp
--- mozilla/toolkit/xre/nsAppRunner.cpp.old 2008-12-10 20:07:01.000000000 +0100
+++ mozilla/toolkit/xre/nsAppRunner.cpp 2009-02-27 17:17:59.000000000 +0100
@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
if (NS_FAILED(rv))
return rv;
-#elif
+#else
#error Oops, you need platform-specific code here
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 May 2009 17:02:37 -0000 1.1
+++ .cvsignore 22 May 2009 18:42:43 -0000 1.2
@@ -0,0 +1,2 @@
+enigmail-20090521.tgz
+thunderbird-3.0b2-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/thunderbird-enigmail/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 May 2009 17:02:37 -0000 1.1
+++ sources 22 May 2009 18:42:43 -0000 1.2
@@ -0,0 +1,2 @@
+3356851fb5a3fb4302621008300ca8b2 enigmail-20090521.tgz
+3a6a95040c4356139a02eab5d32b9ad1 thunderbird-3.0b2-source.tar.bz2