cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to thunderbird 7.0.1/lightning 1.0beta6.

Browse Source
This commit is contained in:
landry 2011-10-03 21:07:05 +00:00
parent 8b56e5ea00
commit a85fcf43f1
29 changed files with 89 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.137 2011/09/21 14:34:27 nigel Exp $
# $OpenBSD: Makefile,v 1.138 2011/10/03 21:07:05 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@ -8,19 +8,19 @@ BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
# Don't forget to bump mail/thunderbird-i18n after updates.
# Don't forget to update productivity/sunbird if patches changes.
MOZILLA_VERSION = 6.0.2
MOZILLA_VERSION = 7.0.1
MOZILLA_BRANCH = release
MOZILLA_PROJECT = thunderbird
MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-1.0beta5
PKGNAME-lightning = lightning-1.0beta6
PKGNAME-enigmail = enigmail-1.3.2
REVISION-main = 1
REVISION-lightning = 0
REVISION-enigmail = 0
EPOCH-lightning = 0
#MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
MASTER_SITES0 = http://www.mozilla-enigmail.org/download/source/
DISTFILES += ${MOZILLA_PROJECT}-${MOZILLA_VERSION}.source.tar.bz2 \
enigmail-1.3.2.tar.gz:0
@ -66,10 +66,10 @@ CONFIGURE_ENV += CPPFLAGS=-I${X11BASE}/include
LIB_DEPENDS-main = ${LIB_DEPENDS}
WANTLIB-main = ${WANTLIB}
LIB_DEPENDS-lightning = STEM->=${MOZILLA_VERSION}:${BUILD_PKGPATH},-main
WANTLIB-lightning = lib/thunderbird-${MOZILLA_VERSION}/xpcom \
lib/thunderbird-${MOZILLA_VERSION}/xul \
lib/thunderbird-${MOZILLA_VERSION}/mozalloc \
LIB_DEPENDS-lightning = STEM->=${MOZILLA_VERSION:S/b/beta/}:${BUILD_PKGPATH},-main
WANTLIB-lightning = lib/thunderbird-${MOZILLA_VERSION:C/b.//}/xpcom \
lib/thunderbird-${MOZILLA_VERSION:C/b.//}/xul \
lib/thunderbird-${MOZILLA_VERSION:C/b.//}/mozalloc \
c m stdc++ nspr4 plc4 plds4
BUILD_DEPENDS += archivers/unzip #to unzip xpi
@ -102,12 +102,12 @@ GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} \
calendar-timezones calendar-timezones@mozilla.org \
../bin/enigmail-1.4-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5}
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION:C/b.//}/extensions/
post-install:
.for xpi guid in ${GUIDS}
unzip -q ${MOB}/../xpi-stage/${xpi}.xpi -d ${EXTDIR}/${guid}
# fix maxVersion
perl -pi -e 's|<em:maxVersion>5.*</em:maxVersion>|<em:maxVersion>${MOZILLA_VERSION}</em:maxVersion>|' ${EXTDIR}/${guid}/install.rdf
# perl -pi -e 's|<em:maxVersion>5.*</em:maxVersion>|<em:maxVersion>${MOZILLA_VERSION}</em:maxVersion>|' ${EXTDIR}/${guid}/install.rdf
.endfor
# install desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ; \

10
mail/mozilla-thunderbird/distinfo
View File

@ -1,10 +1,10 @@
MD5 (mozilla/enigmail-1.3.2.tar.gz) = IxjWAyDcbD2zw02Wi7fVMw==
MD5 (mozilla/thunderbird-6.0.2.source.tar.bz2) = kXpmf+Ic/RAwktvCOhEhkg==
MD5 (mozilla/thunderbird-7.0.1.source.tar.bz2) = rRd/5SAt6r2kSIL/XIcfGw==
RMD160 (mozilla/enigmail-1.3.2.tar.gz) = +TICeeZ3Z6gCOshjuNCJ43ABggE=
RMD160 (mozilla/thunderbird-6.0.2.source.tar.bz2) = KZm1q+vE8br9Q1H7sQIWW6AJGGA=
RMD160 (mozilla/thunderbird-7.0.1.source.tar.bz2) = BNOUZLXHwxKKALDq/4BrMwfgoi4=
SHA1 (mozilla/enigmail-1.3.2.tar.gz) = i/OWZPIuOD0CbAfUrNcUocz9nW0=
SHA1 (mozilla/thunderbird-6.0.2.source.tar.bz2) = NkoT3eZYr9vbQG15MlmFBsTIvng=
SHA1 (mozilla/thunderbird-7.0.1.source.tar.bz2) = zPxv4/5K0HshTiC8RA0g4U0/++U=
SHA256 (mozilla/enigmail-1.3.2.tar.gz) = Rv+gdIKUcrpnFOGto3uMwIPQ3U4WwhrQwok8Xu9oiT0=
SHA256 (mozilla/thunderbird-6.0.2.source.tar.bz2) = TyrnBQMyJOZb/XadwBInnBI2tQ0XMxDZ+jfIinT8Q4c=
SHA256 (mozilla/thunderbird-7.0.1.source.tar.bz2) = g/V4u/oMtdD3+rpiFJk4BgUPqz4gOZljRKEclFdSUkI=
SIZE (mozilla/enigmail-1.3.2.tar.gz) = 1371388
SIZE (mozilla/thunderbird-6.0.2.source.tar.bz2) = 86083204
SIZE (mozilla/thunderbird-7.0.1.source.tar.bz2) = 87405591

10
mail/mozilla-thunderbird/patches/patch-calendar_base_src_calDateTime_cpp
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-calendar_base_src_calDateTime_cpp,v 1.1 2011/08/23 20:19:33 landry Exp $
Remove BOM http://hg.mozilla.org/comm-central/rev/6307d22ee150
--- calendar/base/src/calDateTime.cpp.orig Wed Aug 3 22:48:48 2011
+++ calendar/base/src/calDateTime.cpp Wed Aug 3 22:48:53 2011
@@ -1,4 +1,4 @@
-/* ***** BEGIN LICENSE BLOCK *****
+/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version

8
mail/mozilla-thunderbird/patches/patch-config_rules_mk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_rules_mk,v 1.7 2011/08/23 20:19:33 landry Exp $
--- config/rules.mk.orig Fri Jul 15 07:42:33 2011
+++ config/rules.mk Sun Jul 31 22:20:15 2011
@@ -623,6 +623,12 @@ endif
$OpenBSD: patch-config_rules_mk,v 1.8 2011/10/03 21:07:05 landry Exp $
--- config/rules.mk.orig Wed Aug 31 23:20:24 2011
+++ config/rules.mk Thu Sep 1 10:23:15 2011
@@ -614,6 +614,12 @@ endif
endif
endif

10
mail/mozilla-thunderbird/patches/patch-configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_in,v 1.20 2011/08/23 20:19:33 landry Exp $
--- configure.in.orig Fri Jul 15 07:42:33 2011
+++ configure.in Sun Jul 31 22:20:15 2011
@@ -1126,7 +1126,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
$OpenBSD: patch-configure_in,v 1.21 2011/10/03 21:07:05 landry Exp $
--- configure.in.orig Wed Aug 31 23:20:24 2011
+++ configure.in Thu Sep 1 10:23:15 2011
@@ -1098,7 +1098,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.20 2011/08/23 20:19:33 landry Exp $
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -5070,14 +5070,7 @@ dnl ==================================================
@@ -5043,14 +5043,7 @@ dnl ==================================================
# The GNOME component is built if one of
# gnome-vfs, gio, gconf or libnotify is available.

8
mail/mozilla-thunderbird/patches/patch-mailnews_extensions_enigmail_genxpi
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mailnews_extensions_enigmail_genxpi,v 1.1 2011/07/28 20:30:30 landry Exp $
$OpenBSD: patch-mailnews_extensions_enigmail_genxpi,v 1.2 2011/10/03 21:07:05 landry Exp $
Remove ABI=xxx marker and xpcomAbi from lib naming.
--- mailnews/extensions/enigmail/genxpi.orig Sun Jul 24 20:58:41 2011
+++ mailnews/extensions/enigmail/genxpi Sun Jul 24 20:58:42 2011
--- mailnews/extensions/enigmail/genxpi.orig Mon Aug 15 17:59:15 2011
+++ mailnews/extensions/enigmail/genxpi Tue Sep 27 18:59:33 2011
@@ -62,7 +62,7 @@ cd "$cwd"
if [ "$xpcomAbi" = "" ] ; then
xpcomAbi="unknown"
@ -9,7 +9,7 @@ Remove ABI=xxx marker and xpcomAbi from lib naming.
-platform=${osArch}_${xpcomAbi}
+platform=${osArch}
# Pepare install.rdf
sed 's/<!-- targetPlatform placeholder -->/<em:targetPlatform>'${platform}'<\/em:targetPlatform>/' < ${srcDir}/package/install.rdf > ${targetDir}/install.rdf.t1
sed 's/<!-- targetPlatform placeholder -->/<em:targetPlatform>'${platform}'<\/em:targetPlatform>/' < ${srcDir}/package/install.rdf > ${targetDir}/install.rdf
@@ -74,14 +74,14 @@ if [ ${platform} = OS2_x86-gcc3 ]; then
enigDllFile=platform/${platform}/components/${enigmimeDll}

12
mail/mozilla-thunderbird/patches/patch-mozilla_browser_app_profile_firefox_js
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.4 2011/08/23 20:19:33 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Fri Jul 15 07:51:15 2011
+++ mozilla/browser/app/profile/firefox.js Sun Jul 31 22:20:15 2011
@@ -134,7 +134,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.5 2011/10/03 21:07:05 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Wed Aug 31 23:36:12 2011
+++ mozilla/browser/app/profile/firefox.js Thu Sep 1 10:23:15 2011
@@ -135,7 +135,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.4 2011/08/23 20:19:33
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
@@ -688,10 +688,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -687,10 +687,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -23,7 +23,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.4 2011/08/23 20:19:33
// Non-enhanced mode (local url lists) URL list to check for updates
pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
@@ -753,10 +753,8 @@ pref("browser.EULA.version", 3);
@@ -752,10 +752,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

8
mail/mozilla-thunderbird/patches/patch-mozilla_content_events_src_nsContentEventHandler_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_content_events_src_nsContentEventHandler_cpp,v 1.3 2011/08/23 20:19:33 landry Exp $
--- mozilla/content/events/src/nsContentEventHandler.cpp.orig Fri Jul 15 07:51:19 2011
+++ mozilla/content/events/src/nsContentEventHandler.cpp Sun Jul 31 22:20:15 2011
@@ -1028,7 +1028,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
$OpenBSD: patch-mozilla_content_events_src_nsContentEventHandler_cpp,v 1.4 2011/10/03 21:07:05 landry Exp $
--- mozilla/content/events/src/nsContentEventHandler.cpp.orig Wed Aug 31 23:36:15 2011
+++ mozilla/content/events/src/nsContentEventHandler.cpp Thu Sep 1 10:23:16 2011
@@ -1096,7 +1096,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
selPrivate->EndBatchChanges();
NS_ENSURE_SUCCESS(rv, rv);

8
mail/mozilla-thunderbird/patches/patch-mozilla_gfx_thebes_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.2 2011/08/23 20:19:33 landry Exp $
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.3 2011/10/03 21:07:05 landry Exp $
????
--- mozilla/gfx/thebes/Makefile.in.orig Fri Jul 15 07:51:26 2011
+++ mozilla/gfx/thebes/Makefile.in Sun Jul 31 22:20:15 2011
@@ -436,6 +436,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
--- mozilla/gfx/thebes/Makefile.in.orig Wed Aug 31 23:36:21 2011
+++ mozilla/gfx/thebes/Makefile.in Thu Sep 1 10:23:16 2011
@@ -383,6 +383,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

14
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.4 2011/08/23 20:19:33 landry Exp $
--- mozilla/js/src/configure.in.orig Fri Jul 29 10:09:11 2011
+++ mozilla/js/src/configure.in Wed Aug 3 10:43:10 2011
@@ -1186,7 +1186,7 @@ WIN_TOP_SRC=
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.5 2011/10/03 21:07:05 landry Exp $
--- mozilla/js/src/configure.in.orig Wed Aug 31 23:36:31 2011
+++ mozilla/js/src/configure.in Thu Sep 1 10:23:17 2011
@@ -1208,7 +1208,7 @@ WIN_TOP_SRC=
MOZ_USER_DIR=".mozilla"
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.4 2011/08/23 20:19:33 landry Exp
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
@@ -2382,7 +2382,7 @@ ia64*-hpux*)
@@ -2424,7 +2424,7 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -19,7 +19,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.4 2011/08/23 20:19:33 landry Exp
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2734,7 +2734,7 @@ arm*-*)
@@ -2759,7 +2759,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
@ -28,7 +28,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.4 2011/08/23 20:19:33 landry Exp
ENABLE_TRACEJIT=1
NANOJIT_ARCH=Sparc
ENABLE_METHODJIT=1
@@ -2821,7 +2821,7 @@ case "$target" in
@@ -2846,7 +2846,7 @@ case "$target" in
*-solaris*)
AC_DEFINE(AVMPLUS_UNIX)
;;

13
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_jsval_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_js_src_jsval_h,v 1.1 2011/07/24 07:10:12 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=599764
--- mozilla/js/src/jsval.h.orig Sat May 28 00:43:52 2011
+++ mozilla/js/src/jsval.h Mon May 30 14:28:49 2011
@@ -823,7 +823,7 @@ extern "C++"
#else /* defined(JS_USE_JSVAL_JSID_STRUCT_TYPES) */
/* Use different primitive types so overloading works. */
-typedef JSVAL_ALIGNMENT uint64 jsval;
+typedef JSVAL_ALIGNMENT uint64_t jsval;
typedef ptrdiff_t jsid;
/* Internal helper macros */

8
mail/mozilla-thunderbird/patches/patch-mozilla_js_src_xpconnect_src_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_xpconnect_src_Makefile_in,v 1.4 2011/08/23 20:19:33 landry Exp $
--- mozilla/js/src/xpconnect/src/Makefile.in.orig Fri Jul 15 07:51:32 2011
+++ mozilla/js/src/xpconnect/src/Makefile.in Sun Jul 31 22:20:15 2011
@@ -203,6 +203,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
$OpenBSD: patch-mozilla_js_src_xpconnect_src_Makefile_in,v 1.5 2011/10/03 21:07:05 landry Exp $
--- mozilla/js/src/xpconnect/src/Makefile.in.orig Wed Aug 31 23:36:53 2011
+++ mozilla/js/src/xpconnect/src/Makefile.in Thu Sep 1 10:23:17 2011
@@ -179,6 +179,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
--makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
$(ENABLE_TRACEABLE_FLAGS) \
$(srcdir)/dom_quickstubs.qsconf

19
mail/mozilla-thunderbird/patches/patch-mozilla_layout_build_Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-mozilla_layout_build_Makefile_in,v 1.4 2011/08/23 20:19:33 landry Exp $
--- mozilla/layout/build/Makefile.in.orig Fri Jul 15 07:51:32 2011
+++ mozilla/layout/build/Makefile.in Sun Jul 31 22:34:31 2011
@@ -276,11 +276,11 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
endif
-ifdef MOZ_SYDNEYAUDIO
-ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
-EXTRA_DSO_LDOPTS += -lossaudio
-endif
+# Sydney audio sndio backend.
+EXTRA_DSO_LDOPTS += -lsndio \
+ $(NULL)
+ifdef MOZ_SYDNEYAUDIO
ifeq ($(OS_ARCH),Linux)
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif

30
mail/mozilla-thunderbird/patches/patch-mozilla_modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-mozilla_modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.3 2011/07/24 07:10:12 landry Exp $
--- mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp.orig Mon Mar 14 14:57:32 2011
+++ mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp Mon Mar 14 22:10:06 2011
@@ -187,7 +187,7 @@ ensure_libgnomeui()
// Attempt to get the libgnomeui symbol references. We do it this way so that stock icons from Init()
// don't get held back by InitWithGnome()'s libgnomeui dependency.
if (!gTriedToLoadGnomeLibs) {
- gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so.0");
+ gLibGnomeUI = PR_LoadLibrary("libgnomeui-2.so");
if (!gLibGnomeUI)
return NS_ERROR_NOT_AVAILABLE;
@@ -212,7 +212,7 @@ static nsresult
ensure_libgnome()
{
if (!gTriedToLoadGnomeLibs) {
- gLibGnome = PR_LoadLibrary("libgnome-2.so.0");
+ gLibGnome = PR_LoadLibrary("libgnome-2.so");
if (!gLibGnome)
return NS_ERROR_NOT_AVAILABLE;
@@ -234,7 +234,7 @@ static nsresult
ensure_libgnomevfs()
{
if (!gTriedToLoadGnomeLibs) {
- gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so.0");
+ gLibGnomeVFS = PR_LoadLibrary("libgnomevfs-2.so");
if (!gLibGnomeVFS)
return NS_ERROR_NOT_AVAILABLE;

8
mail/mozilla-thunderbird/patches/patch-mozilla_parser_html_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.1 2010/07/27 17:01:16 landry Exp $
--- mozilla/parser/html/Makefile.in.orig Wed Jul 7 09:09:17 2010
+++ mozilla/parser/html/Makefile.in Wed Jul 7 09:09:47 2010
@@ -98,3 +98,6 @@ include $(topsrcdir)/config/rules.mk
$OpenBSD: patch-mozilla_parser_html_Makefile_in,v 1.2 2011/10/03 21:07:05 landry Exp $
--- mozilla/parser/html/Makefile.in.orig Wed Aug 31 23:37:11 2011
+++ mozilla/parser/html/Makefile.in Thu Sep 1 10:23:18 2011
@@ -88,3 +88,6 @@ include $(topsrcdir)/config/rules.mk
INCLUDES += \
-I$(srcdir)/../../content/base/src \
$(NULL)

10
mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.3 2011/08/23 20:19:33 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Fri Jul 15 07:51:43 2011
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Sun Jul 31 22:20:16 2011
@@ -821,11 +821,10 @@ nsNSSComponent::InstallLoadableRoots()
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.4 2011/10/03 21:07:05 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Wed Aug 31 23:37:26 2011
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Thu Sep 1 10:23:18 2011
@@ -849,11 +849,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
const char *possible_ckbi_locations[] = {
@ -16,7 +16,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.3 2011/0
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -834,7 +833,7 @@ nsNSSComponent::InstallLoadableRoots()
@@ -862,7 +861,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{

8
mail/mozilla-thunderbird/patches/patch-mozilla_storage_src_mozStorageConnection_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.4 2011/08/23 20:19:33 landry Exp $
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.5 2011/10/03 21:07:05 landry Exp $
force the use of secure_delete instead of using internal sqlite copy
--- mozilla/storage/src/mozStorageConnection.cpp.orig Fri Jul 15 07:51:46 2011
+++ mozilla/storage/src/mozStorageConnection.cpp Sun Jul 31 22:20:16 2011
@@ -555,6 +555,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
--- mozilla/storage/src/mozStorageConnection.cpp.orig Wed Aug 31 23:37:33 2011
+++ mozilla/storage/src/mozStorageConnection.cpp Thu Sep 1 10:23:18 2011
@@ -595,6 +595,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

10
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.6 2011/08/23 20:19:33 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Fri Jul 15 07:51:48 2011
+++ mozilla/toolkit/library/Makefile.in Sun Jul 31 22:33:53 2011
@@ -168,12 +168,6 @@ EXTRA_DSO_LDOPTS += \
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.7 2011/10/03 21:07:05 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Wed Aug 31 23:37:37 2011
+++ mozilla/toolkit/library/Makefile.in Thu Sep 1 10:23:18 2011
@@ -171,12 +171,6 @@ EXTRA_DSO_LDOPTS += \
endif
endif
@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.6 2011/08/23 20:19:33 la
ifdef MOZ_PLATFORM_MAEMO
EXTRA_DSO_LDOPTS += $(MOZ_PLATFORM_MAEMO_LIBS)
endif
@@ -250,6 +244,12 @@ ifeq ($(OS_ARCH),OpenBSD)
@@ -253,6 +247,12 @@ ifeq ($(OS_ARCH),OpenBSD)
# Needed by nsAuthGSSAPI
EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
endif

8
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_library_libxul-config_mk
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_toolkit_library_libxul-config_mk,v 1.2 2011/08/23 20:19:33 landry Exp $
$OpenBSD: patch-mozilla_toolkit_library_libxul-config_mk,v 1.3 2011/10/03 21:07:05 landry Exp $
'no target to build -lnss3, needed by libxul.so.17.1'
--- mozilla/toolkit/library/libxul-config.mk.orig Fri Jul 15 07:51:48 2011
+++ mozilla/toolkit/library/libxul-config.mk Sun Jul 31 22:20:16 2011
@@ -332,12 +332,13 @@ EXTRA_DSO_LDOPTS += \
--- mozilla/toolkit/library/libxul-config.mk.orig Wed Aug 31 23:37:37 2011
+++ mozilla/toolkit/library/libxul-config.mk Thu Sep 1 10:23:18 2011
@@ -337,12 +337,13 @@ EXTRA_DSO_LDOPTS += \
$(PNG_LIBS) \
$(QCMS_LIBS) \
$(MOZ_JS_LIBS) \

8
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_mozapps_installer_packager_mk
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_toolkit_mozapps_installer_packager_mk,v 1.2 2011/08/23 20:19:33 landry Exp $
$OpenBSD: patch-mozilla_toolkit_mozapps_installer_packager_mk,v 1.3 2011/10/03 21:07:05 landry Exp $
We don't want the sdk
--- mozilla/toolkit/mozapps/installer/packager.mk.orig Fri Jul 15 07:51:48 2011
+++ mozilla/toolkit/mozapps/installer/packager.mk Sun Jul 31 22:20:16 2011
@@ -704,7 +704,7 @@ endif
--- mozilla/toolkit/mozapps/installer/packager.mk.orig Wed Aug 31 23:37:41 2011
+++ mozilla/toolkit/mozapps/installer/packager.mk Thu Sep 1 10:23:18 2011
@@ -730,7 +730,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)

17
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_xre_nsNativeAppSupportUnix_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.3 2011/07/24 07:10:12 landry Exp $
--- mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp.orig Fri Jan 14 23:21:58 2011
+++ mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp Sun Feb 13 23:01:39 2011
@@ -496,11 +496,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)
#ifdef MOZ_X11
- PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so.0");
+ PRLibrary *gnomeuiLib = PR_LoadLibrary("libgnomeui-2.so");
if (!gnomeuiLib)
return NS_OK;
- PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so.0");
+ PRLibrary *gnomeLib = PR_LoadLibrary("libgnome-2.so");
if (!gnomeLib) {
PR_UnloadLibrary(gnomeuiLib);
return NS_OK;

8
mail/mozilla-thunderbird/patches/patch-mozilla_toolkit_xre_nsXREDirProvider_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.5 2011/08/23 20:19:33 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Fri Jul 15 07:51:49 2011
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Sun Jul 31 22:20:16 2011
@@ -1122,11 +1122,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.6 2011/10/03 21:07:05 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Wed Aug 31 23:37:41 2011
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Thu Sep 1 10:23:18 2011
@@ -1119,11 +1119,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

16
mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_gtk2_nsBidiKeyboard_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-mozilla_widget_src_gtk2_nsBidiKeyboard_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/widget/src/gtk2/nsBidiKeyboard.cpp.orig Sat Dec 5 02:56:52 2009
+++ mozilla/widget/src/gtk2/nsBidiKeyboard.cpp Sat Jan 16 16:28:37 2010
@@ -55,10 +55,10 @@ nsBidiKeyboard::nsBidiKeyboard()
{
#if defined(MOZ_X11)
if (!gtklib)
- gtklib = PR_LoadLibrary("libgtk-x11-2.0.so.0");
+ gtklib = PR_LoadLibrary("libgtk-x11-2.0.so");
#elif defined(MOZ_DFB)
if (!gtklib)
- gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so.0");
+ gtklib = PR_LoadLibrary("libgtk-directfb-2.0.so");
#else
return;
#endif

12
mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_gtk2_nsIdleServiceGTK_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.3 2011/07/24 07:10:12 landry Exp $
--- mozilla/widget/src/gtk2/nsIdleServiceGTK.cpp.orig Fri Jan 14 23:21:59 2011
+++ mozilla/widget/src/gtk2/nsIdleServiceGTK.cpp Sun Feb 13 23:01:39 2011
@@ -67,7 +67,7 @@ NS_IMPL_ISUPPORTS2(nsIdleServiceGTK, nsIdleService, ns
static void Initialize()
{
// This will leak - See comments in ~nsIdleServiceGTK().
- PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
+ PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
if (!xsslib) // ouch.
{
#ifdef PR_LOGGING

12
mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_gtk2_nsScreenManagerGtk_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.1 2010/04/03 09:26:46 landry Exp $
--- mozilla/widget/src/gtk2/nsScreenManagerGtk.cpp.orig Sat Dec 5 02:56:52 2009
+++ mozilla/widget/src/gtk2/nsScreenManagerGtk.cpp Sat Jan 16 16:28:37 2010
@@ -174,7 +174,7 @@ nsScreenManagerGtk :: Init()
int numScreens;
if (!mXineramalib) {
- mXineramalib = PR_LoadLibrary("libXinerama.so.1");
+ mXineramalib = PR_LoadLibrary("libXinerama.so");
if (!mXineramalib) {
mXineramalib = SCREEN_MANAGER_LIBRARY_LOAD_FAILED;
}

12
mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_qt_nsIdleServiceQt_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_widget_src_qt_nsIdleServiceQt_cpp,v 1.2 2011/07/24 07:10:12 landry Exp $
--- mozilla/widget/src/qt/nsIdleServiceQt.cpp.orig Fri Jan 14 23:21:59 2011
+++ mozilla/widget/src/qt/nsIdleServiceQt.cpp Sun Feb 13 23:01:39 2011
@@ -77,7 +77,7 @@ static void Initialize()
#ifndef MOZ_PLATFORM_MAEMO
// This will leak - See comments in ~nsIdleServiceQt().
- PRLibrary* xsslib = PR_LoadLibrary("libXss.so.1");
+ PRLibrary* xsslib = PR_LoadLibrary("libXss.so");
if (!xsslib) {
return;
}

12
mail/mozilla-thunderbird/patches/patch-mozilla_widget_src_qt_nsSound_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_widget_src_qt_nsSound_cpp,v 1.2 2011/07/24 07:10:12 landry Exp $
--- mozilla/widget/src/qt/nsSound.cpp.orig Fri Jan 14 23:21:59 2011
+++ mozilla/widget/src/qt/nsSound.cpp Sun Feb 13 23:20:42 2011
@@ -123,7 +123,7 @@ nsSound::Init()
EsdOpenSoundType EsdOpenSound;
- elib = PR_LoadLibrary("libesd.so.0");
+ elib = PR_LoadLibrary("libesd.so");
if (!elib) return NS_ERROR_NOT_AVAILABLE;
EsdOpenSound = (EsdOpenSoundType) PR_FindFunctionSymbol(elib, "esd_open_sound");

3
mail/mozilla-thunderbird/pkg/PLIST-lightning
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.4 2011/08/23 20:19:33 landry Exp $
@comment $OpenBSD: PLIST-lightning,v 1.5 2011/10/03 21:07:05 landry Exp $
@conflict lightning-<=1.0b1
@pkgpath productivity/sunbird,-lightning
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/calendar-timezones@mozilla.org/
@ -68,7 +68,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFreeBusyService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calHtmlExport.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsImportExport.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsParser-worker.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsParser.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsSerializer.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItemBase.js

5
mail/mozilla-thunderbird/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.6 2011/07/24 07:10:12 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2011/10/03 21:07:05 landry Exp $
@conflict mozilla-thunderbird-<=3.1.11
@pkgpath mail/mozilla-thunderbird
bin/${MOZILLA_PROJECT}
@ -32,6 +32,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-32
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_en_US.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/SpamAssassin.sfd
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/SpamPal.sfd
@ -46,6 +48,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/isp/rss.rdf
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/mozilla-xremote-client
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/omni.jar
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/platform.ini
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/plugin-container
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/removed-files
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/run-mozilla.sh
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}