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

Update to seamonkey 2.11/enigmail 1.4.3.

Browse Source 
- see http://www.seamonkey-project.org/releases/seamonkey2.11/
- remove the -rpath hack, not needed since matthew's ld.so fix from
  12/06
- backport cset from #750620 to fix ppc (and other exotic archs) build.
- force-disable gconf in configure.in (bug #765556)
- remove the chunk from #763408, packaging was fixed
This commit is contained in:
landry 2012-08-07 09:02:33 +00:00
parent b1e3e34607
commit 9bbed215fb
20 changed files with 128 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/seamonkey/Makefile
View File

@ -1,24 +1,22 @@
# $OpenBSD: Makefile,v 1.105 2012/06/17 18:21:43 landry Exp $
# $OpenBSD: Makefile,v 1.106 2012/08/07 09:02:33 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
COMMENT-enigmail = Mozilla Seamonkey GnuPG extension
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
MOZILLA_VERSION= 2.10.1
MOZILLA_VERSION= 2.11
MOZILLA_BRANCH = release
MOZILLA_PROJECT = seamonkey
MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-seamonkey-1.5beta1
ENIG_V = 1.4.2
PKGNAME-lightning = lightning-seamonkey-1.6beta1
ENIG_V = 1.4.3
PKGNAME-enigmail = enigmail-seamonkey-${ENIG_V}
EPOCH-lightning = 0
EPOCH-enigmail = 0
REVISION-lightning = 0
REVISION-enigmail = 0
SO_VERSION= 25.0
# NOTE: Must bump minor version if any shlib's are removed from the

14
www/seamonkey/distinfo
View File

@ -1,10 +1,4 @@
MD5 (mozilla/enigmail-1.4.2.tar.gz) = 7WCOHNTNILlvf1r9vwgRQQ==
MD5 (mozilla/seamonkey-2.10.1.source.tar.bz2) = HInTZXteLpdlORIIxfm/2g==
RMD160 (mozilla/enigmail-1.4.2.tar.gz) = +gEVQI0LQ/NHzLfSxtVO9u5INs4=
RMD160 (mozilla/seamonkey-2.10.1.source.tar.bz2) = Z+HsLcSstgRwEuHszmz0aP5Dip8=
SHA1 (mozilla/enigmail-1.4.2.tar.gz) = tMB2hRzgcY0YlWkheFk1mHEyVKk=
SHA1 (mozilla/seamonkey-2.10.1.source.tar.bz2) = +9dW98DF5hP3/EetoynFOJc2ats=
SHA256 (mozilla/enigmail-1.4.2.tar.gz) = 30Y2IPR6MNKg4WNHk7QaKF4aLIYbAk4aV8nZHPa/NYE=
SHA256 (mozilla/seamonkey-2.10.1.source.tar.bz2) = lulUI5PRSnUi0FmTtUI5stRbxxmDiaVuHlavlwOMrI8=
SIZE (mozilla/enigmail-1.4.2.tar.gz) = 1319995
SIZE (mozilla/seamonkey-2.10.1.source.tar.bz2) = 103439433
SHA256 (mozilla/enigmail-1.4.3.tar.gz) = RAA18Zoi6OI0xTCg54+57nS7k0/Pchd3ho3nkyRjbSc=
SHA256 (mozilla/seamonkey-2.11.source.tar.bz2) = Z3HuKrsGiCV0jm68quTnieTGTbmyIK+vQtwTk0tSxNk=
SIZE (mozilla/enigmail-1.4.3.tar.gz) = 1337811
SIZE (mozilla/seamonkey-2.11.source.tar.bz2) = 105846143

21
www/seamonkey/patches/patch-config_rules_mk
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-config_rules_mk,v 1.10 2012/06/11 15:38:33 landry Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
Workarounds https://bugzilla.mozilla.org/show_bug.cgi?id=668869
--- config/rules.mk.orig Fri Jun 1 19:11:49 2012
+++ config/rules.mk Wed Jun 6 12:49:40 2012
@@ -555,6 +555,14 @@ endif
endif
endif
+ifeq ($(OS_ARCH),OpenBSD)
+ifdef IS_COMPONENT
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
+DSO_LDOPTS += -Wl,-rpath,'$(installdir)'
+OS_LDFLAGS += -Wl,-rpath,'$(installdir)'
+endif
+
#
# HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
# which uses internal symbols first

20
www/seamonkey/patches/patch-configure_in Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-configure_in,v 1.14 2012/08/07 09:02:33 landry Exp $
Force-disable gconf, configure arg not used
--- configure.in.orig Sun Jul 15 13:51:36 2012
+++ configure.in Tue Jul 17 21:17:24 2012
@@ -4992,14 +4992,7 @@ dnl ==================================================
# The GNOME component is built if one of
# gnome-vfs, gio, gconf or libnotify is available.
-if test "$MOZ_ENABLE_GCONF" || \
- test "$MOZ_ENABLE_GNOMEVFS" || \
- test "$MOZ_ENABLE_GIO" || \
- test "$MOZ_ENABLE_LIBNOTIFY"; then
- MOZ_ENABLE_GNOME_COMPONENT=1
-else
- MOZ_ENABLE_GNOME_COMPONENT=
-fi
+MOZ_ENABLE_GNOME_COMPONENT=
AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT)
dnl ========================================================

14
www/seamonkey/patches/patch-mozilla_browser_app_profile_firefox_js
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.9 2012/06/11 15:38:33 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Fri May 18 06:10:34 2012
+++ mozilla/browser/app/profile/firefox.js Fri May 18 09:27:57 2012
@@ -152,7 +152,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
$OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.10 2012/08/07 09:02:33 landry Exp $
--- mozilla/browser/app/profile/firefox.js.orig Wed Jun 13 03:44:46 2012
+++ mozilla/browser/app/profile/firefox.js Sun Jun 17 19:57:19 2012
@@ -157,7 +157,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.9 2012/06/11 15:38: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
@@ -596,7 +596,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
@@ -616,7 +616,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
@ -19,7 +19,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.9 2012/06/11 15:38:33
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -720,10 +720,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -742,10 +742,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -32,7 +32,7 @@ $OpenBSD: patch-mozilla_browser_app_profile_firefox_js,v 1.9 2012/06/11 15:38: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");
@@ -777,10 +777,8 @@ pref("browser.EULA.version", 3);
@@ -799,10 +799,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

8
www/seamonkey/patches/patch-mozilla_gfx_thebes_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.8 2012/06/11 15:38:33 landry Exp $
$OpenBSD: patch-mozilla_gfx_thebes_Makefile_in,v 1.9 2012/08/07 09:02:33 landry Exp $
????
--- mozilla/gfx/thebes/Makefile.in.orig Fri May 18 06:10:44 2012
+++ mozilla/gfx/thebes/Makefile.in Fri May 18 09:27:57 2012
@@ -389,6 +389,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
--- mozilla/gfx/thebes/Makefile.in.orig Wed Jun 13 03:45:03 2012
+++ mozilla/gfx/thebes/Makefile.in Sun Jun 17 19:57:41 2012
@@ -388,6 +388,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

14
www/seamonkey/patches/patch-mozilla_gfx_thebes_gfxPlatform_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.2 2012/06/11 15:38:33 landry Exp $
--- mozilla/gfx/thebes/gfxPlatform.cpp.orig Fri May 18 06:10:44 2012
+++ mozilla/gfx/thebes/gfxPlatform.cpp Fri May 18 09:27:57 2012
@@ -458,6 +458,7 @@ void SourceBufferDestroy(void *srcBuffer)
$OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.3 2012/08/07 09:02:33 landry Exp $
--- mozilla/gfx/thebes/gfxPlatform.cpp.orig Wed Jun 13 03:45:03 2012
+++ mozilla/gfx/thebes/gfxPlatform.cpp Sun Jun 17 19:57:20 2012
@@ -459,6 +459,7 @@ void SourceBufferDestroy(void *srcBuffer)
static_cast<SourceSurface*>(srcBuffer)->Release();
}
@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.2 2012/06/11 15:38:33 lan
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
{
gfxImageSurface* origSurf =
@@ -465,6 +466,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@@ -466,6 +467,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
origSurf->SetData(&kSourceSurface, NULL, NULL);
}
@ -17,7 +17,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.2 2012/06/11 15:38:33 lan
RefPtr<SourceSurface>
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
@@ -534,6 +536,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
@@ -535,6 +537,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
imgSurface->Stride(),
format);
@ -25,7 +25,7 @@ $OpenBSD: patch-mozilla_gfx_thebes_gfxPlatform_cpp,v 1.2 2012/06/11 15:38:33 lan
cairo_surface_t *nullSurf =
cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
cairo_surface_set_user_data(nullSurf,
@@ -542,6 +545,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
@@ -543,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
NULL);
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
cairo_surface_destroy(nullSurf);

12
www/seamonkey/patches/patch-mozilla_js_src_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.7 2012/06/11 15:38:33 landry Exp $
$OpenBSD: patch-mozilla_js_src_Makefile_in,v 1.8 2012/08/07 09:02:33 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- mozilla/js/src/Makefile.in.orig Fri May 18 06:10:47 2012
+++ mozilla/js/src/Makefile.in Fri May 18 09:27:57 2012
@@ -337,20 +337,23 @@ CPPSRCS += checks.cc \
# END enclude sources for V8 dtoa
#############################################
--- mozilla/js/src/Makefile.in.orig Wed Jun 13 03:45:07 2012
+++ mozilla/js/src/Makefile.in Sun Jun 17 19:57:41 2012
@@ -320,20 +320,23 @@ endif
endif
-# For architectures without YARR JIT, PCRE is faster than the YARR
-# interpreter (bug 684559).

8
www/seamonkey/patches/patch-mozilla_js_src_assembler_jit_ExecutableAllocator_h
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_js_src_assembler_jit_ExecutableAllocator_h,v 1.2 2012/06/11 15:38:33 landry Exp $
$OpenBSD: patch-mozilla_js_src_assembler_jit_ExecutableAllocator_h,v 1.3 2012/08/07 09:02:33 landry Exp $
https://hg.mozilla.org/mozilla-central/rev/f5a3a7b9c6b0
--- mozilla/js/src/assembler/jit/ExecutableAllocator.h.orig Fri May 18 06:10:47 2012
+++ mozilla/js/src/assembler/jit/ExecutableAllocator.h Fri May 18 09:27:57 2012
@@ -467,8 +467,6 @@ class ExecutableAllocator { (public)
--- mozilla/js/src/assembler/jit/ExecutableAllocator.h.orig Wed Jun 13 03:45:07 2012
+++ mozilla/js/src/assembler/jit/ExecutableAllocator.h Sun Jun 17 19:57:20 2012
@@ -468,8 +468,6 @@ class ExecutableAllocator { (public)
{
sync_instruction_memory((caddr_t)code, size);
}

10
www/seamonkey/patches/patch-mozilla_js_src_configure_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.9 2012/06/11 15:38:33 landry Exp $
--- mozilla/js/src/configure.in.orig Fri May 18 06:10:47 2012
+++ mozilla/js/src/configure.in Fri May 18 09:27:57 2012
@@ -2583,7 +2583,12 @@ ia64*-hpux*)
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.10 2012/08/07 09:02:33 landry Exp $
--- mozilla/js/src/configure.in.orig Wed Jun 13 03:45:07 2012
+++ mozilla/js/src/configure.in Sun Jun 17 19:57:20 2012
@@ -2351,7 +2351,12 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -15,7 +15,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.9 2012/06/11 15:38:33 landry Exp
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2871,6 +2876,10 @@ mips*-*)
@@ -2639,6 +2644,10 @@ mips*-*)
ENABLE_METHODJIT_TYPED_ARRAY=1
AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32)

16
www/seamonkey/patches/patch-mozilla_js_src_vm_RegExpObject_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.4 2012/06/11 15:38:33 landry Exp $
--- mozilla/js/src/vm/RegExpObject.cpp.orig Fri May 18 06:10:51 2012
+++ mozilla/js/src/vm/RegExpObject.cpp Fri May 18 09:34:54 2012
@@ -167,7 +167,6 @@ MatchPairs::checkAgainst(size_t inputLength)
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.5 2012/08/07 09:02:33 landry Exp $
--- mozilla/js/src/vm/RegExpObject.cpp.orig Wed Jun 13 03:45:13 2012
+++ mozilla/js/src/vm/RegExpObject.cpp Sun Jun 17 19:57:20 2012
@@ -168,7 +168,6 @@ MatchPairs::checkAgainst(size_t inputLength)
/* detail::RegExpCode */
@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.4 2012/06/11 15:38:33 lan
void
RegExpCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
{
@@ -199,46 +198,9 @@ RegExpCode::reportYarrError(JSContext *cx, TokenStream
@@ -200,46 +199,9 @@ RegExpCode::reportYarrError(JSContext *cx, TokenStream
}
}
@ -56,7 +56,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.4 2012/06/11 15:38:33 lan
/* Parse the pattern. */
ErrorCode yarrError;
YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
@@ -255,7 +217,7 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
@@ -256,7 +218,7 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
* case we have to bytecode compile it.
*/
@ -65,7 +65,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.4 2012/06/11 15:38:33 lan
if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
JSC::ExecutableAllocator *execAlloc = cx->runtime->getExecutableAllocator(cx);
if (!execAlloc) {
@@ -276,21 +238,11 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
@@ -277,21 +239,11 @@ RegExpCode::compile(JSContext *cx, JSLinearString &pat
return false;
}
@ -89,7 +89,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_cpp,v 1.4 2012/06/11 15:38:33 lan
}
RegExpRunStatus
@@ -305,18 +257,11 @@ RegExpCode::execute(JSContext *cx, const jschar *chars
@@ -306,18 +258,11 @@ RegExpCode::execute(JSContext *cx, const jschar *chars
else
result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
#else

12
www/seamonkey/patches/patch-mozilla_js_src_vm_RegExpObject_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.4 2012/06/11 15:38:33 landry Exp $
--- mozilla/js/src/vm/RegExpObject.h.orig Fri May 18 06:10:51 2012
+++ mozilla/js/src/vm/RegExpObject.h Fri May 18 09:36:17 2012
@@ -52,8 +52,6 @@
$OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.5 2012/08/07 09:02:33 landry Exp $
--- mozilla/js/src/vm/RegExpObject.h.orig Wed Jun 13 03:45:13 2012
+++ mozilla/js/src/vm/RegExpObject.h Sun Jun 17 19:57:20 2012
@@ -53,8 +53,6 @@
#if ENABLE_YARR_JIT
#include "yarr/YarrJIT.h"
#include "yarr/YarrSyntaxChecker.h"
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.4 2012/06/11 15:38:33 landr
#endif
/*
@@ -112,40 +110,33 @@ namespace detail {
@@ -113,40 +111,33 @@ namespace detail {
class RegExpCode
{
@ -56,7 +56,7 @@ $OpenBSD: patch-mozilla_js_src_vm_RegExpObject_h,v 1.4 2012/06/11 15:38:33 landr
}
static bool checkSyntax(JSContext *cx, TokenStream *tokenStream, JSLinearString *source) {
@@ -157,23 +148,17 @@ class RegExpCode
@@ -158,23 +149,17 @@ class RegExpCode
reportYarrError(cx, tokenStream, error);
return false;
#else

17
www/seamonkey/patches/patch-mozilla_mfbt_double-conversion_utils_h Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-mozilla_mfbt_double-conversion_utils_h,v 1.1 2012/08/07 09:02:33 landry Exp $
http://hg.mozilla.org/mozilla-central/rev/72e4dea9d2b2
--- mozilla/mfbt/double-conversion/utils.h.orig Sun Jul 15 14:00:39 2012
+++ mozilla/mfbt/double-conversion/utils.h Mon Aug 6 21:19:53 2012
@@ -53,7 +53,11 @@
// disabled.)
// On Linux,x86 89255e-22 != Div_double(89255.0/1e22)
#if defined(_M_X64) || defined(__x86_64__) || \
- defined(__ARMEL__) || \
+ defined(__ARMEL__) || defined(__avr32__) || \
+ defined(__hppa__) || defined(__ia64__) || \
+ defined(__mips__) || defined(__powerpc__) || \
+ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \
+ defined(__SH4__) || defined(__alpha__) || \
defined(_MIPS_ARCH_MIPS32R2)
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
#elif defined(_M_IX86) || defined(__i386__)

18
www/seamonkey/patches/patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.9 2012/06/11 15:38:33 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Fri May 18 06:11:01 2012
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Fri May 18 09:27:58 2012
$OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.10 2012/08/07 09:02:33 landry Exp $
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Wed Jun 13 03:45:32 2012
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Sun Jun 17 19:57:21 2012
@@ -111,6 +111,7 @@
#include "secerr.h"
#include "sslerr.h"
@ -59,7 +59,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.9 2012/0
}
else
{
@@ -1881,6 +1884,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
@@ -1907,6 +1910,8 @@ nsNSSComponent::InitializeNSS(bool showWarningBox)
LaunchSmartCardThreads();
@ -68,7 +68,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.9 2012/0
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("NSS Initialization done\n"));
}
}
@@ -2023,16 +2028,6 @@ nsNSSComponent::Init()
@@ -2049,16 +2054,6 @@ nsNSSComponent::Init()
if (mClientAuthRememberService)
mClientAuthRememberService->Init();
@ -85,7 +85,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.9 2012/0
InitializeCRLUpdateTimer();
RegisterPSMContentListener();
@@ -2247,6 +2242,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
@@ -2273,6 +2268,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
DoProfileChangeTeardown(aSubject);
}
else if (nsCRT::strcmp(aTopic, PROFILE_CHANGE_TEARDOWN_VETO_TOPIC) == 0) {
@ -93,7 +93,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.9 2012/0
mShutdownObjectList->allowUI();
}
else if (nsCRT::strcmp(aTopic, PROFILE_BEFORE_CHANGE_TOPIC) == 0) {
@@ -2294,6 +2290,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
@@ -2320,6 +2316,7 @@ nsNSSComponent::Observe(nsISupports *aSubject, const c
InitializeCRLUpdateTimer();
}
else if (nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
@ -101,7 +101,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.9 2012/0
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("nsNSSComponent: XPCom shutdown observed\n"));
@@ -2584,6 +2581,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
@@ -2610,6 +2607,9 @@ nsNSSComponent::DoProfileChangeNetTeardown()
void
nsNSSComponent::DoProfileChangeTeardown(nsISupports* aSubject)
{
@ -111,7 +111,7 @@ $OpenBSD: patch-mozilla_security_manager_ssl_src_nsNSSComponent_cpp,v 1.9 2012/0
bool callVeto = false;
if (!mShutdownObjectList->ifPossibleDisallowUI()) {
@@ -2637,9 +2637,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
@@ -2663,9 +2663,6 @@ nsNSSComponent::DoProfileBeforeChange(nsISupports* aSu
void
nsNSSComponent::DoProfileChangeNetRestore()
{

10
www/seamonkey/patches/patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.6 2012/06/11 15:38:33 landry Exp $
--- mozilla/toolkit/components/downloads/nsDownloadManager.cpp.orig Fri May 18 06:11:04 2012
+++ mozilla/toolkit/components/downloads/nsDownloadManager.cpp Fri May 18 09:27:59 2012
@@ -1162,7 +1162,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
$OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.7 2012/08/07 09:02:33 landry Exp $
--- mozilla/toolkit/components/downloads/nsDownloadManager.cpp.orig Wed Jun 13 03:45:36 2012
+++ mozilla/toolkit/components/downloads/nsDownloadManager.cpp Sun Jun 17 19:57:21 2012
@@ -1197,7 +1197,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
rv = downloadDir->Exists(&exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.6
NS_ENSURE_SUCCESS(rv, rv);
}
}
@@ -1270,7 +1270,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
@@ -1305,7 +1305,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
(void)customDirectory->Exists(&exists);
if (!exists) {

10
www/seamonkey/patches/patch-mozilla_toolkit_library_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.9 2012/06/11 15:38:33 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Fri May 18 06:11:05 2012
+++ mozilla/toolkit/library/Makefile.in Fri May 18 09:27:59 2012
@@ -455,6 +455,12 @@ OS_LIBS += \
$OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.10 2012/08/07 09:02:33 landry Exp $
--- mozilla/toolkit/library/Makefile.in.orig Wed Jun 13 03:45:38 2012
+++ mozilla/toolkit/library/Makefile.in Sun Jun 17 19:57:40 2012
@@ -457,6 +457,12 @@ OS_LIBS += \
$(NULL)
endif
@ -14,7 +14,7 @@ $OpenBSD: patch-mozilla_toolkit_library_Makefile_in,v 1.9 2012/06/11 15:38:33 la
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
OS_LIBS += \
@@ -466,12 +472,6 @@ OS_LIBS += \
@@ -468,12 +474,6 @@ OS_LIBS += \
-framework Foundation \
-framework AppKit \
$(NULL)

8
www/seamonkey/patches/patch-mozilla_toolkit_xre_nsXREDirProvider_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.10 2012/06/11 15:38:33 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Fri May 18 06:11:07 2012
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Fri May 18 09:27:59 2012
@@ -1168,11 +1168,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
$OpenBSD: patch-mozilla_toolkit_xre_nsXREDirProvider_cpp,v 1.11 2012/08/07 09:02:33 landry Exp $
--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig Wed Jun 13 03:45:40 2012
+++ mozilla/toolkit/xre/nsXREDirProvider.cpp Sun Jun 17 19:57:22 2012
@@ -1171,11 +1171,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

18
www/seamonkey/patches/patch-suite_installer_Makefile_in
View File

@ -1,18 +1,8 @@
$OpenBSD: patch-suite_installer_Makefile_in,v 1.3 2012/06/17 09:24:09 landry Exp $
$OpenBSD: patch-suite_installer_Makefile_in,v 1.4 2012/08/07 09:02:33 landry Exp $
Don't install the sdk
Don't make packaging warnings errors (#763408)
--- suite/installer/Makefile.in.orig Fri Jun 15 14:00:35 2012
+++ suite/installer/Makefile.in Sun Jun 17 09:42:05 2012
@@ -49,7 +49,7 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
# Be fatal, except when building with XULRunner which already bundles some files.
ifndef SYSTEM_LIBXUL
-MOZ_PKG_FATAL_WARNINGS = 1
+MOZ_PKG_FATAL_WARNINGS = 0
endif
MOZ_NONLOCALIZED_PKG_LIST = \
@@ -168,10 +168,6 @@ NON_OMNIJAR_FILES = \
--- suite/installer/Makefile.in.orig Sun Jul 15 13:51:42 2012
+++ suite/installer/Makefile.in Tue Jul 17 21:37:57 2012
@@ -175,10 +176,6 @@ NON_OMNIJAR_FILES = \
defaults/profile/panels.rdf \
$(NULL)

3
www/seamonkey/pkg/PLIST-lightning
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.9 2012/06/11 15:38:33 landry Exp $
@comment $OpenBSD: PLIST-lightning,v 1.10 2012/08/07 09:02:33 landry Exp $
@conflict lightning-seamonkey-<=1.0b1
@pkgpath productivity/sunbird,-seamonkey
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/calendar-timezones@mozilla.org/
@ -362,6 +362,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a4
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItemUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm

14
www/seamonkey/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.22 2012/06/11 15:38:34 landry Exp $
@comment $OpenBSD: PLIST-main,v 1.23 2012/08/07 09:02:33 landry Exp $
@conflict seamonkey-<=2.0.6
@pkgpath www/seamonkey
bin/${MOZILLA_PROJECT}
@ -21,12 +21,9 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/ablistWindow48.pn
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/addressbookWindow.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/addressbookWindow16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/addressbookWindow48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bmPropsWindow.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bmPropsWindow16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bmPropsWindow48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bookmark-window.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bookmark-window16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bookmark-window48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bookmarkproperties.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bookmarkproperties16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/bookmarkproperties48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default48.png
@ -54,6 +51,9 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/messengerWindow48
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/msgcomposeWindow.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/msgcomposeWindow16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/msgcomposeWindow48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/places.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/places16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/places48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/${MOZILLA_PROJECT}.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/venkman-window.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/venkman-window16.png