Update to seamonkey 2.49.5.

See http://www.seamonkey-project.org/releases/seamonkey2.49.5/#new

Note that this is still BROKEN-amd64, but it builds & packages on i386.
This commit is contained in:
landry 2019-10-25 11:49:14 +00:00
parent ad9d74ae02
commit 2147d4e8f6
14 changed files with 35 additions and 733 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.232 2019/09/22 17:19:07 sthen Exp $
# $OpenBSD: Makefile,v 1.233 2019/10/25 11:49:14 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
@ -6,16 +6,14 @@ ONLY_FOR_ARCHS = amd64 i386
BROKEN-amd64 = xpcshell segfaults during fake since llvm8 update
# version = (TB version - 3) / 100 + 2
MOZILLA_VERSION = 2.49.4
MOZILLA_VERSION = 2.49.5
MOZILLA_PROJECT = seamonkey
MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
PKGNAME-lightning = lightning-seamonkey-5.4.4
PKGNAME-lightning = lightning-seamonkey-5.4.5
EPOCH-lightning = 0
REVISION-main = 7
REVISION-lightning = 0
HOMEPAGE = http://www.seamonkey-project.org/
@ -23,7 +21,7 @@ SO_VERSION = 47.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = ldap60 ldif60 mozavcodec mozavutil prldap60 suite xul lgpllibs
MOZILLA_LIBS = ldap60 ldif60 mozavcodec mozavutil mozgtk prldap60 suite xul lgpllibs
CATEGORIES= www mail net news
@ -39,7 +37,7 @@ MODCLANG_ARCHS = amd64 i386
# gecko >= 44 doesnt build with base libevent
MOZILLA_USE_BUNDLED_LIBEVENT = Yes
# gecko >= 46 defaults to gtk+3
#MOZILLA_USE_GTK3 = Yes
MOZILLA_USE_GTK3 = Yes
CONFIGURE_ARGS += --enable-default-toolkit=cairo-gtk2
NO_TEST= Yes
@ -47,7 +45,7 @@ CONFIGURE_STYLE = simple
CONFIGURE_ARGS += --prefix=${PREFIX}
RUN_DEPENDS-lightning = STEM->=${MOZILLA_VERSION:S/b/beta/}:${BUILD_PKGPATH},-main
WANTLIB += X11-xcb fribidi intl pixman-1 xcb xcb-shm
WANTLIB += X11-xcb intl pixman-1 xcb xcb-shm
WANTLIB-lightning=
# build lightning xpi

View File

@ -1,2 +1,2 @@
SHA256 (mozilla/seamonkey-2.49.4.source.tar.xz) = yKZndNCjUlaYtVn6LEE5cYby3pnFcz41uOr7CuXMxO4=
SIZE (mozilla/seamonkey-2.49.4.source.tar.xz) = 231795176
SHA256 (mozilla/seamonkey-2.49.5.source.tar.xz) = B/0V0Y4YAQ8Id7QD71Of210rjbWZIUM6aEGEX92faCI=
SIZE (mozilla/seamonkey-2.49.5.source.tar.xz) = 231748204

View File

@ -1,232 +0,0 @@
$OpenBSD: patch-calendar_base_jar_mn,v 1.3 2017/11/14 20:46:57 landry Exp $
Revert https://bug1402645.bmoattachments.org/attachment.cgi?id=8912293
Index: calendar/base/jar.mn
--- calendar/base/jar.mn.orig
+++ calendar/base/jar.mn
@@ -0,0 +1,225 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+calendar.jar:
+% resource calendar .
+% content calendar %content/calendar/
+ content/calendar/agenda-listbox.js (content/agenda-listbox.js)
+ content/calendar/agenda-listbox.xml (content/agenda-listbox.xml)
+ content/calendar/calendar-bindings.css (content/calendar-bindings.css)
+ content/calendar/calendar-calendars-list.xul (content/calendar-calendars-list.xul)
+ content/calendar/calendar-chrome-startup.js (content/calendar-chrome-startup.js)
+ content/calendar/calendar-clipboard.js (content/calendar-clipboard.js)
+* content/calendar/calendar-common-sets.xul (content/calendar-common-sets.xul)
+ content/calendar/calendar-common-sets.js (content/calendar-common-sets.js)
+ content/calendar/calendar-daypicker.xml (content/calendar-daypicker.xml)
+ content/calendar/calendar-views.xml (content/calendar-views.xml)
+* content/calendar/calendar-dnd-listener.js (content/calendar-dnd-listener.js)
+ content/calendar/calendar-extract.js (content/calendar-extract.js)
+ content/calendar/calendar-invitations-manager.js (content/calendar-invitations-manager.js)
+ content/calendar/calendar-item-editing.js (content/calendar-item-editing.js)
+ content/calendar/calendar-item-bindings.xml (content/calendar-item-bindings.xml)
+ content/calendar/calendar-management.js (content/calendar-management.js)
+ content/calendar/calendar-menus.xml (content/calendar-menus.xml)
+ content/calendar/calendar-views.xul (content/calendar-views.xul)
+ content/calendar/calendar-month-view.xml (content/calendar-month-view.xml)
+ content/calendar/calendar-multiday-view.xml (content/calendar-multiday-view.xml)
+ content/calendar/calendar-base-view.xml (content/calendar-base-view.xml)
+ content/calendar/calendar-statusbar.js (content/calendar-statusbar.js)
+ content/calendar/calendar-task-editing.js (content/calendar-task-editing.js)
+ content/calendar/calendar-task-tree.xml (content/calendar-task-tree.xml)
+ content/calendar/calendar-task-tree.js (content/calendar-task-tree.js)
+ content/calendar/calendar-task-view.xul (content/calendar-task-view.xul)
+ content/calendar/calendar-task-view.js (content/calendar-task-view.js)
+ content/calendar/calendar-ui-utils.js (content/calendar-ui-utils.js)
+ content/calendar/calendar-unifinder.xul (content/calendar-unifinder.xul)
+ content/calendar/calendar-unifinder.js (content/calendar-unifinder.js)
+ content/calendar/calendar-unifinder-todo.xul (content/calendar-unifinder-todo.xul)
+ content/calendar/calendar-unifinder-todo.js (content/calendar-unifinder-todo.js)
+ content/calendar/calendar-view-bindings.css (content/calendar-view-bindings.css)
+ content/calendar/calendar-view-core.xml (content/calendar-view-core.xml)
+ content/calendar/calendar-views.js (content/calendar-views.js)
+ content/calendar/import-export.js (content/import-export.js)
+ content/calendar/today-pane.xul (content/today-pane.xul)
+ content/calendar/today-pane.js (content/today-pane.js)
+ content/calendar/calendar-alarm-dialog.js (content/dialogs/calendar-alarm-dialog.js)
+ content/calendar/calendar-alarm-dialog.xul (content/dialogs/calendar-alarm-dialog.xul)
+ content/calendar/calendar-conflicts-dialog.xul (content/dialogs/calendar-conflicts-dialog.xul)
+ content/calendar/calendar-creation.js (content/dialogs/calendar-creation.js)
+ content/calendar/calendar-dialog-utils.js (content/dialogs/calendar-dialog-utils.js)
+ content/calendar/calendar-error-prompt.xul (content/dialogs/calendar-error-prompt.xul)
+ content/calendar/calendar-event-dialog.css (content/dialogs/calendar-event-dialog.css)
+* content/calendar/calendar-event-dialog.xul (content/dialogs/calendar-event-dialog.xul)
+ content/calendar/calendar-event-dialog-attendees.xml (content/dialogs/calendar-event-dialog-attendees.xml)
+ content/calendar/calendar-event-dialog-freebusy.xml (content/dialogs/calendar-event-dialog-freebusy.xml)
+ content/calendar/calendar-event-dialog-recurrence.xul (content/dialogs/calendar-event-dialog-recurrence.xul)
+ content/calendar/calendar-event-dialog-recurrence.js (content/dialogs/calendar-event-dialog-recurrence.js)
+ content/calendar/calendar-event-dialog-recurrence-preview.xml (content/dialogs/calendar-event-dialog-recurrence-preview.xml)
+ content/calendar/calendar-event-dialog-reminder.js (content/dialogs/calendar-event-dialog-reminder.js)
+ content/calendar/calendar-event-dialog-reminder.xul (content/dialogs/calendar-event-dialog-reminder.xul)
+ content/calendar/calendar-event-dialog-timezone.js (content/dialogs/calendar-event-dialog-timezone.js)
+ content/calendar/calendar-event-dialog-timezone.xul (content/dialogs/calendar-event-dialog-timezone.xul)
+ content/calendar/calendar-event-dialog-attendees.xul (content/dialogs/calendar-event-dialog-attendees.xul)
+ content/calendar/calendar-event-dialog-attendees.js (content/dialogs/calendar-event-dialog-attendees.js)
+ content/calendar/calendar-invitations-dialog.css (content/dialogs/calendar-invitations-dialog.css)
+ content/calendar/calendar-invitations-dialog.js (content/dialogs/calendar-invitations-dialog.js)
+ content/calendar/calendar-invitations-dialog.xul (content/dialogs/calendar-invitations-dialog.xul)
+ content/calendar/calendar-invitations-list.xml (content/dialogs/calendar-invitations-list.xml)
+* content/calendar/calendar-migration-dialog.js (content/dialogs/calendar-migration-dialog.js)
+ content/calendar/calendar-migration-dialog.xul (content/dialogs/calendar-migration-dialog.xul)
+ content/calendar/calendar-occurrence-prompt.xul (content/dialogs/calendar-occurrence-prompt.xul)
+ content/calendar/calendar-print-dialog.js (content/dialogs/calendar-print-dialog.js)
+ content/calendar/calendar-print-dialog.xul (content/dialogs/calendar-print-dialog.xul)
+ content/calendar/calendar-properties-dialog.xul (content/dialogs/calendar-properties-dialog.xul)
+ content/calendar/calendar-properties-dialog.js (content/dialogs/calendar-properties-dialog.js)
+ content/calendar/calendar-providerUninstall-dialog.xul (content/dialogs/calendar-providerUninstall-dialog.xul)
+ content/calendar/calendar-providerUninstall-dialog.js (content/dialogs/calendar-providerUninstall-dialog.js)
+ content/calendar/calendar-subscriptions-dialog.css (content/dialogs/calendar-subscriptions-dialog.css)
+ content/calendar/calendar-subscriptions-dialog.js (content/dialogs/calendar-subscriptions-dialog.js)
+ content/calendar/calendar-subscriptions-dialog.xul (content/dialogs/calendar-subscriptions-dialog.xul)
+ content/calendar/calendar-summary-dialog.js (content/dialogs/calendar-summary-dialog.js)
+ content/calendar/calendar-summary-dialog.xul (content/dialogs/calendar-summary-dialog.xul)
+ content/calendar/chooseCalendarDialog.xul (content/dialogs/chooseCalendarDialog.xul)
+ content/calendar/preferences/alarms.xul (content/preferences/alarms.xul)
+ content/calendar/preferences/alarms.js (content/preferences/alarms.js)
+ content/calendar/preferences/categories.xul (content/preferences/categories.xul)
+ content/calendar/preferences/categories.js (content/preferences/categories.js)
+ content/calendar/preferences/editCategory.xul (content/preferences/editCategory.xul)
+ content/calendar/preferences/editCategory.js (content/preferences/editCategory.js)
+ content/calendar/preferences/general.js (content/preferences/general.js)
+* content/calendar/preferences/general.xul (content/preferences/general.xul)
+ content/calendar/preferences/views.js (content/preferences/views.js)
+ content/calendar/preferences/views.xul (content/preferences/views.xul)
+ content/calendar/widgets/minimonth.xml (content/widgets/minimonth.xml)
+ content/calendar/widgets/calendar-alarm-widget.xml (content/widgets/calendar-alarm-widget.xml)
+ content/calendar/widgets/calendar-widgets.xml (content/widgets/calendar-widgets.xml)
+ content/calendar/widgets/calendar-list-tree.xml (content/widgets/calendar-list-tree.xml)
+ content/calendar/calendar-subscriptions-list.xml (content/widgets/calendar-subscriptions-list.xml)
+ content/calendar/widgets/calendar-widget-bindings.css (content/widgets/calendar-widget-bindings.css)
+ content/calendar/calApplicationUtils.js (src/calApplicationUtils.js)
+ content/calendar/calUtils.js (src/calUtils.js)
+ content/calendar/calFilter.js (src/calFilter.js)
+ content/calendar/WindowsNTToZoneInfoTZId.properties (src/WindowsNTToZoneInfoTZId.properties)
+% 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/
+% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
+% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-event-dialog.css
+% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
+% style chrome://lightning/content/lightning-item-iframe.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
+% style chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
+ ../skin/common/alarm-flashing.png (themes/common/images/alarm-flashing.png)
+ ../skin/common/alarm-icons.png (themes/common/images/alarm-icons.png)
+ ../skin/common/attendee-icons.png (themes/common/images/attendee-icons.png)
+ ../skin/common/calendar-overlay.png (themes/common/images/calendar-overlay.png)
+ ../skin/common/calendar-status.png (themes/common/images/calendar-status.png)
+ ../skin/common/checkbox-images.png (themes/common/images/checkbox-images.png)
+ ../skin/common/classification.png (themes/common/images/classification.png)
+ ../skin/common/day-box-item-image.png (themes/common/images/day-box-item-image.png)
+ ../skin/common/event-grippy-bottom.png (themes/common/images/event-grippy-bottom.png)
+ ../skin/common/event-grippy-left.png (themes/common/images/event-grippy-left.png)
+ ../skin/common/event-grippy-right.png (themes/common/images/event-grippy-right.png)
+ ../skin/common/event-grippy-top.png (themes/common/images/event-grippy-top.png)
+ ../skin/common/ok-cancel.png (themes/common/images/ok-cancel.png)
+ ../skin/common/task-images.png (themes/common/images/task-images.png)
+ ../skin/common/timezone_map.png (themes/common/images/timezone_map.png)
+ ../skin/common/timezones.png (themes/common/images/timezones.png)
+ ../skin/common/calendar-event-dialog.png (themes/common/dialogs/images/calendar-event-dialog.png)
+ ../skin/common/calendar-event-tab.png (themes/common/dialogs/images/calendar-event-tab.png)
+ ../skin/common/calendar-task-tab.png (themes/common/dialogs/images/calendar-task-tab.png)
+ ../skin/common/widgets/nav-arrow.svg (themes/common/widgets/images/nav-arrow.svg)
+ ../skin/common/widgets/nav-today.svg (themes/common/widgets/images/nav-today.svg)
+ ../skin/common/widgets/nav-today-hov.svg (themes/common/widgets/images/nav-today-hov.svg)
+ ../skin/common/widgets/view-navigation.svg (themes/common/widgets/images/view-navigation.svg)
+ ../skin/common/widgets/view-navigation-hov.svg (themes/common/widgets/images/view-navigation-hov.svg)
+ ../skin/common/widgets/drag-center.svg (themes/common/widgets/images/drag-center.svg)
+ ../skin/common/calendar-alarms.css (themes/common/calendar-alarms.css)
+ ../skin/common/calendar-attendees.css (themes/common/calendar-attendees.css)
+ ../skin/common/calendar-creation-wizard.css (themes/common/calendar-creation-wizard.css)
+ ../skin/common/calendar-daypicker.css (themes/common/calendar-daypicker.css)
+ ../skin/common/calendar-management.css (themes/common/calendar-management.css)
+ ../skin/common/calendar-occurrence-prompt.css (themes/common/calendar-occurrence-prompt.css)
+ ../skin/common/calendar-printing.css (themes/common/calendar-printing.css)
+ ../skin/common/calendar-providerUninstall-dialog.css (themes/common/calendar-providerUninstall-dialog.css)
+ ../skin/common/calendar-task-tree.css (themes/common/calendar-task-tree.css)
+ ../skin/common/calendar-task-view.css (themes/common/calendar-task-view.css)
+ ../skin/common/calendar-toolbar.svg (themes/common/calendar-toolbar.svg)
+ ../skin/common/calendar-toolbar-osxlion.svg (themes/common/calendar-toolbar-osxlion.svg)
+ ../skin/common/calendar-itip-icons.svg (themes/common/calendar-itip-icons.svg)
+ ../skin/common/calendar-unifinder.css (themes/common/calendar-unifinder.css)
+ ../skin/common/calendar-views.css (themes/common/calendar-views.css)
+ ../skin/common/today-pane.css (themes/common/today-pane.css)
+ ../skin/common/today-pane-cycler.svg (themes/common/today-pane-cycler.svg)
+ ../skin/common/dialogs/calendar-alarm-dialog.css (themes/common/dialogs/calendar-alarm-dialog.css)
+ ../skin/common/dialogs/calendar-event-dialog.css (themes/common/dialogs/calendar-event-dialog.css)
+ ../skin/common/dialogs/calendar-invitations-dialog.css (themes/common/dialogs/calendar-invitations-dialog.css)
+ ../skin/common/calendar-event-dialog-attendees.png (themes/common/dialogs/images/calendar-event-dialog-attendees.png)
+ ../skin/common/calendar-invitations-dialog-button-images.png (themes/common/dialogs/images/calendar-invitations-dialog-button-images.png)
+ ../skin/common/calendar-invitations-dialog-list-images.png (themes/common/dialogs/images/calendar-invitations-dialog-list-images.png)
+ ../skin/common/calendar-properties-dialog.css (themes/common/dialogs/calendar-properties-dialog.css)
+ ../skin/common/calendar-subscriptions-dialog.css (themes/common/dialogs/calendar-subscriptions-dialog.css)
+ ../skin/common/calendar-timezone-highlighter.css (themes/common/dialogs/calendar-timezone-highlighter.css)
+ ../skin/common/widgets/calendar-widgets.css (themes/common/widgets/calendar-widgets.css)
+ ../skin/common/widgets/minimonth.css (themes/common/widgets/minimonth.css)
+
+# Linux theme files
+ ../skin/linux/calendar/cal-icon32.png (themes/linux/images/cal-icon32.png)
+ ../skin/linux/calendar/cal-icon24.png (themes/linux/images/cal-icon24.png)
+ ../skin/linux/calendar/calendar-alarm-dialog.css (themes/linux/dialogs/calendar-alarm-dialog.css)
+ ../skin/linux/calendar/calendar-daypicker.css (themes/linux/calendar-daypicker.css)
+ ../skin/linux/calendar/calendar-event-dialog.css (themes/linux/dialogs/calendar-event-dialog.css)
+ ../skin/linux/calendar/calendar-invitations-dialog.css (themes/linux/dialogs/calendar-invitations-dialog.css)
+ ../skin/linux/calendar/calendar-management.css (themes/linux/calendar-management.css)
+ ../skin/linux/calendar/calendar-task-tree.css (themes/linux/calendar-task-tree.css)
+ ../skin/linux/calendar/calendar-task-view.css (themes/linux/calendar-task-view.css)
+ ../skin/linux/calendar/calendar-unifinder.css (themes/linux/calendar-unifinder.css)
+ ../skin/linux/calendar/calendar-views.css (themes/linux/calendar-views.css)
+ ../skin/linux/calendar/today-pane.css (themes/linux/today-pane.css)
+ ../skin/linux/calendar/widgets/calendar-widgets.css (themes/linux/widgets/calendar-widgets.css)
+ ../skin/linux/calendar/calendar-occurrence-prompt.png (themes/linux/images/calendar-occurrence-prompt.png)
+
+# OS X theme files
+ ../skin/osx/calendar/cal-icon32.png (themes/osx/images/cal-icon32.png)
+ ../skin/osx/calendar/cal-icon24.png (themes/osx/images/cal-icon24.png)
+ ../skin/osx/calendar/calendar-alarm-dialog.css (themes/osx/dialogs/calendar-alarm-dialog.css)
+ ../skin/osx/calendar/calendar-daypicker.css (themes/osx/calendar-daypicker.css)
+ ../skin/osx/calendar/calendar-event-dialog.css (themes/osx/dialogs/calendar-event-dialog.css)
+ ../skin/osx/calendar/calendar-invitations-dialog.css (themes/osx/dialogs/calendar-invitations-dialog.css)
+ ../skin/osx/calendar/calendar-management.css (themes/osx/calendar-management.css)
+ ../skin/osx/calendar/calendar-task-tree.css (themes/osx/calendar-task-tree.css)
+ ../skin/osx/calendar/calendar-task-view.css (themes/osx/calendar-task-view.css)
+ ../skin/osx/calendar/calendar-unifinder.css (themes/osx/calendar-unifinder.css)
+ ../skin/osx/calendar/calendar-views.css (themes/osx/calendar-views.css)
+ ../skin/osx/calendar/checkbox-images.png (themes/osx/images/checkbox-images.png)
+ ../skin/osx/calendar/today-pane.css (themes/osx/today-pane.css)
+ ../skin/osx/calendar/widgets/calendar-widgets.css (themes/osx/widgets/calendar-widgets.css)
+ ../skin/osx/calendar/calendar-occurrence-prompt.png (themes/osx/images/calendar-occurrence-prompt.png)
+ ../skin/osx/calendar/checkbox-images-graphite.png (themes/osx/images/checkbox-images-graphite.png)
+ ../skin/osx/calendar/sidebar-item.png (themes/osx/images/sidebar-item.png)
+ ../skin/osx/calendar/spin-buttons.png (themes/osx/images/spin-buttons.png)
+ ../skin/osx/calendar/spin-buttons-active.png (themes/osx/images/spin-buttons-active.png)
+
+# Windows theme files
+ ../skin/windows/calendar/cal-icon32.png (themes/windows/images/cal-icon32.png)
+ ../skin/windows/calendar/cal-icon24.png (themes/windows/images/cal-icon24.png)
+ ../skin/windows/calendar/calendar-alarm-dialog.css (themes/windows/dialogs/calendar-alarm-dialog.css)
+ ../skin/windows/calendar/calendar-daypicker.css (themes/windows/calendar-daypicker.css)
+ ../skin/windows/calendar/calendar-event-dialog.css (themes/windows/dialogs/calendar-event-dialog.css)
+ ../skin/windows/calendar/calendar-invitations-dialog.css (themes/windows/dialogs/calendar-invitations-dialog.css)
+ ../skin/windows/calendar/calendar-management.css (themes/windows/calendar-management.css)
+ ../skin/windows/calendar/calendar-task-tree.css (themes/windows/calendar-task-tree.css)
+ ../skin/windows/calendar/calendar-task-view.css (themes/windows/calendar-task-view.css)
+ ../skin/windows/calendar/calendar-unifinder.css (themes/windows/calendar-unifinder.css)
+ ../skin/windows/calendar/calendar-views.css (themes/windows/calendar-views.css)
+ ../skin/windows/calendar/today-pane.css (themes/windows/today-pane.css)
+ ../skin/windows/calendar/widgets/calendar-widgets.css (themes/windows/widgets/calendar-widgets.css)
+ ../skin/windows/calendar/calendar-event-dialog-toolbar.png (themes/windows/dialogs/images/calendar-event-dialog-toolbar.png)
+ ../skin/windows/calendar/calendar-event-dialog-toolbar-small.png (themes/windows/dialogs/images/calendar-event-dialog-toolbar-small.png)
+ ../skin/windows/calendar/calendar-occurrence-prompt.png (themes/windows/images/calendar-occurrence-prompt.png)
+ ../skin/windows/calendar/tasks-actions.png (themes/windows/images/tasks-actions.png)
+ ../skin/windows/calendar/toolbar-large.png (themes/windows/images/toolbar-large.png)
+ ../skin/windows/calendar/toolbar-small.png (themes/windows/images/toolbar-small.png)
+ ../skin/windows/calendar/calendar-occurrence-prompt-aero.png (themes/windows/images/calendar-occurrence-prompt-aero.png)

View File

@ -1,63 +0,0 @@
$OpenBSD: patch-calendar_base_moz_build,v 1.1 2017/11/14 20:46:57 landry Exp $
Revert https://bug1402645.bmoattachments.org/attachment.cgi?id=8912293
Index: calendar/base/moz.build
--- calendar/base/moz.build.orig
+++ calendar/base/moz.build
@@ -7,5 +7,56 @@ DIRS = [
'public',
'backend',
'src',
+ 'modules',
]
+JAR_MANIFESTS += ['jar.mn']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+ DEFINES['THEME'] = 'windows'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+ DEFINES['THEME'] = 'osx'
+else:
+ DEFINES['THEME'] = 'linux'
+
+# Window icons are not needed on mac
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+ icon_path = 'themes/common/icons/'
+ window_icons = [
+ 'calendar-alarm-dialog',
+ 'calendar-event-dialog',
+ 'calendar-event-summary-dialog',
+ 'calendar-task-dialog',
+ 'calendar-task-summary-dialog',
+ ]
+
+ # Set up the icon suffix to differ between windows and linux
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+ icon_suffix = '.ico'
+ else:
+ icon_suffix = '.png'
+
+ FINAL_TARGET_FILES.chrome.icons.default += [
+ '%s%s%s' % (icon_path, icon, icon_suffix) for icon in window_icons
+ ]
+
+with Files('content/**'):
+ BUG_COMPONENT = ('Calendar', 'Calendar Views')
+
+with Files('content/preferences/**'):
+ BUG_COMPONENT = ('Calendar', 'Preferences')
+
+with Files('content/dialogs/**'):
+ BUG_COMPONENT = ('Calendar', 'Dialogs')
+
+with Files('content/*task*'):
+ BUG_COMPONENT = ('Calendar', 'Tasks')
+
+with Files('content/dialogs/*alarm*'):
+ BUG_COMPONENT = ('Calendar', 'Alarms')
+
+with Files('content/widgets/*alarm*'):
+ BUG_COMPONENT = ('Calendar', 'Alarms')
+
+with Files('themes/**'):
+ BUG_COMPONENT = ('Calendar', 'Calendar Views')

View File

@ -1,102 +0,0 @@
$OpenBSD: patch-calendar_lightning_Makefile_in,v 1.1 2017/11/14 20:46:57 landry Exp $
Revert https://bug1402645.bmoattachments.org/attachment.cgi?id=8912293
Index: calendar/lightning/Makefile.in
--- calendar/lightning/Makefile.in.orig
+++ calendar/lightning/Makefile.in
@@ -0,0 +1,94 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Calendar builders currently use STRIP_XPI to reduce the binary component in
+# Lightning.
+
+XPI_PKGNAME = lightning-$(LIGHTNING_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
+XPI_VERSION = $(LIGHTNING_VERSION)
+
+XPI_EM_ID = {e2fda1a4-762b-4020-b5ad-a41df1933103}
+
+ifneq (,$(findstring a,$(LIGHTNING_VERSION)))
+DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1
+endif
+
+# Enable nightly updates on aurora and nightly channel
+ifeq (nightly,$(subst aurora,nightly,$(MOZ_UPDATE_CHANNEL)))
+DEFINES += -DLIGHTNING_UPDATE_LOCATION=https://calendar.mozilla.org/update.php
+endif
+
+# Gecko milestone
+GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone)
+ifdef GRE_MILESTONE
+DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE)
+endif
+
+# comm-central source repo and stamp
+SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node}\n' 2>/dev/null))
+ifdef SOURCE_STAMP
+DEFINES += -DSOURCE_STAMP='$(SOURCE_STAMP)'
+endif
+
+SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/')
+ifdef SOURCE_REPO
+DEFINES += -DSOURCE_REPO='$(SOURCE_REPO)'
+endif
+
+# Mozilla source repo and stamps
+MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_SRCDIR) parent --template='{node}\n' 2>/dev/null))
+ifdef MOZ_SOURCE_STAMP
+DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)'
+endif
+
+MOZ_SOURCE_REPO := $(shell hg -R $(MOZILLA_SRCDIR) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/')
+ifdef MOZ_SOURCE_REPO
+DEFINES += -DMOZ_SOURCE_REPO='$(MOZ_SOURCE_REPO)'
+endif
+
+ifdef NIGHTLY_BUILD
+# On nightly builds, install as a global extension in
+# dist/bin/extensions/
+XPI_INSTALL_EXTENSION = $(XPI_EM_ID)
+else
+# For beta and release builds, install as a distribution extension in
+# dist/bin/distribution/extensions/
+INSTALL_EXTENSION_ID = $(XPI_EM_ID)
+endif
+
+DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
+ -DTHUNDERBIRD_MAXVERSION=$(THUNDERBIRD_MAXVERSION) \
+ -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
+ -DSEAMONKEY_MAXVERSION=$(SEAMONKEY_MAXVERSION) \
+ -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
+ -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
+ -DXPI_EM_ID="$(XPI_EM_ID)" \
+ $(NULL)
+
+MOZ_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
+DEFINES += -DMOZ_BUILDID=$(MOZ_BUILDID)
+
+include $(topsrcdir)/config/rules.mk
+include $(srcdir)/versions.mk
+include $(srcdir)/lightning-packager.mk
+include $(srcdir)/lightning-tests.mk
+
+# For Lightning, we also need to preprocess the l10n prefs. Pull in the en-US
+# copy if the files doesn't exist.
+repack-process-extrafiles: lightning-extrafiles
+lightning-extrafiles: LTN_ABCD_L10NJS=$(call EXPAND_LOCALE_SRCDIR,calendar/locales)/lightning-l10n.js
+lightning-extrafiles: LTN_ANY_L10NJS=$(if $(wildcard $(LTN_ABCD_L10NJS)),$(LTN_ABCD_L10NJS),$(topsrcdir)/calendar/locales/en-US/lightning-l10n.js)
+lightning-extrafiles:
+ $(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $(LTN_ANY_L10NJS) -o $(DIST)/$(UNIVERSAL_PATH)xpi-stage/$(L10N_XPI_NAME)/$(PREF_DIR)/lightning-l10n.js)
+
+ident:
+ @printf 'comm_revision '
+ @$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
+ $(FINAL_TARGET)/app.ini App SourceStamp
+ @printf 'moz_revision '
+ @$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
+ $(FINAL_TARGET)/app.ini Build SourceStamp
+ @printf 'buildid '
+ @$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
+ $(FINAL_TARGET)/app.ini App BuildID

View File

@ -1,131 +0,0 @@
$OpenBSD: patch-calendar_lightning_jar_mn,v 1.3 2017/11/14 20:46:57 landry Exp $
Revert https://bug1402645.bmoattachments.org/attachment.cgi?id=8912293
Index: calendar/lightning/jar.mn
--- calendar/lightning/jar.mn.orig
+++ calendar/lightning/jar.mn
@@ -0,0 +1,123 @@
+#filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+lightning.jar:
+% override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
+% override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar-common/skin/calendar-event-dialog-attendees.png
+% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul
+% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-item-panel.xul
+% overlay chrome://messenger/content/msgAccountCentral.xul chrome://lightning/content/messenger-overlay-accountCentral.xul
+% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul
+% overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul
+% overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/messenger-overlay-messageWindow.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul
+% overlay chrome://communicator/content/pref/preferences.xul chrome://lightning/content/suite-overlay-preferences.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay about:addons chrome://lightning/content/suite-overlay-addons.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay chrome://mozapps/content/extensions/extensions.xul chrome://lightning/content/suite-overlay-addons.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://lightning/content/messenger-overlay-preferences.xul
+% overlay about:preferences chrome://lightning/content/messenger-overlay-preferences.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/alarms.xul
+% overlay about:preferences chrome://calendar/content/preferences/alarms.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/categories.xul
+% overlay about:preferences chrome://calendar/content/preferences/categories.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/general.xul
+% overlay about:preferences chrome://calendar/content/preferences/general.xul
+% overlay chrome://messenger/content/preferences/preferences.xul chrome://calendar/content/preferences/views.xul
+% overlay about:preferences chrome://calendar/content/preferences/views.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder-todo.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-task-view.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/today-pane.xul
+% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/suite-overlay-sidebar.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% overlay chrome://calendar/content/calendarCreation.xul chrome://lightning/content/lightning-calendar-creation.xul
+% overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://lightning/content/lightning-calendar-properties.xul
+% override chrome://lightning/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% content lightning %content/lightning/
+ content/lightning/imip-bar.js (content/imip-bar.js)
+ content/lightning/imip-bar-overlay.xul (content/imip-bar-overlay.xul)
+ content/lightning/lightning-calendar-creation.xul (content/lightning-calendar-creation.xul)
+ content/lightning/lightning-calendar-creation.js (content/lightning-calendar-creation.js)
+ content/lightning/lightning-calendar-properties.xul (content/lightning-calendar-properties.xul)
+ content/lightning/lightning-calendar-properties.js (content/lightning-calendar-properties.js)
+ content/lightning/lightning-invitation.xhtml (content/lightning-invitation.xhtml)
+ content/lightning/lightning-menus.xul (content/lightning-menus.xul)
+ content/lightning/lightning-migration.xul (content/lightning-migration.xul)
+* content/lightning/lightning-toolbar.xul (content/lightning-toolbar.xul)
+ content/lightning/lightning-utils.js (content/lightning-utils.js)
+ content/lightning/lightning-widgets.css (content/lightning-widgets.css)
+ content/lightning/lightning-widgets.xml (content/lightning-widgets.xml)
+ content/lightning/messenger-overlay-accountCentral.xul (content/messenger-overlay-accountCentral.xul)
+ content/lightning/messenger-overlay-messageWindow.xul (content/messenger-overlay-messageWindow.xul)
+ content/lightning/messenger-overlay-sidebar.js (content/messenger-overlay-sidebar.js)
+ content/lightning/messenger-overlay-sidebar.xul (content/messenger-overlay-sidebar.xul)
+ content/lightning/messenger-overlay-preferences.js (content/messenger-overlay-preferences.js)
+ content/lightning/messenger-overlay-preferences.xul (content/messenger-overlay-preferences.xul)
+ content/lightning/suite-overlay-addons.xul (content/suite-overlay-addons.xul)
+ 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)
+ content/lightning/lightning-item-toolbar.xul (content/lightning-item-toolbar.xul)
+* content/lightning/lightning-item-panel.xul (content/lightning-item-panel.xul)
+ content/lightning/lightning-item-panel.js (content/lightning-item-panel.js)
+ content/lightning/lightning-item-iframe.xul (content/lightning-item-iframe.xul)
+ content/lightning/lightning-item-iframe.js (content/lightning-item-iframe.js)
+ content/lightning/html-item-editing/lightning-item-iframe.html (content/html-item-editing/lightning-item-iframe.html)
+ content/lightning/html-item-editing/react-code.js (content/html-item-editing/react-code.js)
+% 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/
+% style chrome://global/content/customizeToolbar.xul chrome://lightning/skin/lightning-toolbar.css
+% style chrome://calendar/content/calendar-event-dialog.xul chrome://communicator/skin/communicator.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% style chrome://global/content/customizeToolbar.xul chrome://lightning-common/skin/lightning.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% style chrome://global/content/customizeToolbar.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+ ../skin/lightning-common/mode-switch-icons.png (themes/common/images/mode-switch-icons.png)
+ ../skin/lightning-common/suite-accountCentral.css (themes/common/suite-accountCentral.css)
+
+# Linux theme files
+ ../skin/linux/lightning/accountCentral.css (themes/linux/accountCentral.css)
+ ../skin/linux/lightning/imip.css (themes/linux/imip.css)
+ ../skin/linux/lightning/lightning.css (themes/linux/lightning.css)
+ ../skin/linux/lightning/lightning-toolbar.css (themes/linux/lightning-toolbar.css)
+ ../skin/linux/lightning/lightning-widgets.css (themes/linux/lightning-widgets.css)
+
+# OS X theme files
+ ../skin/osx/lightning/accountCentral.css (themes/osx/accountCentral.css)
+ ../skin/osx/lightning/imip.css (themes/osx/imip.css)
+ ../skin/osx/lightning/collapse.png (themes/osx/collapse.png)
+ ../skin/osx/lightning/collapse@2x.png (themes/osx/collapse@2x.png)
+ ../skin/osx/lightning/expand.png (themes/osx/expand.png)
+ ../skin/osx/lightning/expand@2x.png (themes/osx/expand@2x.png)
+ ../skin/osx/lightning/lightning.css (themes/osx/lightning.css)
+ ../skin/osx/lightning/lightning-toolbar.css (themes/osx/lightning-toolbar.css)
+ ../skin/osx/lightning/lightning-widgets.css (themes/osx/lightning-widgets.css)
+
+# Windows theme files
+ ../skin/windows/lightning/accountCentral.css (themes/windows/accountCentral.css)
+ ../skin/windows/lightning/imip.css (themes/windows/imip.css)
+ ../skin/windows/lightning/imip.png (themes/windows/imip.png)
+ ../skin/windows/lightning/lightning.css (themes/windows/lightning.css)
+ ../skin/windows/lightning/lightning-toolbar.css (themes/windows/lightning-toolbar.css)
+ ../skin/windows/lightning/lightning-widgets.css (themes/windows/lightning-widgets.css)
+ ../skin/windows/lightning/imip-aero.png (themes/windows/images/imip-aero.png)
+ ../skin/windows/lightning/mode-switch-icons-aero.png (themes/windows/images/mode-switch-icons-aero.png)
+ ../skin/windows/lightning/mode-switch-icons-inverted.png (themes/windows/images/mode-switch-icons-inverted.png)
+
+
+calendar.jar:
+ content/calendar/calendarCreation.xul (/calendar/resources/content/calendarCreation.xul)
+ content/calendar/calendarCreation.js (/calendar/resources/content/calendarCreation.js)
+ content/calendar/datetimepickers/datetimepickers.css (/calendar/resources/content/datetimepickers/datetimepickers.css)
+ content/calendar/datetimepickers/datetimepickers.xml (/calendar/resources/content/datetimepickers/datetimepickers.xml)
+ content/calendar/mouseoverPreviews.js (/calendar/resources/content/mouseoverPreviews.js)
+ content/calendar/publish.js (/calendar/resources/content/publish.js)
+ content/calendar/publishDialog.js (/calendar/resources/content/publishDialog.js)
+ content/calendar/publishDialog.xul (/calendar/resources/content/publishDialog.xul)
+ content/calendar/sound.wav (/calendar/resources/content/sound.wav)
+ ../skin/lightning-common/datetimepickers.css (/calendar/resources/skin/datetimepickers.css)
+ ../skin/lightning-common/dialogOverlay.css (/calendar/resources/skin/dialogOverlay.css)
+ ../skin/lightning-common/imip.css (themes/common/imip.css)
+ ../skin/lightning-common/lightning.css (themes/common/lightning.css)
+ ../skin/lightning-common/html-item-editing.css (themes/common/html-item-editing.css)

View File

@ -1,60 +0,0 @@
$OpenBSD: patch-calendar_lightning_moz_build,v 1.1 2017/11/14 20:46:57 landry Exp $
Revert https://bug1402645.bmoattachments.org/attachment.cgi?id=8912293
Index: calendar/lightning/moz.build
--- calendar/lightning/moz.build.orig
+++ calendar/lightning/moz.build
@@ -6,5 +6,52 @@
DIRS += [
'../libical',
'../base',
+ '../providers',
+ '../import-export',
+ '../itip',
+ 'components',
+ 'locales',
+ 'modules',
]
+TEST_DIRS += ['../test']
+
+XPI_NAME = 'lightning'
+export('XPI_NAME')
+
+FINAL_TARGET_PP_FILES += [
+ 'app.ini',
+ 'install.rdf',
+]
+
+JAR_MANIFESTS += ['jar.mn']
+
+USE_EXTENSION_MANIFEST = True
+export('USE_EXTENSION_MANIFEST')
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+ DEFINES['THEME'] = 'windows'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+ DEFINES['THEME'] = 'osx'
+else:
+ DEFINES['THEME'] = 'linux'
+
+JS_PREFERENCE_PP_FILES += [
+ 'content/lightning.js',
+]
+
+FINAL_TARGET_FILES.timezones += [
+ '../timezones/zones.json',
+]
+
+with Files('**'):
+ BUG_COMPONENT = ('Calendar', 'Lightning Only')
+
+with Files('content/suite-*'):
+ BUG_COMPONENT = ('Calendar', 'Lightning: SeaMonkey Integration')
+
+with Files('build/**'):
+ BUG_COMPONENT = ('Calendar', 'Build Config')
+
+with Files('app.ini'):
+ BUG_COMPONENT = ('Calendar', 'Build Config')

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-calendar_moz_build,v 1.1 2017/11/14 20:46:57 landry Exp $
Index: calendar/moz.build
--- calendar/moz.build.orig
+++ calendar/moz.build
@@ -8,6 +8,7 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
if CONFIG['MOZ_CALENDAR']:
DIRS += [
'lightning',
+ 'providers',
'timezones'
]

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-mozilla_security_manager_ssl_moz_build,v 1.1 2019/10/25 11:49:14 landry Exp $
fix configure when using --with-system-nss
https://bugzilla.mozilla.org/show_bug.cgi?id=1319405
https://hg.mozilla.org/mozilla-central/rev/10a01f31d432
Index: mozilla/security/manager/ssl/moz.build
--- mozilla/security/manager/ssl/moz.build.orig
+++ mozilla/security/manager/ssl/moz.build
@@ -184,9 +184,10 @@ for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
DEFINES['CERT_AddTempCertToPerm'] = '__CERT_AddTempCertToPerm'
-USE_LIBS += [
- 'crmf',
-]
+if not CONFIG['MOZ_SYSTEM_NSS']:
+ USE_LIBS += [
+ 'crmf',
+ ]
include('/ipc/chromium/chromium-config.mozbuild')

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-suite_app_Makefile_in,v 1.1 2017/11/14 20:46:57 landry Exp $
Index: suite/app/Makefile.in
--- suite/app/Makefile.in.orig
+++ suite/app/Makefile.in
@@ -98,6 +98,7 @@ pack-ext: $(STAGEDIST)
tools::
@$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/extensions"
+ @$(MAKE) pack-ext STAGEDIST="$(DIST)/bin/distribution/extensions"
endif

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-suite_app_mozbuild,v 1.1 2017/11/14 20:46:57 landry Exp $
Index: suite/app.mozbuild
--- suite/app.mozbuild.orig
+++ suite/app.mozbuild
@@ -15,9 +15,11 @@ if CONFIG['MOZ_COMPOSER']:
DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
-DIRS += [
+if CONFIG['MOZ_CALENDAR']:
+ DIRS += [
'/calendar/lightning',
-]
+ '/calendar/timezones'
+ ]
DIRS += [
'/xpfe/components/autocomplete',

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-suite_confvars_sh,v 1.1 2017/11/14 20:46:57 landry Exp $
Revert part of https://bug1346939.bmoattachments.org/attachment.cgi?id=8903210
Index: suite/confvars.sh
--- suite/confvars.sh.orig
+++ suite/confvars.sh
@@ -13,7 +13,7 @@ MOZ_DISABLE_EXPORT_JS=1
MOZ_SUITE=1
MOZ_BRANDING_DIRECTORY=suite/branding/nightly
MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly
-MOZ_EXTENSIONS_DEFAULT=" gio"
+MOZ_EXTENSIONS_DEFAULT="inspector irc gio"
MOZ_UPDATER=1
# This should usually be the same as the value MAR_CHANNEL_ID.
# If more than one ID is needed, then you should use a comma separated list

View File

@ -1,74 +0,0 @@
$OpenBSD: patch-suite_installer_package-manifest_in,v 1.1 2017/11/14 20:46:57 landry Exp $
Revert part of https://bug1346939.bmoattachments.org/attachment.cgi?id=8903210
Index: suite/installer/package-manifest.in
--- suite/installer/package-manifest.in.orig
+++ suite/installer/package-manifest.in
@@ -904,6 +904,51 @@ bin/libfreebl_32int64_3.so
@BINPATH@/clang_rt.asan_dynamic-i386.dll
#endif
+[chatzilla]
+#ifdef MOZ_OMNIJAR
+@RESPATH@/distribution/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}.xpi
+#else
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/chatzilla@JAREXT@
+#ifdef MOZ_GTK
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.xpm
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window16.xpm
+#elifdef XP_WIN32
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome/icons/default/chatzilla-window.ico
+#endif
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/chrome.manifest
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/chatzilla-service.js
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/components/components.list
+@RESPATH@/extensions/{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}/install.rdf
+#endif
+#ifdef LOCALE_BUILD
+#ifdef MOZ_OMNIJAR
+@RESPATH@/distribution/extensions/langpack-@AB_CD@@chatzilla.mozilla.org.xpi
+#else
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome/chatzilla@JAREXT@
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/chrome.manifest
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.js
+@RESPATH@/extensions/langpack-@AB_CD@@chatzilla.mozilla.org/install.rdf
+#endif
+#endif
+
+[inspector]
+#ifdef MOZ_OMNIJAR
+@RESPATH@/distribution/extensions/inspector@mozilla.org.xpi
+#else
+@RESPATH@/extensions/inspector@mozilla.org/install.rdf
+@RESPATH@/extensions/inspector@mozilla.org/chrome.manifest
+@RESPATH@/extensions/inspector@mozilla.org/chrome/inspector@JAREXT@
+#ifdef MOZ_GTK
+@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
+@RESPATH@/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
+#elifdef XP_WIN32
+@RESPATH@/extensions/inspector@mozilla.org/platform/WINNT/chrome/icons/default/winInspectorMain.ico
+#endif
+@RESPATH@/extensions/inspector@mozilla.org/components/components.list
+@RESPATH@/extensions/inspector@mozilla.org/components/inspector-cmdline.js
+@RESPATH@/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+#endif
+
[debugqa]
#ifdef MOZ_PACKAGE_DEBUGQA
#ifdef MOZ_OMNIJAR
@@ -912,5 +957,14 @@ bin/libfreebl_32int64_3.so
@RESPATH@/extensions/debugQA@mozilla.org/install.rdf
@RESPATH@/extensions/debugQA@mozilla.org/chrome.manifest
@RESPATH@/extensions/debugQA@mozilla.org/chrome/debugqa@JAREXT@
+#endif
+#endif
+
+#ifdef MOZ_CALENDAR
+[calendar]
+#ifdef NIGHTLY_BUILD
+@RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
+#else
+@RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
#endif
#endif

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.41 2018/09/04 12:46:27 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.42 2019/10/25 11:49:15 landry Exp $
@conflict seamonkey-<=2.0.6
@pkgpath www/seamonkey
bin/${MOZILLA_PROJECT}
@ -81,6 +81,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/extensions/{59c81df5-4b7a-477
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/modern@themes.mozilla.org.xpi
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gtk2/
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION}
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/Bogofilter.sfd
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/DSPAM.sfd
@ -94,6 +96,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/rss.rdf
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/liblgpllibs.so.${LIBlgpllibs_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozavcodec.so.${LIBmozavcodec_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozavutil.so.${LIBmozavutil_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozgtk.so.${LIBmozgtk_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libprldap60.so.${LIBprldap60_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libxul.so.${LIBxul_VERSION}
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/license.txt