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

(Long awaited) update to seamonkey 2.29 / lightning 3.4.

Browse Source 
- See http://www.seamonkey-project.org/releases/seamonkey2.29/
- this is based on gecko 32, so contains all the new changes since gecko
  20 (which was the basis for seamonkey 2.26)
- remove patches to fix lightning display (merged in #1001985)
- remove mozilla/browser/components/certerror/content/aboutCertError.xhtml,
boring patch.
- add intl/icu patch from #990196
- remove
  patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp and
patch-mozilla_xpcom_io_SpecialSystemDirectory_cpp, they neved made any
sense to me and this is the wrong place to modify this.
This commit is contained in:
landry 2014-09-09 21:27:17 +00:00
parent 6df16c0463
commit 12e74ce084
14 changed files with 50 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
www/seamonkey/Makefile
View File

@ -1,24 +1,22 @@
# $OpenBSD: Makefile,v 1.161 2014/08/10 09:58:07 espie Exp $
# $OpenBSD: Makefile,v 1.162 2014/09/09 21:27:17 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
MOZILLA_VERSION = 2.26.1
MOZILLA_VERSION = 2.29
MOZILLA_BRANCH = release
MOZILLA_PROJECT = seamonkey
MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-seamonkey-3.1
REVISION-lightning = 2
PKGNAME-lightning = lightning-seamonkey-3.4
EPOCH-lightning = 0
REVISION-main = 0
HOMEPAGE = http://www.seamonkey-project.org/
#MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/nightly/${MOZILLA_VERSION}-candidates/build1/source/
SO_VERSION = 37.0
SO_VERSION = 38.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@ -80,6 +78,11 @@ GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} \
lightning {e2fda1a4-762b-4020-b5ad-a41df1933103}
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/
# MOZCONFIG is mandatory now even if empty ?
post-patch:
touch ${WRKSRC}/.mozconfig
post-install:
${INSTALL_MAN} ${WRKBUILD}/mozilla/dist/man/man1/seamonkey.1 ${PREFIX}/man/man1/

4
www/seamonkey/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mozilla/seamonkey-2.26.1.source.tar.bz2) = dB04PIfMWOOLjV7vNAM6iKQ1L/fXYGSRS/wF/vHF0vM=
SIZE (mozilla/seamonkey-2.26.1.source.tar.bz2) = 165537001
SHA256 (mozilla/seamonkey-2.29.source.tar.bz2) = SJRfeDLjwLUnNHBU8xEniuyHF1lz3PR0oGwrOkZSjkM=
SIZE (mozilla/seamonkey-2.29.source.tar.bz2) = 174027049

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

@ -1,16 +0,0 @@
$OpenBSD: patch-calendar_base_jar_mn,v 1.1 2014/04/29 21:47:00 landry Exp $
https://hg.mozilla.org/comm-central/rev/f5b5722c7fe1
remove in 2.28
--- calendar/base/jar.mn.orig Sat Apr 26 12:05:52 2014
+++ calendar/base/jar.mn Sat Apr 26 12:06:24 2014
@@ -106,7 +106,7 @@ calendar.jar:
content/calendar/calFilter.js (src/calFilter.js)
content/calendar/Windows98ToZoneInfoTZId.properties (src/Windows98ToZoneInfoTZId.properties)
content/calendar/WindowsNTToZoneInfoTZId.properties (src/WindowsNTToZoneInfoTZId.properties)
-% skin calendar classic/1.0 chrome/skin/linux/calendar/ os=Linux
+% skin calendar classic/1.0 chrome/skin/linux/calendar/
% skin calendar classic/1.0 chrome/skin/osx/calendar/ os=Darwin
% skin calendar classic/1.0 chrome/skin/windows/calendar/ os=WINNT
% skin calendar-common classic/1.0 chrome/skin/common/

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

@ -1,16 +0,0 @@
$OpenBSD: patch-calendar_lightning_jar_mn,v 1.1 2014/04/29 21:47:00 landry Exp $
https://hg.mozilla.org/comm-central/rev/f5b5722c7fe1
remove in 2.28
--- calendar/lightning/jar.mn.orig Sat Apr 26 19:11:53 2014
+++ calendar/lightning/jar.mn Sat Apr 26 19:12:06 2014
@@ -55,7 +55,7 @@ lightning.jar:
content/lightning/suite-overlay-preferences.xul (content/suite-overlay-preferences.xul)
content/lightning/suite-overlay-sidebar.js (content/suite-overlay-sidebar.js)
content/lightning/suite-overlay-sidebar.xul (content/suite-overlay-sidebar.xul)
-% skin lightning classic/1.0 chrome/skin/linux/lightning/ os=Linux
+% skin lightning classic/1.0 chrome/skin/linux/lightning/
% skin lightning classic/1.0 chrome/skin/osx/lightning/ os=Darwin
% skin lightning classic/1.0 chrome/skin/windows/lightning/ os=WINNT
% skin lightning-common classic/1.0 chrome/skin/lightning-common/

13
www/seamonkey/patches/patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-mozilla_browser_components_certerror_content_aboutCertError_xhtml,v 1.7 2012/09/01 14:10:03 landry Exp $
--- mozilla/browser/components/certerror/content/aboutCertError.xhtml.orig Mon Aug 27 06:49:03 2012
+++ mozilla/browser/components/certerror/content/aboutCertError.xhtml Sat Sep 1 02:00:10 2012
@@ -96,6 +96,9 @@
tech.textContent = getDescription();
addDomainErrorLink();
+
+ var button = document.getElementById("exceptionDialogButton");
+ button.click();
}
/* In the case of SSL error pages about domain mismatch, see if

13
www/seamonkey/patches/patch-mozilla_intl_icu_source_Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-mozilla_intl_icu_source_Makefile_in,v 1.1 2014/09/09 21:27:17 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=990196
--- mozilla/intl/icu/source/Makefile.in.orig Mon Sep 8 20:34:59 2014
+++ mozilla/intl/icu/source/Makefile.in Mon Sep 8 20:54:30 2014
@@ -311,7 +311,7 @@ $(top_builddir)/config/pkgdataMakefile:
$(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed
-$(RMV) $@
- $(INSTALL_SCRIPT) $(top_srcdir)/config/icu-config-top $@
+ install -m 555 $(top_srcdir)/config/icu-config-top $@
chmod u+w $@
@echo "# Following from @platform_make_fragment@" >> $@
LC_ALL=C sed -f $(top_srcdir)/config/make2sh.sed < $(top_builddir)/config/Makefile.inc | grep -v '#M#' | uniq >> $@

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.24 2014/04/29 21:47:00 landry Exp $
--- mozilla/js/src/configure.in.orig Wed Apr 9 04:26:56 2014
+++ mozilla/js/src/configure.in Tue Apr 15 06:27:50 2014
@@ -1806,7 +1806,12 @@ ia64*-hpux*)
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.25 2014/09/09 21:27:17 landry Exp $
--- mozilla/js/src/configure.in.orig Fri Sep 5 07:36:33 2014
+++ mozilla/js/src/configure.in Mon Sep 8 20:34:49 2014
@@ -1804,7 +1804,12 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -15,7 +15,7 @@ $OpenBSD: patch-mozilla_js_src_configure_in,v 1.24 2014/04/29 21:47:00 landry Ex
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2078,6 +2083,10 @@ dnl ENABLE_ION=0
@@ -2016,6 +2021,10 @@ powerpc-*)
mips*-*)
AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c,v 1.5 2012/06/11 15:38:33 landry Exp $
--- mozilla/js/src/ctypes/libffi/src/dlmalloc.c.orig Thu Feb 16 05:25:02 2012
+++ mozilla/js/src/ctypes/libffi/src/dlmalloc.c Tue Mar 6 13:23:24 2012
@@ -2517,7 +2517,6 @@ static int init_mparams(void) {
$OpenBSD: patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c,v 1.6 2014/09/09 21:27:17 landry Exp $
--- mozilla/js/src/ctypes/libffi/src/dlmalloc.c.orig Fri Sep 5 07:36:33 2014
+++ mozilla/js/src/ctypes/libffi/src/dlmalloc.c Mon Sep 8 20:34:50 2014
@@ -2520,7 +2520,6 @@ static int init_mparams(void) {
#if (FOOTERS && !INSECURE)
{
@ -9,7 +9,7 @@ $OpenBSD: patch-mozilla_js_src_ctypes_libffi_src_dlmalloc_c,v 1.5 2012/06/11 15:
int fd;
unsigned char buf[sizeof(size_t)];
/* Try to use /dev/urandom, else fall back on using time */
@@ -2527,7 +2526,6 @@ static int init_mparams(void) {
@@ -2530,7 +2529,6 @@ static int init_mparams(void) {
close(fd);
}
else

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

@ -1,10 +1,10 @@
$OpenBSD: patch-mozilla_media_libvpx_Makefile_in,v 1.3 2014/04/29 21:47:00 landry Exp $
$OpenBSD: patch-mozilla_media_libvpx_Makefile_in,v 1.4 2014/09/09 21:27:17 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=982693
--- mozilla/media/libvpx/Makefile.in.orig Tue Apr 29 07:03:06 2014
+++ mozilla/media/libvpx/Makefile.in Tue Apr 29 07:45:47 2014
@@ -74,7 +74,7 @@ vp8_asm_enc_offsets.s: CFLAGS += -DINLINE_ASM
--- mozilla/media/libvpx/Makefile.in.orig Fri Sep 5 07:36:51 2014
+++ mozilla/media/libvpx/Makefile.in Mon Sep 8 20:35:00 2014
@@ -75,7 +75,7 @@ vp8_asm_enc_offsets.s: CFLAGS := -DINLINE_ASM
vp8_asm_enc_offsets.s: $(srcdir)/vp8/encoder/vp8_asm_enc_offsets.c
$(REPORT_BUILD)

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

@ -1,8 +1,8 @@
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.18 2013/12/12 19:58:39 landry Exp $
$OpenBSD: patch-mozilla_storage_src_mozStorageConnection_cpp,v 1.19 2014/09/09 21:27:17 landry Exp $
force the use of secure_delete instead of using internal sqlite copy
--- mozilla/storage/src/mozStorageConnection.cpp.orig Sat Dec 7 16:13:21 2013
+++ mozilla/storage/src/mozStorageConnection.cpp Sun Dec 8 11:09:52 2013
@@ -677,6 +677,13 @@ Connection::initializeInternal(nsIFile* aDatabaseFile)
--- mozilla/storage/src/mozStorageConnection.cpp.orig Fri Sep 5 07:37:07 2014
+++ mozilla/storage/src/mozStorageConnection.cpp Mon Sep 8 20:34:50 2014
@@ -696,6 +696,13 @@ Connection::initializeInternal(nsIFile* aDatabaseFile)
return convertResultCode(srv);
}

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

@ -1,21 +0,0 @@
$OpenBSD: patch-mozilla_toolkit_components_downloads_nsDownloadManager_cpp,v 1.14 2014/03/24 21:34:21 landry Exp $
--- mozilla/toolkit/components/downloads/nsDownloadManager.cpp.orig Wed Mar 5 00:34:36 2014
+++ mozilla/toolkit/components/downloads/nsDownloadManager.cpp Sun Mar 9 00:00:11 2014
@@ -1409,7 +1409,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsIFil
rv = downloadDir->Exists(&exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
- rv = downloadDir->Create(nsIFile::DIRECTORY_TYPE, 0755);
+ rv = downloadDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
NS_ENSURE_SUCCESS(rv, rv);
}
}
@@ -1508,7 +1508,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsIFile *
(void)customDirectory->Exists(&exists);
if (!exists) {
- rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0755);
+ rv = customDirectory->Create(nsIFile::DIRECTORY_TYPE, 0700);
if (NS_SUCCEEDED(rv)) {
customDirectory.forget(aResult);
return NS_OK;

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

@ -1,12 +0,0 @@
$OpenBSD: patch-mozilla_xpcom_io_SpecialSystemDirectory_cpp,v 1.10 2013/12/12 19:58:39 landry Exp $
--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.orig Sat Dec 7 16:13:26 2013
+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp Sun Dec 8 11:09:52 2013
@@ -454,7 +454,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
if (NS_FAILED(rv))
return rv;
if (!exists) {
- rv = file->Create(nsIFile::DIRECTORY_TYPE, 0755);
+ rv = file->Create(nsIFile::DIRECTORY_TYPE, 0700);
if (NS_FAILED(rv))
return rv;
}

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

@ -1,8 +1,8 @@
$OpenBSD: patch-suite_installer_Makefile_in,v 1.8 2013/12/12 19:58:39 landry Exp $
$OpenBSD: patch-suite_installer_Makefile_in,v 1.9 2014/09/09 21:27:17 landry Exp $
Don't install the sdk
--- suite/installer/Makefile.in.orig Sat Dec 7 15:56:58 2013
+++ suite/installer/Makefile.in Sun Dec 8 11:10:45 2013
@@ -138,10 +138,6 @@ NON_OMNIJAR_FILES = \
--- suite/installer/Makefile.in.orig Fri Sep 5 07:30:38 2014
+++ suite/installer/Makefile.in Mon Sep 8 20:35:00 2014
@@ -139,10 +139,6 @@ NON_OMNIJAR_FILES = \
defaults/profile/panels.rdf \
$(NULL)

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.21 2014/04/29 21:47:00 landry Exp $
@comment $OpenBSD: PLIST-lightning,v 1.22 2014/09/09 21:27:17 landry Exp $
@conflict lightning-seamonkey-<=1.0b1
@pkgpath productivity/sunbird,-seamonkey
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}/
@ -91,7 +91,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar-en-US.jar
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/Windows98ToZoneInfoTZId.properties
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/WindowsNTToZoneInfoTZId.properties
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/agenda-listbox.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/calendar/content/calendar/agenda-listbox.xml
@ -280,6 +279,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/lightning-common/
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/lightning-common/imip.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/lightning-common/lightning-toolbar.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/lightning-common/lightning.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/lightning-common/mode-switch-icons.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome/skin/linux/calendar/
@ -468,6 +468,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItipProtocolHandler.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calMemoryCalendar.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calMemoryCalendar.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calSleepMonitor.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calSleepMonitor.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.js
@ -491,7 +493,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/preferences/lightning.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/OAuth2.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calExtract.jsm