diff options
| author | beat <beat@FreeBSD.org> | 2010-09-08 05:00:13 +0800 |
|---|---|---|
| committer | beat <beat@FreeBSD.org> | 2010-09-08 05:00:13 +0800 |
| commit | 68b635e0b582b0cc1e4cf0372e6681be5c53d78e (patch) | |
| tree | 3d9103f4c1052922afbb5db0072f57e997edd96b | |
| parent | 4cba7a9e7bd173296b89befc1bbefd923bef9adb (diff) | |
| download | freebsd-ports-gnome-68b635e0b582b0cc1e4cf0372e6681be5c53d78e.tar.gz freebsd-ports-gnome-68b635e0b582b0cc1e4cf0372e6681be5c53d78e.tar.zst freebsd-ports-gnome-68b635e0b582b0cc1e4cf0372e6681be5c53d78e.zip | |
- Remove expired ports deskutils/sunbird, deskutils/sunbird-i18n and
deskutils/linux-sunbird: Upstream development discontinued. Please
consider using deskutils/lightning or deskutils/lightning-thunderbird
instead.
33 files changed, 3 insertions, 2630 deletions
@@ -4531,3 +4531,6 @@ portuguese/staroffice52||2010-09-04|Distfile(s) no longer available sysutils/linux-acu||2010-09-04|Distfile(s) no longer available lang/ficl-devel|lang/ficl|2010-09-07|Moved to lang/ficl since it's a stable version games/abridge||2010-09-07|Broken, abandoned upstream +deskutils/linux-sunbird|deskutils/lightning|2010-09-07|Upstream development discontinued +deskutils/sunbird|deskutils/lightning|2010-09-07|Upstream development discontinued +deskutils/sunbird-i18n||2010-09-07|Upstream development discontinued diff --git a/deskutils/Makefile b/deskutils/Makefile index a53b930014bf..5c71615f228f 100644 --- a/deskutils/Makefile +++ b/deskutils/Makefile @@ -165,7 +165,6 @@ SUBDIR += libopensync-plugin-syncml SUBDIR += libopensync-plugin-vformat-devel SUBDIR += lightning - SUBDIR += linux-sunbird SUBDIR += ljcharm SUBDIR += ljclive SUBDIR += ljit @@ -252,8 +251,6 @@ SUBDIR += splashsetter SUBDIR += strigi SUBDIR += sugarcrm - SUBDIR += sunbird - SUBDIR += sunbird-i18n SUBDIR += superkaramba-lwp SUBDIR += superswitcher SUBDIR += systempreferences diff --git a/deskutils/linux-sunbird/Makefile b/deskutils/linux-sunbird/Makefile deleted file mode 100644 index 5b3f48960aa8..000000000000 --- a/deskutils/linux-sunbird/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: linux-sunbird -# Date created: 2004-09-17 -# Whom: voisine -# -# $FreeBSD$ -# - -PORTNAME= sunbird -DISTVERSION= 0.9 -PORTREVISION= 1 -DISTVERSIONSUFFIX= .en-US.linux-i686 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= deskutils -MASTER_SITE_SUBDIR?= calendar/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US - -MAINTAINER= gecko@FreeBSD.org -COMMENT= Calendaring application branched from Mozilla - -DEPRECATED= Upstream development discontinued. Please consider using\ - ${PORTSDIR}/deskutils/lightning instead -EXPIRATION_DATE= 2010-09-04 - -post-extract: - @${MKDIR} ${WRKSRC}/plugins/ - @${TOUCH} ${WRKSRC}/plugins/.empty - -.include "${.CURDIR}/../../www/linux-seamonkey/Makefile.common" -.include <bsd.port.mk> diff --git a/deskutils/linux-sunbird/distinfo b/deskutils/linux-sunbird/distinfo deleted file mode 100644 index 3ae3b0fa4337..000000000000 --- a/deskutils/linux-sunbird/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (sunbird-0.9.en-US.linux-i686.tar.gz) = 0553bc70f046b5f3ee1b40c1a182c205 -SHA256 (sunbird-0.9.en-US.linux-i686.tar.gz) = 51775989765694e73a512cae836bbde185ef97c7a6d7ee2796e5756d95c66f50 -SIZE (sunbird-0.9.en-US.linux-i686.tar.gz) = 8763840 diff --git a/deskutils/linux-sunbird/files/linux-sunbird.desktop.in b/deskutils/linux-sunbird/files/linux-sunbird.desktop.in deleted file mode 100644 index cc0ca721638e..000000000000 --- a/deskutils/linux-sunbird/files/linux-sunbird.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Mozilla Calendar (Linux) -Comment=Mozilla Sunbird Calendar -Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm -Exec=linux-sunbird -Terminal=false -Type=Application -Categories=Application;Office; diff --git a/deskutils/linux-sunbird/pkg-descr b/deskutils/linux-sunbird/pkg-descr deleted file mode 100644 index d1faae6675cd..000000000000 --- a/deskutils/linux-sunbird/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The Sunbird Project is a cross platform standalone calendar application -based on Mozilla's XUL user interface language. - -Sunbird is licensed under the MPL/GPL/LGPL triple license, allowing use -of the files under the terms of any one of the MPL, the GPL, or the LGPL. - -WWW: http://www.mozilla.org/projects/calendar/sunbird/ diff --git a/deskutils/linux-sunbird/pkg-plist b/deskutils/linux-sunbird/pkg-plist deleted file mode 100644 index 6aa977fa3692..000000000000 --- a/deskutils/linux-sunbird/pkg-plist +++ /dev/null @@ -1,335 +0,0 @@ -bin/%%APP_NAME%% -share/applications/%%APP_NAME%%.desktop -lib/%%APP_NAME%%/LICENSE -lib/%%APP_NAME%%/README.txt -lib/%%APP_NAME%%/chrome/calendar-en-US.jar -lib/%%APP_NAME%%/chrome/calendar-en-US.manifest -lib/%%APP_NAME%%/chrome/calendar.jar -lib/%%APP_NAME%%/chrome/calendar.manifest -lib/%%APP_NAME%%/chrome/chromelist.txt -lib/%%APP_NAME%%/chrome/classic.jar -lib/%%APP_NAME%%/chrome/classic.manifest -lib/%%APP_NAME%%/chrome/comm.jar -lib/%%APP_NAME%%/chrome/comm.manifest -lib/%%APP_NAME%%/chrome/en-US.jar -lib/%%APP_NAME%%/chrome/en-US.manifest -lib/%%APP_NAME%%/chrome/icons/default/calendar-alarm-dialog.xpm -lib/%%APP_NAME%%/chrome/icons/default/default.xpm -lib/%%APP_NAME%%/chrome/pippki.jar -lib/%%APP_NAME%%/chrome/pippki.manifest -lib/%%APP_NAME%%/chrome/toolkit.jar -lib/%%APP_NAME%%/chrome/toolkit.manifest -lib/%%APP_NAME%%/components/FeedProcessor.js -lib/%%APP_NAME%%/components/accessibility-atk.xpt -lib/%%APP_NAME%%/components/accessibility.xpt -lib/%%APP_NAME%%/components/alerts.xpt -lib/%%APP_NAME%%/components/appshell.xpt -lib/%%APP_NAME%%/components/appstartup.xpt -lib/%%APP_NAME%%/components/autocomplete.xpt -lib/%%APP_NAME%%/components/bookmarks.xpt -lib/%%APP_NAME%%/components/calCompositeCalendar.js -lib/%%APP_NAME%%/components/calDavCalendarModule.js -lib/%%APP_NAME%%/components/calICSCalendarModule.js -lib/%%APP_NAME%%/components/calImportExportModule.js -lib/%%APP_NAME%%/components/calItemModule.js -lib/%%APP_NAME%%/components/calMemoryCalendarModule.js -lib/%%APP_NAME%%/components/calStorageCalendarModule.js -lib/%%APP_NAME%%/components/calWcapCalendarModule.js -lib/%%APP_NAME%%/components/calbase.xpt -lib/%%APP_NAME%%/components/calbaseinternal.xpt -lib/%%APP_NAME%%/components/caldav.xpt -lib/%%APP_NAME%%/components/calendarService.js -lib/%%APP_NAME%%/components/caps.xpt -lib/%%APP_NAME%%/components/chardet.xpt -lib/%%APP_NAME%%/components/chrome.xpt -lib/%%APP_NAME%%/components/commandhandler.xpt -lib/%%APP_NAME%%/components/commandlines.xpt -lib/%%APP_NAME%%/components/composer.xpt -lib/%%APP_NAME%%/components/content_base.xpt -lib/%%APP_NAME%%/components/content_html.xpt -lib/%%APP_NAME%%/components/content_htmldoc.xpt -lib/%%APP_NAME%%/components/content_xmldoc.xpt -lib/%%APP_NAME%%/components/content_xslt.xpt -lib/%%APP_NAME%%/components/content_xtf.xpt -lib/%%APP_NAME%%/components/docshell.xpt -lib/%%APP_NAME%%/components/dom.xpt -lib/%%APP_NAME%%/components/dom_base.xpt -lib/%%APP_NAME%%/components/dom_canvas.xpt -lib/%%APP_NAME%%/components/dom_core.xpt -lib/%%APP_NAME%%/components/dom_css.xpt -lib/%%APP_NAME%%/components/dom_events.xpt -lib/%%APP_NAME%%/components/dom_html.xpt -lib/%%APP_NAME%%/components/dom_loadsave.xpt -lib/%%APP_NAME%%/components/dom_range.xpt -lib/%%APP_NAME%%/components/dom_sidebar.xpt -lib/%%APP_NAME%%/components/dom_storage.xpt -lib/%%APP_NAME%%/components/dom_stylesheets.xpt -lib/%%APP_NAME%%/components/dom_traversal.xpt -lib/%%APP_NAME%%/components/dom_views.xpt -lib/%%APP_NAME%%/components/dom_xbl.xpt -lib/%%APP_NAME%%/components/dom_xpath.xpt -lib/%%APP_NAME%%/components/dom_xul.xpt -lib/%%APP_NAME%%/components/downloads.xpt -lib/%%APP_NAME%%/components/editor.xpt -lib/%%APP_NAME%%/components/embed_base.xpt -lib/%%APP_NAME%%/components/extensions.xpt -lib/%%APP_NAME%%/components/exthandler.xpt -lib/%%APP_NAME%%/components/fastfind.xpt -lib/%%APP_NAME%%/components/feeds.xpt -lib/%%APP_NAME%%/components/filepicker.xpt -lib/%%APP_NAME%%/components/find.xpt -lib/%%APP_NAME%%/components/gfx.xpt -lib/%%APP_NAME%%/components/history.xpt -lib/%%APP_NAME%%/components/htmlparser.xpt -lib/%%APP_NAME%%/components/imgicon.xpt -lib/%%APP_NAME%%/components/imglib2.xpt -lib/%%APP_NAME%%/components/inspector.xpt -lib/%%APP_NAME%%/components/intl.xpt -lib/%%APP_NAME%%/components/jar.xpt -lib/%%APP_NAME%%/components/jsconsole-clhandler.js -lib/%%APP_NAME%%/components/jsconsole.xpt -lib/%%APP_NAME%%/components/jsdservice.xpt -lib/%%APP_NAME%%/components/layout_base.xpt -lib/%%APP_NAME%%/components/layout_printing.xpt -lib/%%APP_NAME%%/components/layout_xul.xpt -lib/%%APP_NAME%%/components/layout_xul_tree.xpt -lib/%%APP_NAME%%/components/libcalbasecomps.so -lib/%%APP_NAME%%/components/libimgicon.so -lib/%%APP_NAME%%/components/libjsd.so -lib/%%APP_NAME%%/components/libmozgnome.so -lib/%%APP_NAME%%/components/libxpinstall.so -lib/%%APP_NAME%%/components/locale.xpt -lib/%%APP_NAME%%/components/lwbrk.xpt -lib/%%APP_NAME%%/components/mimetype.xpt -lib/%%APP_NAME%%/components/mozbrwsr.xpt -lib/%%APP_NAME%%/components/mozfind.xpt -lib/%%APP_NAME%%/components/mozgnome.xpt -lib/%%APP_NAME%%/components/necko.xpt -lib/%%APP_NAME%%/components/necko_about.xpt -lib/%%APP_NAME%%/components/necko_cache.xpt -lib/%%APP_NAME%%/components/necko_cookie.xpt -lib/%%APP_NAME%%/components/necko_data.xpt -lib/%%APP_NAME%%/components/necko_dns.xpt -lib/%%APP_NAME%%/components/necko_file.xpt -lib/%%APP_NAME%%/components/necko_ftp.xpt -lib/%%APP_NAME%%/components/necko_http.xpt -lib/%%APP_NAME%%/components/necko_res.xpt -lib/%%APP_NAME%%/components/necko_socket.xpt -lib/%%APP_NAME%%/components/necko_strconv.xpt -lib/%%APP_NAME%%/components/necko_viewsource.xpt -lib/%%APP_NAME%%/components/nsCloseAllWindows.js -lib/%%APP_NAME%%/components/nsDefaultCLH.js -lib/%%APP_NAME%%/components/nsExtensionManager.js -lib/%%APP_NAME%%/components/nsFilePicker.js -lib/%%APP_NAME%%/components/nsHelperAppDlg.js -lib/%%APP_NAME%%/components/nsProgressDialog.js -lib/%%APP_NAME%%/components/nsProxyAutoConfig.js -lib/%%APP_NAME%%/components/nsURLFormatter.js -lib/%%APP_NAME%%/components/nsUpdateService.js -lib/%%APP_NAME%%/components/passwordmgr.xpt -lib/%%APP_NAME%%/components/pipboot.xpt -lib/%%APP_NAME%%/components/pipnss.xpt -lib/%%APP_NAME%%/components/pippki.xpt -lib/%%APP_NAME%%/components/pref.xpt -lib/%%APP_NAME%%/components/prefetch.xpt -lib/%%APP_NAME%%/components/profile.xpt -lib/%%APP_NAME%%/components/progressDlg.xpt -lib/%%APP_NAME%%/components/proxyObjInst.xpt -lib/%%APP_NAME%%/components/rdf.xpt -lib/%%APP_NAME%%/components/satchel.xpt -lib/%%APP_NAME%%/components/saxparser.xpt -lib/%%APP_NAME%%/components/shistory.xpt -lib/%%APP_NAME%%/components/storage.xpt -lib/%%APP_NAME%%/components/toolkitprofile.xpt -lib/%%APP_NAME%%/components/toolkitremote.xpt -lib/%%APP_NAME%%/components/txmgr.xpt -lib/%%APP_NAME%%/components/txtsvc.xpt -lib/%%APP_NAME%%/components/uconv.xpt -lib/%%APP_NAME%%/components/unicharutil.xpt -lib/%%APP_NAME%%/components/update.xpt -lib/%%APP_NAME%%/components/uriloader.xpt -lib/%%APP_NAME%%/components/urlformatter.xpt -lib/%%APP_NAME%%/components/wcap.xpt -lib/%%APP_NAME%%/components/webBrowser_core.xpt -lib/%%APP_NAME%%/components/webbrowserpersist.xpt -lib/%%APP_NAME%%/components/webshell_idls.xpt -lib/%%APP_NAME%%/components/widget.xpt -lib/%%APP_NAME%%/components/windowds.xpt -lib/%%APP_NAME%%/components/windowwatcher.xpt -lib/%%APP_NAME%%/components/xpautocomplete.xpt -lib/%%APP_NAME%%/components/xpcom_base.xpt -lib/%%APP_NAME%%/components/xpcom_components.xpt -lib/%%APP_NAME%%/components/xpcom_ds.xpt -lib/%%APP_NAME%%/components/xpcom_io.xpt -lib/%%APP_NAME%%/components/xpcom_obsolete.xpt -lib/%%APP_NAME%%/components/xpcom_threads.xpt -lib/%%APP_NAME%%/components/xpcom_xpti.xpt -lib/%%APP_NAME%%/components/xpconnect.xpt -lib/%%APP_NAME%%/components/xpinstall.xpt -lib/%%APP_NAME%%/components/xulapp.xpt -lib/%%APP_NAME%%/components/xuldoc.xpt -lib/%%APP_NAME%%/components/xultmpl.xpt -lib/%%APP_NAME%%/defaults/pref/channel-prefs.js -lib/%%APP_NAME%%/defaults/pref/sunbird-l10n.js -lib/%%APP_NAME%%/defaults/pref/sunbird.js -lib/%%APP_NAME%%/defaults/profile/prefs.js -lib/%%APP_NAME%%/dependentlibs.list -lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/chrome.manifest -lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/chrome/calendar-timezones-en-US.jar -lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/chrome/chromelist.txt -lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/defaults/preferences/preferences.js -lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/install.rdf -lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/timezones.sqlite -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/chrome.manifest -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/libqfaservices.so -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/qfaservices.xpt -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/XTalkback.ad -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/master.ini -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback.so -lib/%%APP_NAME%%/extensions/talkback@mozilla.org/install.rdf -lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -lib/%%APP_NAME%%/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf -lib/%%APP_NAME%%/greprefs/all.js -lib/%%APP_NAME%%/greprefs/security-prefs.js -lib/%%APP_NAME%%/greprefs/xpinstall.js -lib/%%APP_NAME%%/icons/mozicon128.png -lib/%%APP_NAME%%/icons/mozicon16.xpm -lib/%%APP_NAME%%/icons/mozicon50.xpm -lib/%%APP_NAME%%/js/calAlarm.js -lib/%%APP_NAME%%/js/calAlarmMonitor.js -lib/%%APP_NAME%%/js/calAlarmService.js -lib/%%APP_NAME%%/js/calAttachment.js -lib/%%APP_NAME%%/js/calAttendee.js -lib/%%APP_NAME%%/js/calAuthUtils.js -lib/%%APP_NAME%%/js/calCachedCalendar.js -lib/%%APP_NAME%%/js/calCalendarManager.js -lib/%%APP_NAME%%/js/calCalendarSearchService.js -lib/%%APP_NAME%%/js/calDateTimeFormatter.js -lib/%%APP_NAME%%/js/calDavCalendar.js -lib/%%APP_NAME%%/js/calEvent.js -lib/%%APP_NAME%%/js/calFreeBusyService.js -lib/%%APP_NAME%%/js/calHtmlExport.js -lib/%%APP_NAME%%/js/calICSCalendar.js -lib/%%APP_NAME%%/js/calIcsImportExport.js -lib/%%APP_NAME%%/js/calIcsParser.js -lib/%%APP_NAME%%/js/calIcsSerializer.js -lib/%%APP_NAME%%/js/calItemBase.js -lib/%%APP_NAME%%/js/calItipItem.js -lib/%%APP_NAME%%/js/calItipProcessor.js -lib/%%APP_NAME%%/js/calListFormatter.js -lib/%%APP_NAME%%/js/calMemoryCalendar.js -lib/%%APP_NAME%%/js/calMonthGridPrinter.js -lib/%%APP_NAME%%/js/calOutlookCSVImportExport.js -lib/%%APP_NAME%%/js/calProtocolHandler.js -lib/%%APP_NAME%%/js/calProviderBase.js -lib/%%APP_NAME%%/js/calProviderUtils.js -lib/%%APP_NAME%%/js/calRecurrenceInfo.js -lib/%%APP_NAME%%/js/calRelation.js -lib/%%APP_NAME%%/js/calStorageCalendar.js -lib/%%APP_NAME%%/js/calTimezoneService.js -lib/%%APP_NAME%%/js/calTodo.js -lib/%%APP_NAME%%/js/calTransactionManager.js -lib/%%APP_NAME%%/js/calUtils.js -lib/%%APP_NAME%%/js/calWcapCalendar.js -lib/%%APP_NAME%%/js/calWcapCalendarItems.js -lib/%%APP_NAME%%/js/calWcapErrors.js -lib/%%APP_NAME%%/js/calWcapRequest.js -lib/%%APP_NAME%%/js/calWcapSession.js -lib/%%APP_NAME%%/js/calWcapUtils.js -lib/%%APP_NAME%%/js/calWeekInfoService.js -lib/%%APP_NAME%%/js/calWeekPrinter.js -lib/%%APP_NAME%%/libfreebl3.chk -lib/%%APP_NAME%%/libfreebl3.so -lib/%%APP_NAME%%/libmozjs.so -lib/%%APP_NAME%%/libnspr4.so -lib/%%APP_NAME%%/libnss3.so -lib/%%APP_NAME%%/libnssckbi.so -lib/%%APP_NAME%%/libplc4.so -lib/%%APP_NAME%%/libplds4.so -lib/%%APP_NAME%%/libsmime3.so -lib/%%APP_NAME%%/libsoftokn3.chk -lib/%%APP_NAME%%/libsoftokn3.so -lib/%%APP_NAME%%/libssl3.so -lib/%%APP_NAME%%/libxpcom.so -lib/%%APP_NAME%%/libxpcom_compat.so -lib/%%APP_NAME%%/libxpcom_core.so -lib/%%APP_NAME%%/libxpistub.so -lib/%%APP_NAME%%/mozilla-xremote-client -lib/%%APP_NAME%%/plugins/.empty -lib/%%APP_NAME%%/removed-files -lib/%%APP_NAME%%/res/arrow.gif -lib/%%APP_NAME%%/res/arrowd.gif -lib/%%APP_NAME%%/res/bloatcycle.html -lib/%%APP_NAME%%/res/broken-image.gif -lib/%%APP_NAME%%/res/charsetData.properties -lib/%%APP_NAME%%/res/charsetalias.properties -lib/%%APP_NAME%%/res/cmessage.txt -lib/%%APP_NAME%%/res/dtd/xhtml11.dtd -lib/%%APP_NAME%%/res/entityTables/html40Latin1.properties -lib/%%APP_NAME%%/res/entityTables/html40Special.properties -lib/%%APP_NAME%%/res/entityTables/html40Symbols.properties -lib/%%APP_NAME%%/res/entityTables/htmlEntityVersions.properties -lib/%%APP_NAME%%/res/entityTables/transliterate.properties -lib/%%APP_NAME%%/res/fonts/fontEncoding.properties -lib/%%APP_NAME%%/res/fonts/pangoFontEncoding.properties -lib/%%APP_NAME%%/res/forms.css -lib/%%APP_NAME%%/res/hiddenWindow.html -lib/%%APP_NAME%%/res/html.css -lib/%%APP_NAME%%/res/html/gopher-audio.gif -lib/%%APP_NAME%%/res/html/gopher-binary.gif -lib/%%APP_NAME%%/res/html/gopher-find.gif -lib/%%APP_NAME%%/res/html/gopher-image.gif -lib/%%APP_NAME%%/res/html/gopher-menu.gif -lib/%%APP_NAME%%/res/html/gopher-movie.gif -lib/%%APP_NAME%%/res/html/gopher-sound.gif -lib/%%APP_NAME%%/res/html/gopher-telnet.gif -lib/%%APP_NAME%%/res/html/gopher-text.gif -lib/%%APP_NAME%%/res/html/gopher-unknown.gif -lib/%%APP_NAME%%/res/langGroups.properties -lib/%%APP_NAME%%/res/language.properties -lib/%%APP_NAME%%/res/loading-image.gif -lib/%%APP_NAME%%/res/quirk.css -lib/%%APP_NAME%%/res/sample.unixpsfonts.properties -lib/%%APP_NAME%%/res/ua.css -lib/%%APP_NAME%%/res/unixcharset.properties -lib/%%APP_NAME%%/res/viewer.properties -lib/%%APP_NAME%%/res/viewsource.css -lib/%%APP_NAME%%/run-mozilla.sh -lib/%%APP_NAME%%/sunbird -lib/%%APP_NAME%%/sunbird-bin -lib/%%APP_NAME%%/updater -lib/%%APP_NAME%%/updater.ini -lib/%%APP_NAME%%/xpicleanup -@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true -@exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/ -depth 1 -type l -delete 2>/dev/null || true -@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l -delete 2>/dev/null || true -@dirrm lib/%%APP_NAME%%/chrome/icons/default -@dirrm lib/%%APP_NAME%%/chrome/icons -@dirrm lib/%%APP_NAME%%/chrome -@dirrm lib/%%APP_NAME%%/components -@dirrm lib/%%APP_NAME%%/defaults/pref -@dirrm lib/%%APP_NAME%%/defaults/profile -@dirrm lib/%%APP_NAME%%/defaults -@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback -@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components -@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org -@dirrm lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/defaults/preferences -@dirrm lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/defaults -@dirrm lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org/chrome -@dirrm lib/%%APP_NAME%%/extensions/calendar-timezones@mozilla.org -@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -@dirrm lib/%%APP_NAME%%/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} -@dirrm lib/%%APP_NAME%%/extensions -@dirrm lib/%%APP_NAME%%/greprefs -@dirrm lib/%%APP_NAME%%/icons -@dirrm lib/%%APP_NAME%%/js -@dirrm lib/%%APP_NAME%%/plugins -@dirrm lib/%%APP_NAME%%/res/dtd -@dirrm lib/%%APP_NAME%%/res/entityTables -@dirrm lib/%%APP_NAME%%/res/fonts -@dirrm lib/%%APP_NAME%%/res/html -@dirrm lib/%%APP_NAME%%/res -@dirrm lib/%%APP_NAME%% -@dirrmtry share/applications diff --git a/deskutils/sunbird-i18n/Makefile b/deskutils/sunbird-i18n/Makefile deleted file mode 100644 index 2d037c50213b..000000000000 --- a/deskutils/sunbird-i18n/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# New ports collection makefile for: sunbird-i18n -# Date created: 23 February 2007 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= sunbird-i18n -PORTVERSION= 0.9 -CATEGORIES= deskutils -MASTER_SITES= MOZILLA_EXTENDED/calendar/sunbird/releases/${DISTVERSION}/langpacks -PKGNAMEPREFIX= -DISTFILES= ${SUNBIRD_I18N_:S|$|.xpi|} -DIST_SUBDIR= xpi/${DISTNAME} - -MAINTAINER= gecko@FreeBSD.org -COMMENT= Localized interface for Sunbird - -DEPRECATED= Upstream development discontinued. Please consider using\ - ${PORTSDIR}/deskutils/lightning instead -EXPIRATION_DATE= 2010-09-04 - -.ifndef WITHOUT_SWITCHER -RUN_DEPENDS+= xpi-quick-locale-switcher>=1.6.5.1:${PORTSDIR}/www/xpi-quick-locale-switcher -.endif - -NO_BUILD= yes -USE_XPI= *sunbird - -SUNBIRD_I18N_ALL= ca cs da de es-AR es-ES eu fr ga-IE hu is it ja ka \ - ko lt nb-NO nl pl pt-BR pt-PT ro ru sk sl sv-SE uk \ - zh-CN -SUNBIRD_I18N?= all - -.if ${SUNBIRD_I18N} == all -SUNBIRD_I18N_= ${SUNBIRD_I18N_ALL} -.endif -SUNBIRD_I18N_?= ${SUNBIRD_I18N} - -WDIR= langpack-*@sunbird.mozilla.org - -XPI_DISTNAMES= ${SUNBIRD_I18N_} -.for dist in ${XPI_DISTNAMES} -XPI_ID_${dist}= langpack-${dist}@sunbird.mozilla.org -XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar chrome/calendar-${dist}.jar \ - chrome/chromelist.txt -XPI_DIRS_${dist}= chrome -.endfor - -do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} ${WRKSRC} - @for lang in ${SUNBIRD_I18N_}; do \ - if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@sunbird.mozilla.org);\ - then \ - exit 1; \ - fi \ - done - -do-install: - @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} - @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/ - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/ - @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/ - @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; } - @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} - @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ - ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} - -post-patch: - ${FIND} ${WRKSRC} -name install.rdf -print0 | \ - ${XARGS} -0L1 ${REINPLACE_CMD} -i '' '/<?xml/,$$!d' - -list-langs: - @fetch -o- "http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${PORTVERSION}/langpacks"|\ - perl -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1 "}' - -.include "${.CURDIR}/../../www/xpi-adblock/Makefile.xpi" -.include <bsd.port.mk> diff --git a/deskutils/sunbird-i18n/distinfo b/deskutils/sunbird-i18n/distinfo deleted file mode 100644 index 4b75dd9563d3..000000000000 --- a/deskutils/sunbird-i18n/distinfo +++ /dev/null @@ -1,84 +0,0 @@ -MD5 (xpi/sunbird-i18n-0.9/ca.xpi) = d3de5b43b25f0d8b68e515dbb06052e7 -SHA256 (xpi/sunbird-i18n-0.9/ca.xpi) = e231873772dbdb5db2825521750b4d62e459ed1b2f5cd139a4137ecc0c1e46ba -SIZE (xpi/sunbird-i18n-0.9/ca.xpi) = 101753 -MD5 (xpi/sunbird-i18n-0.9/cs.xpi) = 25152b290f87bfc02445f8297a403644 -SHA256 (xpi/sunbird-i18n-0.9/cs.xpi) = 6aaa4df616822e81a9593f638f977d4589aa9d0496742ea6ae2b6492c73e9bd9 -SIZE (xpi/sunbird-i18n-0.9/cs.xpi) = 101470 -MD5 (xpi/sunbird-i18n-0.9/da.xpi) = aa0e4022bd538cd033d94c0571a59b2c -SHA256 (xpi/sunbird-i18n-0.9/da.xpi) = f3fd7d02fba21ff863060c92203a0559198220cfaa342a338c8ab45cd3e6e53e -SIZE (xpi/sunbird-i18n-0.9/da.xpi) = 98597 -MD5 (xpi/sunbird-i18n-0.9/de.xpi) = 3f549ba15e76abbd153e0b0342f5ebdb -SHA256 (xpi/sunbird-i18n-0.9/de.xpi) = 57c1eafb2fcc230b1ab6823e5a76d33446010a16289c036f5760290f8012a695 -SIZE (xpi/sunbird-i18n-0.9/de.xpi) = 93611 -MD5 (xpi/sunbird-i18n-0.9/es-AR.xpi) = 7b8163f0a458ae980fa9d37454289d73 -SHA256 (xpi/sunbird-i18n-0.9/es-AR.xpi) = ed19acaee75878bba1cd9edf0d0fac7781dfc8d45a94af13ca9352bf0843b60c -SIZE (xpi/sunbird-i18n-0.9/es-AR.xpi) = 100986 -MD5 (xpi/sunbird-i18n-0.9/es-ES.xpi) = 74a9be1292d50c645ff33e1cc2c378ff -SHA256 (xpi/sunbird-i18n-0.9/es-ES.xpi) = 7fbff878e0385183006f573ec02bb0f4be96c58bf524384af6a9c7488f124413 -SIZE (xpi/sunbird-i18n-0.9/es-ES.xpi) = 85596 -MD5 (xpi/sunbird-i18n-0.9/eu.xpi) = 7e54e3a2bcf842d14803bda2862b4db2 -SHA256 (xpi/sunbird-i18n-0.9/eu.xpi) = 70cb2275e3a3a005a88cba6deeb8489b1b609b51deccd87e6b5349a844974c32 -SIZE (xpi/sunbird-i18n-0.9/eu.xpi) = 98000 -MD5 (xpi/sunbird-i18n-0.9/fr.xpi) = 1b4d394049c17175e27d502d657b5938 -SHA256 (xpi/sunbird-i18n-0.9/fr.xpi) = 50259440802d75c03c83c839217987de8609afb335f2a569d9496faa54012142 -SIZE (xpi/sunbird-i18n-0.9/fr.xpi) = 104262 -MD5 (xpi/sunbird-i18n-0.9/ga-IE.xpi) = 21993a02c28c4ee2b9cb8eab483d5198 -SHA256 (xpi/sunbird-i18n-0.9/ga-IE.xpi) = 6f5ce6da9d5382a884f1d39001b6c7a9086cd2fd150ec01c688ae371e3a7384a -SIZE (xpi/sunbird-i18n-0.9/ga-IE.xpi) = 101324 -MD5 (xpi/sunbird-i18n-0.9/hu.xpi) = 78c92149bb63a35be40f4dffbd639638 -SHA256 (xpi/sunbird-i18n-0.9/hu.xpi) = a2c72906dd56b7c784635fb37a80ea7d4989a0f478647f6fe6e1e5e4bcdaaccb -SIZE (xpi/sunbird-i18n-0.9/hu.xpi) = 104076 -MD5 (xpi/sunbird-i18n-0.9/is.xpi) = 161b183b3723454823d1b5d8d38e46e8 -SHA256 (xpi/sunbird-i18n-0.9/is.xpi) = a04aa8e82f81452a1c9d5ac6e2965e86a99d6b05c43bcba31c24f40f09557fac -SIZE (xpi/sunbird-i18n-0.9/is.xpi) = 96980 -MD5 (xpi/sunbird-i18n-0.9/it.xpi) = 5500c10aa729ccc6002b6a541f7dc9f6 -SHA256 (xpi/sunbird-i18n-0.9/it.xpi) = 47662703488494ca8aa7aa40c7bba2191aa6344de2c8cf57a38540cfc1d856e3 -SIZE (xpi/sunbird-i18n-0.9/it.xpi) = 87752 -MD5 (xpi/sunbird-i18n-0.9/ja.xpi) = b0207b572fa9775f2088743e1f7dc0aa -SHA256 (xpi/sunbird-i18n-0.9/ja.xpi) = 51fc1a5c68f367135bc1466857a1f124cb912cd2d99bd2ba13a9d3423d684b8d -SIZE (xpi/sunbird-i18n-0.9/ja.xpi) = 107250 -MD5 (xpi/sunbird-i18n-0.9/ka.xpi) = 9e85fd0d3fa4cd030b255d4c64b88d80 -SHA256 (xpi/sunbird-i18n-0.9/ka.xpi) = 29332788cbc1006d0b32fc89c59fb61928134612da3e68327ce20146e31b5ceb -SIZE (xpi/sunbird-i18n-0.9/ka.xpi) = 122742 -MD5 (xpi/sunbird-i18n-0.9/ko.xpi) = dbbbdc6cf6db7378e05d2ab50f403ea2 -SHA256 (xpi/sunbird-i18n-0.9/ko.xpi) = 472fe6d8d5c87c6a811c752345ba012262dcfb447bd3e759de52336229d6321c -SIZE (xpi/sunbird-i18n-0.9/ko.xpi) = 93350 -MD5 (xpi/sunbird-i18n-0.9/lt.xpi) = 94359e18b7271b0dd6b37ded878a4659 -SHA256 (xpi/sunbird-i18n-0.9/lt.xpi) = 814794096361a32bde2c936b42789efb6008cf5d7c99a045596e91010e6e0094 -SIZE (xpi/sunbird-i18n-0.9/lt.xpi) = 102695 -MD5 (xpi/sunbird-i18n-0.9/nb-NO.xpi) = 15b3a56ca4107da58c2cfc53d88051f5 -SHA256 (xpi/sunbird-i18n-0.9/nb-NO.xpi) = 7dc90ecce1d955f00b7be9b5223f4add249f11f7df8eb43d23da2939bd1a3e5b -SIZE (xpi/sunbird-i18n-0.9/nb-NO.xpi) = 99494 -MD5 (xpi/sunbird-i18n-0.9/nl.xpi) = 3ae36d5a1cd2cea41f28bf40bec99f56 -SHA256 (xpi/sunbird-i18n-0.9/nl.xpi) = d77b2aac6832599e2e29eff22f4473d3316362ba01d23eb16ea325ec582de048 -SIZE (xpi/sunbird-i18n-0.9/nl.xpi) = 101089 -MD5 (xpi/sunbird-i18n-0.9/pl.xpi) = d923f4a955a241c0863ea28a4b794d59 -SHA256 (xpi/sunbird-i18n-0.9/pl.xpi) = 2938c66a820d5fc941c81ebe629cf21b28e48c5ef08ed4fbb1905183b23e0c8a -SIZE (xpi/sunbird-i18n-0.9/pl.xpi) = 104214 -MD5 (xpi/sunbird-i18n-0.9/pt-BR.xpi) = a4d64b260795c9f16bca3a2cc4739990 -SHA256 (xpi/sunbird-i18n-0.9/pt-BR.xpi) = 7e2f83c76da1644fc9a97fa3e5607dbb7a922568e53b0aeea4c0316a5f7ae4a1 -SIZE (xpi/sunbird-i18n-0.9/pt-BR.xpi) = 99708 -MD5 (xpi/sunbird-i18n-0.9/pt-PT.xpi) = dda6b745526e85126012e374476c57cc -SHA256 (xpi/sunbird-i18n-0.9/pt-PT.xpi) = aeaf095e6038101e3aa81b6a740671026b5b8b03a4943a58b23ab9de08f1de12 -SIZE (xpi/sunbird-i18n-0.9/pt-PT.xpi) = 99026 -MD5 (xpi/sunbird-i18n-0.9/ro.xpi) = d871b87338082e8b9ecc5c96ae508d11 -SHA256 (xpi/sunbird-i18n-0.9/ro.xpi) = 0163397a161e19b5bd3a8c6fb4f06bb7576a1fce87c6378e91847aba20f67b6c -SIZE (xpi/sunbird-i18n-0.9/ro.xpi) = 101531 -MD5 (xpi/sunbird-i18n-0.9/ru.xpi) = 961e62525a09271add4d0d9cfe071402 -SHA256 (xpi/sunbird-i18n-0.9/ru.xpi) = 6bad0c4cbc6e33095bdc43b45f2fe36b8a594dfe1f09805e1134367153644eef -SIZE (xpi/sunbird-i18n-0.9/ru.xpi) = 105173 -MD5 (xpi/sunbird-i18n-0.9/sk.xpi) = 3d891899835d73506ce9c793acccac2b -SHA256 (xpi/sunbird-i18n-0.9/sk.xpi) = fd8a14a70c249d70408bcc260a1e391a40f78c38d8a6b40170428a57e25f5812 -SIZE (xpi/sunbird-i18n-0.9/sk.xpi) = 104944 -MD5 (xpi/sunbird-i18n-0.9/sl.xpi) = f05e4a3e93394693be844c90e2ca0f7c -SHA256 (xpi/sunbird-i18n-0.9/sl.xpi) = 53a83d91cfd4f7947000262fe3413bdff4fa8b7c39bff9e642dcc5658a0b104c -SIZE (xpi/sunbird-i18n-0.9/sl.xpi) = 101323 -MD5 (xpi/sunbird-i18n-0.9/sv-SE.xpi) = 27d1175daf451e4ecaabe648fe76640b -SHA256 (xpi/sunbird-i18n-0.9/sv-SE.xpi) = 13533b9dac892be82d6f79522a8e48b715a90ab9f9f8e68151cb4e8586f2954e -SIZE (xpi/sunbird-i18n-0.9/sv-SE.xpi) = 103397 -MD5 (xpi/sunbird-i18n-0.9/uk.xpi) = a0a35823fdf3a1fa3f217eebe447b902 -SHA256 (xpi/sunbird-i18n-0.9/uk.xpi) = eb63f07fcc76fbab422a4d9e9cb1215a9164f661660d06fe7a268a49f6c8d399 -SIZE (xpi/sunbird-i18n-0.9/uk.xpi) = 99857 -MD5 (xpi/sunbird-i18n-0.9/zh-CN.xpi) = ef85d04ebcb24b864fc0357568efbfe8 -SHA256 (xpi/sunbird-i18n-0.9/zh-CN.xpi) = 7dae4f23adb5794ea0344bee4710e9f875fbe3f69bd69e722455498fcdcdade4 -SIZE (xpi/sunbird-i18n-0.9/zh-CN.xpi) = 86524 diff --git a/deskutils/sunbird-i18n/pkg-descr b/deskutils/sunbird-i18n/pkg-descr deleted file mode 100644 index b972af3f07d4..000000000000 --- a/deskutils/sunbird-i18n/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Language packs for Sunbird - -WWW: http://www.mozilla.org/projects/l10n/ diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile deleted file mode 100644 index 6e94466304f5..000000000000 --- a/deskutils/sunbird/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# New ports collection makefile for: sunbird -# Date created: 2005-02-26 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $ -# - -PORTNAME= sunbird -PORTVERSION= 0.9 -PORTREVISION= 3 -PORTEPOCH= 1 -CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source -DISTNAME= lightning-${PORTNAME}-${DISTVERSION}-source - -MAINTAINER= gecko@FreeBSD.org -COMMENT= Redesign of the Mozilla Calendar with XUL interface - -DEPRECATED= Upstream development discontinued. Please consider using\ - ${PORTSDIR}/deskutils/lightning instead -EXPIRATION_DATE= 2010-09-04 - -USE_AUTOTOOLS= libtool:22 -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -HAS_CONFIGURE= yes -USE_GMAKE= yes -USE_BZIP2= yes -USE_GECKO= gecko -WANT_GNOME= yes -WANT_PERL= yes -SUNBIRD= ${PORTNAME} -SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/chrome/icons/default/default.xpm -SUNBIRD_ICON= ${PORTNAME}.xpm -LIBS= -Wl,-Bsymbolic -lc -MOZ_PKGCONFIG_FILES= ${PORTNAME}-js ${PORTNAME}-xpcom ${PORTNAME}-plugin -PKGCONFIG_FILES= ${MOZ_PKG_CONFIG_FILES} -MOZ_OPTIONS= --enable-application=calendar \ - --enable-system-cairo \ - --with-system-nss \ - --enable-canvas -MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar - -GECKO_PLIST_PRE_FILES= lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest \ - lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest - -.include <bsd.init.mk> -.include <bsd.libnames.mk> -.include <bsd.port.pre.mk> - -.if ${ARCH}=="sparc64" -BROKEN= does not build -.endif - -post-patch: - @${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \ - ${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/security/manager/ssl/src/Makefile.in - @${REINPLACE_CMD} -e 's|%%LIB_BZ2%%|${LIBBZ2}|' \ - ${WRKSRC}/toolkit/mozapps/update/src/updater/Makefile.in - -post-build: - @(cd ${WRKSRC}/xpfe/components/autocomplete/src && ${GMAKE}) - -pre-install: - ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} - ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} - ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} - ${ECHO_CMD} '@dirrmtry lib/sunbird/plugins' >> ${PLIST} - ${ECHO_CMD} '@dirrmtry lib/sunbird' >> ${PLIST} - -do-install: - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications - ${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON} - ${TOUCH} ${PREFIX}/lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest - ${TOUCH} ${PREFIX}/lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest - -.include <bsd.port.post.mk> diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo deleted file mode 100644 index cc32fcdad0b5..000000000000 --- a/deskutils/sunbird/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (lightning-sunbird-0.9-source.tar.bz2) = 7757ffefd4a30bcc1497b93b3dc6c0ce -SHA256 (lightning-sunbird-0.9-source.tar.bz2) = 329b256bd463a76527c255cd5b8141ffb6df077ce8d63efdffad6516f0b90f64 -SIZE (lightning-sunbird-0.9-source.tar.bz2) = 43121977 diff --git a/deskutils/sunbird/files/patch-Makefile.in b/deskutils/sunbird/files/patch-Makefile.in deleted file mode 100644 index 5b087403b086..000000000000 --- a/deskutils/sunbird/files/patch-Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.in.orig Mon Jul 2 06:19:35 2007 -+++ Makefile.in Mon Jul 2 06:19:47 2007 -@@ -91,7 +91,6 @@ - # - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm - - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg -@@ -107,7 +106,6 @@ - endif - - ifdef MOZ_UPDATER --tier_1_dirs += modules/libbz2 - tier_1_dirs += modules/libmar - endif - diff --git a/deskutils/sunbird/files/patch-bugzilla149334 b/deskutils/sunbird/files/patch-bugzilla149334 deleted file mode 100644 index 4bdb765228eb..000000000000 --- a/deskutils/sunbird/files/patch-bugzilla149334 +++ /dev/null @@ -1,328 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - ---- gfx/src/ps/nsFontMetricsPS.h.orig Fri Mar 4 15:41:55 2005 -+++ gfx/src/ps/nsFontMetricsPS.h Thu Mar 17 05:16:50 2005 -@@ -492,7 +492,7 @@ - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif // MOZ_ENABLE_FREETYPE2 - #endif // MOZ_ENABLE_XFT diff --git a/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c b/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c deleted file mode 100644 index 17812d705942..000000000000 --- a/deskutils/sunbird/files/patch-calendar_libical_src_libical_icalrecur.c +++ /dev/null @@ -1,13 +0,0 @@ ---- calendar/libical/src/libical/icalrecur.c.orig Thu Mar 17 07:13:54 2005 -+++ calendar/libical/src/libical/icalrecur.c Thu Mar 17 07:14:30 2005 -@@ -134,9 +134,7 @@ - #include "config.h" - #endif - --#ifdef HAVE_STDINT_H --#include <stdint.h> --#endif -+#include <inttypes.h> - - #ifndef HAVE_INTPTR_T - #ifdef WIN32 diff --git a/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h b/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e664475d..000000000000 --- a/deskutils/sunbird/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/deskutils/sunbird/files/patch-config_autoconf.mk.in b/deskutils/sunbird/files/patch-config_autoconf.mk.in deleted file mode 100644 index c4fa0b516d1d..000000000000 --- a/deskutils/sunbird/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in b/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 8da7e48ab0df..000000000000 --- a/deskutils/sunbird/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 -@@ -73,6 +73,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/deskutils/sunbird/files/patch-config_rules.mk b/deskutils/sunbird/files/patch-config_rules.mk deleted file mode 100644 index 7377726fdc66..000000000000 --- a/deskutils/sunbird/files/patch-config_rules.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- config/rules.mk.orig Fri Jul 7 00:13:36 2006 -+++ config/rules.mk Sun Sep 3 00:04:03 2006 -@@ -443,7 +443,7 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - endif - diff --git a/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index bc141062f7c6..000000000000 --- a/deskutils/sunbird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 -@@ -65,7 +65,8 @@ - - #include <gdk/gdkx.h> - #include <freetype/tttables.h> --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" diff --git a/deskutils/sunbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp b/deskutils/sunbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp deleted file mode 100644 index ab9689957cbc..000000000000 --- a/deskutils/sunbird/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200 -+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200 -@@ -111,9 +111,9 @@ - - // initialize - png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -- png_error_ptr_NULL, -- png_error_ptr_NULL); -+ NULL, -+ NULL, -+ NULL); - if (! png_ptr) - return NS_ERROR_OUT_OF_MEMORY; - png_info* info_ptr = png_create_info_struct(png_ptr); diff --git a/deskutils/sunbird/files/patch-nothreads-sqlite b/deskutils/sunbird/files/patch-nothreads-sqlite deleted file mode 100644 index 1b1bbbcbda15..000000000000 --- a/deskutils/sunbird/files/patch-nothreads-sqlite +++ /dev/null @@ -1,12 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006 -+++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006 -@@ -99,7 +99,8 @@ - # REFEF_IO allows us to override IO functions, which is used in the AsyncIO - # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we - # don't have to vacuum to make sure the data is not visible in the file. --DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1 -+DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -+# -DTHREADSAFE=1 - - ifdef ENABLE_TESTS - ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) diff --git a/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk b/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk deleted file mode 100644 index 5c76b5af5ebf..000000000000 --- a/deskutils/sunbird/files/patch-security_coreconf_FreeBSD.mk +++ /dev/null @@ -1,37 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Thu Jul 8 12:56:24 2004 -@@ -35,16 +35,18 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ -+CCC = ${CXX} - RANLIB = ranlib - - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +73,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss deleted file mode 100644 index 6846244b32a5..000000000000 --- a/deskutils/sunbird/files/patch-sysnss +++ /dev/null @@ -1,206 +0,0 @@ ---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 -@@ -124,19 +124,19 @@ - pipboot \ - $(NULL) - --EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk ---- security/manager/Makefile.in.orig 2008-11-23 09:08:49.000000000 +1000 -+++ security/manager/Makefile.in 2008-11-23 09:11:24.000000000 +1000 -@@ -54,22 +54,14 @@ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_LIBS \ - HAVE_FREEBL_LIBS_32 \ - HAVE_FREEBL_LIBS_32INT64 \ - HAVE_FREEBL_LIBS_64 \ - $(NULL) - --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - # Default - HAVE_FREEBL_LIBS = 1 - -@@ -217,13 +209,6 @@ - - .nss.cleaned: .nss.checkout - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif -- touch $@ - endif - - .nss.checkout: -@@ -240,113 +225,14 @@ - endif - - libs:: --ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) --endif --ifeq ($(OS_ARCH),WINNT) -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --else -- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) --endif --ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean -- # In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h. -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins" --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif --endif -- $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ - ifdef MOZ_XUL - $(MAKE) -C pki $@ - endif - - install:: --ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif --endif -- $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ - $(MAKE) -C locales $@ - ifdef MOZ_XUL - $(MAKE) -C pki $@ -@@ -360,12 +244,6 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif - - echo-requires-recursive:: ---- toolkit/mozapps/update/src/updater/Makefile.in.orig Mon Jul 2 07:59:59 2007 -+++ toolkit/mozapps/update/src/updater/Makefile.in Mon Jul 2 08:00:21 2007 -@@ -52,11 +52,11 @@ - - PROGRAM = updater$(BIN_SUFFIX) - --REQUIRES = libmar libbz2 -+REQUIRES = libmar - - LIBS += \ - $(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \ -- $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ -+ %%LIB_BZ2%% \ - $(NULL) - - ifeq ($(OS_ARCH),WINNT) diff --git a/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f536df..000000000000 --- a/deskutils/sunbird/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc deleted file mode 100644 index ebe5474ca275..000000000000 --- a/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index dbdc47b6f8e4..000000000000 --- a/deskutils/sunbird/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/deskutils/sunbird/files/patch-xptcall-alpha b/deskutils/sunbird/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e61e..000000000000 --- a/deskutils/sunbird/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/deskutils/sunbird/files/patch-xptcall-amd64 b/deskutils/sunbird/files/patch-xptcall-amd64 deleted file mode 100644 index 3227cad02182..000000000000 --- a/deskutils/sunbird/files/patch-xptcall-amd64 +++ /dev/null @@ -1,386 +0,0 @@ ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 -@@ -0,0 +1,174 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+// Platform specific code to invoke XPCOM methods on native objects -+ -+#include "xptcprivate.h" -+ -+// 6 integral parameters are passed in registers -+const PRUint32 GPR_COUNT = 6; -+ -+// 8 floating point parameters are passed in SSE registers -+const PRUint32 FPR_COUNT = 8; -+ -+// Remember that these 'words' are 64-bit long -+static inline void -+invoke_count_words(PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint32 & nr_gpr, PRUint32 & nr_fpr, PRUint32 & nr_stack) -+{ -+ nr_gpr = 1; // skip one GP register for 'that' -+ nr_fpr = 0; -+ nr_stack = 0; -+ -+ /* Compute number of eightbytes of class MEMORY. */ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (!s->IsPtrData() -+ && (s->type == nsXPTType::T_FLOAT || s->type == nsXPTType::T_DOUBLE)) { -+ if (nr_fpr < FPR_COUNT) -+ nr_fpr++; -+ else -+ nr_stack++; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ nr_gpr++; -+ else -+ nr_stack++; -+ } -+ } -+} -+ -+static void -+invoke_copy_to_stack(PRUint64 * d, PRUint32 paramCount, nsXPTCVariant * s, -+ PRUint64 * gpregs, double * fpregs) -+{ -+ PRUint32 nr_gpr = 1; // skip one GP register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for (uint32 i = 0; i < paramCount; i++, s++) { -+ if (s->IsPtrData()) -+ value = (PRUint64) s->ptr; -+ else { -+ switch (s->type) { -+ case nsXPTType::T_FLOAT: break; -+ case nsXPTType::T_DOUBLE: break; -+ case nsXPTType::T_I8: value = s->val.i8; break; -+ case nsXPTType::T_I16: value = s->val.i16; break; -+ case nsXPTType::T_I32: value = s->val.i32; break; -+ case nsXPTType::T_I64: value = s->val.i64; break; -+ case nsXPTType::T_U8: value = s->val.u8; break; -+ case nsXPTType::T_U16: value = s->val.u16; break; -+ case nsXPTType::T_U32: value = s->val.u32; break; -+ case nsXPTType::T_U64: value = s->val.u64; break; -+ case nsXPTType::T_BOOL: value = s->val.b; break; -+ case nsXPTType::T_CHAR: value = s->val.c; break; -+ case nsXPTType::T_WCHAR: value = s->val.wc; break; -+ default: value = (PRUint64) s->val.p; break; -+ } -+ } -+ -+ if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((double *)d) = s->val.d; -+ d++; -+ } -+ } -+ else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ fpregs[nr_fpr++] = s->val.d; -+ else { -+ *((float *)d) = s->val.f; -+ d++; -+ } -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ gpregs[nr_gpr++] = value; -+ else -+ *d++ = value; -+ } -+ } -+} -+ -+extern "C" -+XPTC_PUBLIC_API(nsresult) -+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant * params) -+{ -+ PRUint32 nr_gpr, nr_fpr, nr_stack; -+ invoke_count_words(paramCount, params, nr_gpr, nr_fpr, nr_stack); -+ -+ // Stack, if used, must be 16-bytes aligned -+ if (nr_stack) -+ nr_stack = (nr_stack + 1) & ~1; -+ -+ // Load parameters to stack, if necessary -+ PRUint64 *stack = (PRUint64 *) __builtin_alloca(nr_stack * 8); -+ PRUint64 gpregs[GPR_COUNT]; -+ double fpregs[FPR_COUNT]; -+ invoke_copy_to_stack(stack, paramCount, params, gpregs, fpregs); -+ -+ // Load FPR registers from fpregs[] -+ register double d0 asm("xmm0"); -+ register double d1 asm("xmm1"); -+ register double d2 asm("xmm2"); -+ register double d3 asm("xmm3"); -+ register double d4 asm("xmm4"); -+ register double d5 asm("xmm5"); -+ register double d6 asm("xmm6"); -+ register double d7 asm("xmm7"); -+ -+ switch (nr_fpr) { -+#define ARG_FPR(N) \ -+ case N+1: d##N = fpregs[N]; -+ ARG_FPR(7); -+ ARG_FPR(6); -+ ARG_FPR(5); -+ ARG_FPR(4); -+ ARG_FPR(3); -+ ARG_FPR(2); -+ ARG_FPR(1); -+ ARG_FPR(0); -+ case 0:; -+#undef ARG_FPR -+ } -+ -+ // Load GPR registers from gpregs[] -+ register PRUint64 a0 asm("rdi"); -+ register PRUint64 a1 asm("rsi"); -+ register PRUint64 a2 asm("rdx"); -+ register PRUint64 a3 asm("rcx"); -+ register PRUint64 a4 asm("r8"); -+ register PRUint64 a5 asm("r9"); -+ -+ switch (nr_gpr) { -+#define ARG_GPR(N) \ -+ case N+1: a##N = gpregs[N]; -+ ARG_GPR(5); -+ ARG_GPR(4); -+ ARG_GPR(3); -+ ARG_GPR(2); -+ ARG_GPR(1); -+ case 1: a0 = (PRUint64) that; -+ case 0:; -+#undef ARG_GPR -+ } -+ -+ // Ensure that assignments to SSE registers won't be optimized away -+ asm("" :: -+ "x" (d0), "x" (d1), "x" (d2), "x" (d3), -+ "x" (d4), "x" (d5), "x" (d6), "x" (d7)); -+ -+ // Get pointer to method -+ PRUint64 methodAddress = *((PRUint64 *)that); -+ methodAddress += 8 * methodIndex; -+ methodAddress = *((PRUint64 *)methodAddress); -+ -+ typedef PRUint32 (*Method)(PRUint64, PRUint64, PRUint64, PRUint64, PRUint64, PRUint64); -+ PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5); -+ return result; -+} ---- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 -@@ -0,0 +1,206 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+ -+// Implement shared vtbl methods. -+ -+#include "xptcprivate.h" -+ -+// The Linux/x86-64 ABI passes the first 6 integral parameters and the -+// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx, -+// r8, r9 and xmm0-xmm7), no stack space is allocated for these by the -+// caller. The rest of the parameters are passed in the callers stack -+// area. -+ -+const PRUint32 PARAM_BUFFER_COUNT = 16; -+const PRUint32 GPR_COUNT = 6; -+const PRUint32 FPR_COUNT = 8; -+ -+// PrepareAndDispatch() is called by SharedStub() and calls the actual method. -+// -+// - 'args[]' contains the arguments passed on stack -+// - 'gpregs[]' contains the arguments passed in integer registers -+// - 'fpregs[]' contains the arguments passed in floating point registers -+// -+// The parameters are mapped into an array of type 'nsXPTCMiniVariant' -+// and then the method gets called. -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase * self, PRUint32 methodIndex, -+ PRUint64 * args, PRUint64 * gpregs, double *fpregs) -+{ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint32 paramCount; -+ PRUint32 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ if (! iface_info) -+ return NS_ERROR_UNEXPECTED; -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no method info"); -+ if (! info) -+ return NS_ERROR_UNEXPECTED; -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ if (! dispatchParams) -+ return NS_ERROR_OUT_OF_MEMORY; -+ -+ PRUint64* ap = args; -+ PRUint32 nr_gpr = 1; // skip one GPR register for 'that' -+ PRUint32 nr_fpr = 0; -+ PRUint64 value; -+ -+ for(i = 0; i < paramCount; i++) { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if (!param.IsOut() && type == nsXPTType::T_DOUBLE) { -+ if (nr_fpr < FPR_COUNT) -+ dp->val.d = fpregs[nr_fpr++]; -+ else -+ dp->val.d = *(double*) ap++; -+ continue; -+ } -+ else if (!param.IsOut() && type == nsXPTType::T_FLOAT) { -+ if (nr_fpr < FPR_COUNT) -+ // The value in %xmm register is already prepared to -+ // be retrieved as a float. Therefore, we pass the -+ // value verbatim, as a double without conversion. -+ dp->val.d = *(double*) ap++; -+ else -+ dp->val.f = *(float*) ap++; -+ continue; -+ } -+ else { -+ if (nr_gpr < GPR_COUNT) -+ value = gpregs[nr_gpr++]; -+ else -+ value = *ap++; -+ } -+ -+ if (param.IsOut() || !type.IsArithmetic()) { -+ dp->val.p = (void*) value; -+ continue; -+ } -+ -+ switch (type) { -+ case nsXPTType::T_I8: dp->val.i8 = (PRInt8) value; break; -+ case nsXPTType::T_I16: dp->val.i16 = (PRInt16) value; break; -+ case nsXPTType::T_I32: dp->val.i32 = (PRInt32) value; break; -+ case nsXPTType::T_I64: dp->val.i64 = (PRInt64) value; break; -+ case nsXPTType::T_U8: dp->val.u8 = (PRUint8) value; break; -+ case nsXPTType::T_U16: dp->val.u16 = (PRUint16) value; break; -+ case nsXPTType::T_U32: dp->val.u32 = (PRUint32) value; break; -+ case nsXPTType::T_U64: dp->val.u64 = (PRUint64) value; break; -+ case nsXPTType::T_BOOL: dp->val.b = (PRBool) value; break; -+ case nsXPTType::T_CHAR: dp->val.c = (char) value; break; -+ case nsXPTType::T_WCHAR: dp->val.wc = (wchar_t) value; break; -+ -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if (dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+// Linux/x86-64 uses gcc >= 3.1 -+#define STUB_ENTRY(n) \ -+asm(".section \".text\"\n\t" \ -+ ".align 2\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase5Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase5Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase6Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase6Stub" #n "Ev:\n\t" \ -+ ".elseif " #n " < 1000\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".type _ZN14nsXPTCStubBase7Stub" #n "Ev,@function\n" \ -+ "_ZN14nsXPTCStubBase7Stub" #n "Ev:\n\t" \ -+ ".else\n\t" \ -+ ".err \"stub number " #n " >= 1000 not yet supported\"\n\t" \ -+ ".endif\n\t" \ -+ "movl $" #n ", %eax\n\t" \ -+ "jmp SharedStub\n\t" \ -+ ".if " #n " < 10\n\t" \ -+ ".size _ZN14nsXPTCStubBase5Stub" #n "Ev,.-_ZN14nsXPTCStubBase5Stub" #n "Ev\n\t" \ -+ ".elseif " #n " < 100\n\t" \ -+ ".size _ZN14nsXPTCStubBase6Stub" #n "Ev,.-_ZN14nsXPTCStubBase6Stub" #n "Ev\n\t" \ -+ ".else\n\t" \ -+ ".size _ZN14nsXPTCStubBase7Stub" #n "Ev,.-_ZN14nsXPTCStubBase7Stub" #n "Ev\n\t" \ -+ ".endif"); -+ -+// static nsresult SharedStub(PRUint32 methodIndex) -+asm(".section \".text\"\n\t" -+ ".align 2\n\t" -+ ".type SharedStub,@function\n\t" -+ "SharedStub:\n\t" -+ // make room for gpregs (48), fpregs (64) -+ "pushq %rbp\n\t" -+ "movq %rsp,%rbp\n\t" -+ "subq $112,%rsp\n\t" -+ // save GP registers -+ "movq %rdi,-112(%rbp)\n\t" -+ "movq %rsi,-104(%rbp)\n\t" -+ "movq %rdx, -96(%rbp)\n\t" -+ "movq %rcx, -88(%rbp)\n\t" -+ "movq %r8 , -80(%rbp)\n\t" -+ "movq %r9 , -72(%rbp)\n\t" -+ "leaq -112(%rbp),%rcx\n\t" -+ // save FP registers -+ "movsd %xmm0,-64(%rbp)\n\t" -+ "movsd %xmm1,-56(%rbp)\n\t" -+ "movsd %xmm2,-48(%rbp)\n\t" -+ "movsd %xmm3,-40(%rbp)\n\t" -+ "movsd %xmm4,-32(%rbp)\n\t" -+ "movsd %xmm5,-24(%rbp)\n\t" -+ "movsd %xmm6,-16(%rbp)\n\t" -+ "movsd %xmm7, -8(%rbp)\n\t" -+ "leaq -64(%rbp),%r8\n\t" -+ // rdi has the 'self' pointer already -+ "movl %eax,%esi\n\t" -+ "leaq 16(%rbp),%rdx\n\t" -+ "call PrepareAndDispatch\n\t" -+ "leave\n\t" -+ "ret\n\t" -+ ".size SharedStub,.-SharedStub"); -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#else -+#error "can't find a compiler to use" -+#endif /* __GNUC__ */ diff --git a/deskutils/sunbird/files/patch-xptcall-ia64 b/deskutils/sunbird/files/patch-xptcall-ia64 deleted file mode 100644 index 3e05a5c704b3..000000000000 --- a/deskutils/sunbird/files/patch-xptcall-ia64 +++ /dev/null @@ -1,19 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Mon Nov 7 23:10:28 2005 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 10 arguments, first 8 are the input arguments of previous - // function call. The 9th one is methodIndex and the 10th is the - // pointer to the remaining input arguments. The last two arguments diff --git a/deskutils/sunbird/files/patch-xptcall-sparc64 b/deskutils/sunbird/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71336..000000000000 --- a/deskutils/sunbird/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/deskutils/sunbird/files/sunbird.desktop.in b/deskutils/sunbird/files/sunbird.desktop.in deleted file mode 100644 index e371a93f2cc5..000000000000 --- a/deskutils/sunbird/files/sunbird.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Mozilla Calendar -Comment=Mozilla Sunbird Calendar -Icon=@SUNBIRD_ICON@ -Exec=sunbird -Terminal=false -Type=Application -Categories=Application;Office; diff --git a/deskutils/sunbird/pkg-descr b/deskutils/sunbird/pkg-descr deleted file mode 100644 index f9995c9a993c..000000000000 --- a/deskutils/sunbird/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -The Sunbird Project is a redesign of the Mozilla Calendar component. The goal -is to produce a cross platform standalone calendar application based on -Mozilla's XUL user interface language. - -WWW: http://www.mozilla.org/projects/calendar/sunbird.html |