From 0d16653a96909c15e7f21af7bc0b75ee55e66144 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Dec 16 2004 22:21:15 +0000 Subject: - Add RPM version to useragent --- diff --git a/firefox-1.0-prdtoa.patch b/firefox-1.0-prdtoa.patch new file mode 100644 index 0000000..d52dc0e --- /dev/null +++ b/firefox-1.0-prdtoa.patch @@ -0,0 +1,22 @@ +Index: nsprpub/pr/src/misc/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/Makefile.in,v +retrieving revision 1.15.2.2 +diff -u -r1.15.2.2 Makefile.in +--- nsprpub/pr/src/misc/Makefile.in 6 Jun 2003 03:09:17 -0000 1.15.2.2 ++++ nsprpub/pr/src/misc/Makefile.in 19 Nov 2004 00:58:35 -0000 +@@ -82,6 +82,14 @@ + + include $(topsrcdir)/config/rules.mk + ++NONOPT_CFLAGS=$(filter-out -O%, $(CFLAGS)) ++ ++ifeq ($(OS_ARCH),Linux) ++$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c ++ @$(MAKE_OBJDIR) ++ $(CC) -o $@ -c $(NONOPT_CFLAGS) -ffloat-store $< ++endif ++ + # Prevent floating point errors caused by MSVC 6.0 Processor Pack + # optimizations (bug 207421). This disables optimizations that + # could change the precision of floating-point calculations for diff --git a/mozilla-1.7.3-pango-render.patch b/mozilla-1.7.3-pango-render.patch index 650db9b..71fefd6 100644 --- a/mozilla-1.7.3-pango-render.patch +++ b/mozilla-1.7.3-pango-render.patch @@ -1,6 +1,6 @@ ---- mozilla/config/autoconf.mk.in.foo 2004-03-20 21:31:17.000000000 -0500 -+++ mozilla/config/autoconf.mk.in 2004-10-18 22:49:40.000000000 -0400 -@@ -376,6 +376,10 @@ +--- mozilla/config/autoconf.mk.in.foo 2004-10-31 00:29:54.000000000 -0400 ++++ mozilla/config/autoconf.mk.in 2004-12-03 13:30:56.000000000 -0500 +@@ -388,6 +388,10 @@ MOZ_XFT_LIBS = @MOZ_XFT_LIBS@ MOZ_ENABLE_COREXFONTS = @MOZ_ENABLE_COREXFONTS@ @@ -12,7 +12,7 @@ MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@ --- mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp.foo 2003-09-07 18:20:38.000000000 -0400 -+++ mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp 2004-12-03 13:30:56.000000000 -0500 @@ -62,6 +62,9 @@ #ifdef NATIVE_THEME_SUPPORT #include "nsNativeThemeGTK.h" @@ -71,8 +71,8 @@ NS_ADDREF(result); nsresult rv = result->QueryInterface(aIID, aResult); ---- /dev/null 2004-02-18 10:26:44.000000000 -0500 -+++ mozilla/gfx/src/gtk/mozilla-decoder.h 2004-10-18 22:49:40.000000000 -0400 +--- mozilla/gfx/src/gtk/mozilla-decoder.h.foo 2004-12-03 13:30:56.000000000 -0500 ++++ mozilla/gfx/src/gtk/mozilla-decoder.h 2004-12-03 13:30:56.000000000 -0500 @@ -0,0 +1,72 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -146,8 +146,8 @@ +G_END_DECLS + +#endif /*_MOZILLA_DECODER_H */ ---- /dev/null 2004-02-18 10:26:44.000000000 -0500 -+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2004-10-18 22:49:40.000000000 -0400 +--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.foo 2004-12-03 13:30:56.000000000 -0500 ++++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2004-12-03 13:30:56.000000000 -0500 @@ -0,0 +1,376 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -526,7 +526,7 @@ + return PANGO_FC_DECODER(decoder); +} --- mozilla/gfx/src/gtk/gfxgtk.pkg.foo 2004-01-06 20:21:35.000000000 -0500 -+++ mozilla/gfx/src/gtk/gfxgtk.pkg 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/gfxgtk.pkg 2004-12-03 13:30:56.000000000 -0500 @@ -7,3 +7,6 @@ #if MOZ_ENABLE_XFT dist/bin/res/fonts/fontEncoding.properties @@ -534,8 +534,8 @@ +#if MOZ_ENABLE_PANGO +dist/bin/res/fonts/pangoFontEncoding.properties +#endif ---- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.foo 2004-04-05 15:18:43.000000000 -0400 -+++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2004-10-18 22:49:40.000000000 -0400 +--- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.foo 2004-10-14 16:36:14.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsFontMetricsXft.cpp 2004-12-03 13:30:56.000000000 -0500 @@ -238,7 +238,7 @@ static int CalculateSlant (PRUint8 aStyle); @@ -683,7 +683,7 @@ nsFontMetricsXft::GetHints(void) { --- mozilla/gfx/src/gtk/Makefile.in.foo 2003-11-10 07:24:51.000000000 -0500 -+++ mozilla/gfx/src/gtk/Makefile.in 2004-10-18 22:51:01.000000000 -0400 ++++ mozilla/gfx/src/gtk/Makefile.in 2004-12-03 13:30:56.000000000 -0500 @@ -102,6 +102,12 @@ nsFontMetricsXft.cpp endif @@ -710,8 +710,8 @@ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/res/fonts endif ---- /dev/null 2004-02-18 10:26:44.000000000 -0500 -+++ mozilla/gfx/src/gtk/pangoFontEncoding.properties 2004-10-18 22:49:40.000000000 -0400 +--- mozilla/gfx/src/gtk/pangoFontEncoding.properties.foo 2004-12-03 13:30:56.000000000 -0500 ++++ mozilla/gfx/src/gtk/pangoFontEncoding.properties 2004-12-03 13:30:56.000000000 -0500 @@ -0,0 +1,120 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -834,7 +834,7 @@ +encoding.mtextra.ftcmap = mac_roman + --- mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp.foo 2002-10-11 22:03:32.000000000 -0400 -+++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp 2004-10-18 22:51:32.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp 2004-12-03 13:32:21.000000000 -0500 @@ -50,11 +50,20 @@ #include "nsFontMetricsGTK.h" #endif @@ -886,8 +886,8 @@ +} + +#endif ---- /dev/null 2004-02-18 10:26:44.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2004-10-18 22:49:40.000000000 -0400 +--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo 2004-12-03 13:30:56.000000000 -0500 ++++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp 2004-12-03 13:30:56.000000000 -0500 @@ -0,0 +1,1662 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2552,7 +2552,7 @@ + return NS_OK; +} --- mozilla/gfx/src/gtk/nsRenderingContextGTK.h.foo 2003-02-24 21:38:34.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsRenderingContextGTK.h 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsRenderingContextGTK.h 2004-12-03 13:30:56.000000000 -0500 @@ -194,6 +194,8 @@ const nsRect &aDestBounds, PRUint32 aCopyFlags); NS_IMETHOD RetrieveCurrentNativeGraphicData(PRUint32 * ngd); @@ -2562,8 +2562,8 @@ NS_IMETHOD DrawImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsPoint * aDestPoint); NS_IMETHOD DrawScaledImage(imgIContainer *aImage, const nsRect * aSrcRect, const nsRect * aDestRect); ---- /dev/null 2004-02-18 10:26:44.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsFontMetricsPango.h 2004-10-18 22:49:40.000000000 -0400 +--- mozilla/gfx/src/gtk/nsFontMetricsPango.h.foo 2004-12-03 13:30:56.000000000 -0500 ++++ mozilla/gfx/src/gtk/nsFontMetricsPango.h 2004-12-03 13:30:56.000000000 -0500 @@ -0,0 +1,278 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: @@ -2844,7 +2844,7 @@ + NS_DECL_NSIFONTENUMERATOR +}; --- mozilla/gfx/src/gtk/nsFontMetricsUtils.h.foo 2002-10-11 22:03:32.000000000 -0400 -+++ mozilla/gfx/src/gtk/nsFontMetricsUtils.h 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsFontMetricsUtils.h 2004-12-03 13:30:56.000000000 -0500 @@ -42,9 +42,12 @@ extern PRUint32 NS_FontMetricsGetHints (void); extern nsresult NS_FontMetricsFamilyExists(nsIDeviceContext *aDevice, @@ -2860,7 +2860,7 @@ + #endif /* __nsFontMetricsUtils_h */ --- mozilla/gfx/src/gtk/nsIFontMetricsGTK.h.foo 2002-10-11 23:00:17.000000000 -0400 -+++ mozilla/gfx/src/gtk/nsIFontMetricsGTK.h 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsIFontMetricsGTK.h 2004-12-03 13:30:56.000000000 -0500 @@ -121,6 +121,9 @@ // particular handle. virtual GdkFont* GetCurrentGDKFont(void) = 0; @@ -2872,7 +2872,7 @@ #endif /* __nsIFontMetricsGTK_h */ --- mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp.foo 2004-02-12 11:52:22.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsRenderingContextGTK.cpp 2004-12-03 13:30:56.000000000 -0500 @@ -524,6 +524,9 @@ values.foreground.pixel = @@ -2896,7 +2896,7 @@ { UpdateGC(); --- mozilla/gfx/src/gtk/nsGCCache.cpp.foo 2002-02-02 22:47:15.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsGCCache.cpp 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsGCCache.cpp 2004-12-03 13:30:56.000000000 -0500 @@ -232,98 +232,42 @@ // We have old GC, reuse it and check what // we have to change @@ -3010,7 +3010,7 @@ entry->gcv = *gcv; } --- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp.foo 2004-03-09 09:14:54.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp 2004-12-03 13:30:56.000000000 -0500 @@ -4600,6 +4600,12 @@ return mCurrentFont->GetGDKFont(); } @@ -3025,7 +3025,7 @@ static int CompareSizes(const void* aArg1, const void* aArg2, void *data) --- mozilla/gfx/src/gtk/nsFontMetricsXft.h.foo 2004-02-23 16:38:52.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsFontMetricsXft.h 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsFontMetricsXft.h 2004-12-03 13:30:56.000000000 -0500 @@ -202,6 +202,8 @@ virtual GdkFont* GetCurrentGDKFont(void); @@ -3036,7 +3036,7 @@ static PRUint32 GetHints (void); --- mozilla/gfx/src/gtk/nsFontMetricsGTK.h.foo 2004-02-04 20:57:03.000000000 -0500 -+++ mozilla/gfx/src/gtk/nsFontMetricsGTK.h 2004-10-18 22:49:40.000000000 -0400 ++++ mozilla/gfx/src/gtk/nsFontMetricsGTK.h 2004-12-03 13:30:56.000000000 -0500 @@ -344,6 +344,8 @@ virtual GdkFont* GetCurrentGDKFont(void); @@ -3046,9 +3046,9 @@ static nsresult FamilyExists(nsIDeviceContext *aDevice, const nsString& aName); static PRUint32 GetHints(void); ---- mozilla/configure.in.foo 2004-05-25 22:25:16.000000000 -0400 -+++ mozilla/configure.in 2004-10-18 22:49:40.000000000 -0400 -@@ -3429,6 +3429,34 @@ +--- mozilla/configure.in.foo 2004-10-31 02:17:58.000000000 -0500 ++++ mozilla/configure.in 2004-12-03 13:30:56.000000000 -0500 +@@ -3475,6 +3475,34 @@ AC_SUBST(MOZ_XFT_LIBS) dnl ======================================================== diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-redhat-default-prefs.js new file mode 100644 index 0000000..0d71c19 --- /dev/null +++ b/thunderbird-redhat-default-prefs.js @@ -0,0 +1,8 @@ +pref("general.useragent.vendor", "Fedora"); +pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); + +# Make hyperlinks work +pref("network.protocol-handler.app.http", "COMMAND"); +pref("network.protocol-handler.app.https", "COMMAND"); +pref("network.protocol-handler.app.ftp", "COMMAND"); + diff --git a/thunderbird.sh.in b/thunderbird.sh.in index aa562d0..5a821c9 100644 --- a/thunderbird.sh.in +++ b/thunderbird.sh.in @@ -12,6 +12,13 @@ MOZ_PROGRAM=$MRE_HOME/thunderbird #MOZ_CLIENT_PROGRAM="$MRE_HOME/mozilla-xremote-client -a thunderbird" MOZ_CLIENT_PROGRAM="$MRE_HOME/thunderbird -remote" +## +## Set MOZ_ENABLE_PANGO +## +MOZ_ENABLE_PANGO=1 +export MOZ_ENABLE_PANGO + + function check_running() { $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null RETURN_VAL=$? diff --git a/thunderbird.spec b/thunderbird.spec index 8771579..7152e25 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -3,12 +3,12 @@ %define desktop_file_utils_version 0.3 -ExclusiveArch: i386 x86_64 ia64 ppc +ExclusiveArch: i386 x86_64 ia64 ppc s390 s390x Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.0 -Release: 1 +Release: 2 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -21,7 +21,7 @@ Source3: thunderbird.sh.in Source4: thunderbird-mozconfig Source5: release-notes.html Source6: thunderbird-open-browser.sh -Source7: thunderbird-prefs +Source10: thunderbird-redhat-default-prefs.js Source100: find-external-requires Patch1: thunderbird-0.7.3-em-register.patch @@ -30,11 +30,17 @@ Patch3: thunderbird-0.7.3-enigmail-debian.patch Patch4: thunderbird-0.7.3-freetype-compile.patch Patch5: thunderbird-0.7.3-psfonts.patch Patch6: thunderbird-0.7.3-gnome-uriloader.patch +Patch7: firefox-1.0-prdtoa.patch # customization patches Patch24: thunderbird-0.8-default-applications.patch Patch25: thunderbird-0.8-software-update.patch +# pango patches +Patch30: mozilla-1.7.3-pango-render.patch +Patch31: firefox-1.0-pango-selection.patch +Patch32: firefox-1.0-pango-space-width.patch + # local bugfixes Patch40: firefox-PR1-gnome-vfs-default-app.patch Patch41: thunderbird-0.8.0-stack-direction.patch @@ -44,9 +50,10 @@ Patch90: thunderbird-0.8.0-gtk-file-chooser-morefixes.patch # Already upstreamed Patch101: thunderbird-0.8.0-pkgconfig.patch -Patch102: mozilla-1.7.3-pango-render.patch - - +Patch103: mozilla-1.7.3-xptcall-s390.patch +Patch104: firefox-1.0-xptcall-s390.patch +Patch105: firefox-1.0-nspr-s390.patch +Patch106: thunderbird-1.0-useragent.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel @@ -83,13 +90,20 @@ cp -f %{SOURCE5} . %endif %patch5 -p1 -b .psfonts %patch6 -p1 -b .gnome-uriloader +%patch7 -p0 %patch24 -p1 %patch25 -p1 +%patch30 -p1 +%patch31 -p1 +%patch32 -p1 %patch40 -p1 %patch41 -p0 %patch90 -p0 -b .gtk-file-chooser-morefixes %patch101 -p0 -b .pkgconfig -%patch102 -p1 -b .pango +%patch103 -p0 +%patch104 -p1 +%patch105 -p0 +%patch106 -p0 #=============================================================================== @@ -129,9 +143,11 @@ perl -pi -e 's|TBDIR|%{tbdir}|g' %{buildroot}%{_bindir}/mozilla-thunderbird install -m755 %{SOURCE6} %{buildroot}%{tbdir}/open-browser.sh perl -pi -e 's|LIBDIR|%{_libdir}|g' %{buildroot}%{tbdir}/open-browser.sh -install -m644 %{SOURCE7} %{buildroot}%{tbdir}/defaults/pref/all.js -perl -pi -e 's|COMMAND|%{tbdir}/open-browser.sh|g' \ - %{buildroot}%{tbdir}/defaults/pref/all.js +%{__cat} %{SOURCE10} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \ + %{__sed} -e 's,COMMAND,%{tbdir}/open-browser.sh,g' > rh-default-prefs +%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{tbdir}/greprefs/all-redhat.js +%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{tbdir}/defaults/pref/all-redhat.js +%{__rm} rh-default-prefs cd %{buildroot}%{tbdir} export MOZ_DISABLE_GNOME=1 @@ -159,15 +175,27 @@ rm -rf %{buildroot}/%{tbdir}/chrome/{classic,comm,embed-sample,en-{mac,win},help #=============================================================================== %changelog +* Thu Dec 16 2004 Christopher Aillon 1.0-2 +- Add RPM version to useragent + +* Thu Dec 16 2004 Christopher Blizzard +- Port over pango patches from firefox + * Wed Dec 8 2004 Christopher Aillon 1.0-1 - Thunderbird 1.0 * Mon Dec 6 2004 Christopher Aillon 1.0-0.rc1.1 - Fix advanced prefs +* Fri Dec 3 2004 Christopher Aillon +- Make this run on s390(x) now for real + * Wed Dec 1 2004 Christopher Aillon 1.0-0.rc1.0 - Update to 1.0 rc1 +* Fri Nov 19 2004 Christopher Aillon +- Add patches to build and run on s390(x) + * Thu Nov 11 2004 Christopher Aillon 0.9.0-2 - Rebuild to fix file chooser