Update to fennec/firefox for mobile 5.0, sync patches from www/mozilla-firefox..

Tested on amd64 and macppc.
This commit is contained in:
landry 2011-06-28 22:01:17 +00:00
parent 3156205189
commit b16ee369be
92 changed files with 632 additions and 425 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.6 2011/06/08 18:15:29 rpointel Exp $
# $OpenBSD: Makefile,v 1.7 2011/06/28 22:01:17 landry Exp $
COMMENT = Mozilla mobile web browser
MOZILLA_VERSION = 4.0.1
MOZILLA_BRANCH = 2.1
MOZILLA_VERSION = 5.0
MOZILLA_BRANCH = mobile-${MOZILLA_VERSION}
MOZILLA_PROJECT = fennec
MOZILLA_CODENAME = mobile
REVISION = 2
SO_VERSION = 0.0
SO_VERSION = 1.0
NSS_SO_VERSION = 27.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@ -35,7 +34,7 @@ USE_GROFF = Yes
NO_REGRESS = Yes
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS += --enable-official-branding --disable-install-strip
CONFIGURE_ARGS += --enable-official-branding
CONFIGURE_ARGS += --with-system-libevent=/usr/
CONFIGURE_ARGS += --with-system-zlib=/usr/ --with-system-bz2=${LOCALBASE}
WANTLIB += event
@ -58,6 +57,9 @@ SUBST_VARS += MOZILLA_VERSION NSS_SO_VERSION
BUILD_DEPENDS += archivers/gtar
INSTALL_TARGET = package
# unzip used during install
BUILD_DEPENDS += archivers/unzip
post-configure:
rm -f ${WRKSRC}/services/crypto/modules/WeaveCrypto.js.{orig,beforesubst}

View File

@ -1,5 +1,5 @@
MD5 (mozilla/fennec-4.0.1.source.tar.bz2) = HoK9V92sdbQb3/P6BtKfEQ==
RMD160 (mozilla/fennec-4.0.1.source.tar.bz2) = KFnxRlN6zbVy0MVeO/uzOIqRpYE=
SHA1 (mozilla/fennec-4.0.1.source.tar.bz2) = 134UTABrCR25mqhWN3FD6iLRKNc=
SHA256 (mozilla/fennec-4.0.1.source.tar.bz2) = uFK5y5d4mBDTZoxUtpOB3H4rVcZQefdfGxISQt8O5ow=
SIZE (mozilla/fennec-4.0.1.source.tar.bz2) = 66744110
MD5 (mozilla/fennec-5.0.source.tar.bz2) = 9xYzTaFiljCkVAr5f8XPlg==
RMD160 (mozilla/fennec-5.0.source.tar.bz2) = Mz2oyfmWmYSkMDyi0peme7a6sJw=
SHA1 (mozilla/fennec-5.0.source.tar.bz2) = xibj8ZxJwLgCK3klJHZ83IQgGEE=
SHA256 (mozilla/fennec-5.0.source.tar.bz2) = LE6xQwvBYwChJOUt45toWUipE11Kzxqh7VC/0R7A9Ps=
SIZE (mozilla/fennec-5.0.source.tar.bz2) = 68737915

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-browser_app_application_ini,v 1.2 2011/05/03 11:11:37 landry Exp $
--- browser/app/application.ini.orig Wed Jul 21 02:52:01 2010
+++ browser/app/application.ini Sun Aug 1 12:14:02 2010
@@ -58,7 +58,4 @@ EnableProfileMigrator=1
EnableExtensionManager=1
[Crash Reporter]
-#if MOZILLA_OFFICIAL
-Enabled=1
-#endif
ServerURL=https://crash-reports.mozilla.com/submit?id=ec8030f7-c20a-464f-9b0e-13a3a9e97384&version=@APP_VERSION@&buildid=@GRE_BUILDID@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.2 2011/05/03 11:11:37 landry Exp $
--- browser/app/profile/firefox.js.orig Wed Feb 23 06:53:25 2011
+++ browser/app/profile/firefox.js Sat Feb 26 09:25:33 2011
@@ -137,7 +137,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.3 2011/06/28 22:01:17 landry Exp $
--- browser/app/profile/firefox.js.orig Fri May 27 18:11:54 2011
+++ browser/app/profile/firefox.js Tue May 31 22:11:27 2011
@@ -135,7 +135,7 @@ pref("app.update.certs.2.issuerName", "CN=Thawte SSL C
pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
@ -10,7 +10,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.2 2011/05/03 11:11:37 landry
// This preference turns on app.update.mode and allows automatic download and
// install to take place. We use a separate boolean toggle for this to make
@@ -589,7 +589,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
@@ -582,7 +582,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
// by default we show an infobar message when pages require plugins the user has not installed, or are outdated
@ -19,7 +19,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.2 2011/05/03 11:11:37 landry
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -712,10 +712,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -705,10 +705,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
#ifdef MOZ_SAFE_BROWSING
// Safe browsing does nothing unless this pref is set
@ -32,7 +32,7 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.2 2011/05/03 11:11:37 landry
// Non-enhanced mode (local url lists) URL list to check for updates
pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2");
@@ -777,10 +777,8 @@ pref("browser.EULA.version", 3);
@@ -770,10 +770,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-browser_components_certerror_content_aboutCertError_xhtml,v 1.3 2011/06/28 22:01:17 landry Exp $
Click the 'get certificate' checkbox ?
--- browser/components/certerror/content/aboutCertError.xhtml.orig Tue Aug 31 15:49:28 2010
+++ browser/components/certerror/content/aboutCertError.xhtml Thu Sep 9 10:28:59 2010
@@ -135,6 +135,9 @@

View File

@ -1,13 +0,0 @@
$OpenBSD: patch-browser_components_nsBrowserGlue_js,v 1.2 2011/05/03 11:11:37 landry Exp $
--- browser/components/nsBrowserGlue.js.orig Tue Jan 11 04:25:41 2011
+++ browser/components/nsBrowserGlue.js Sat Jan 15 01:03:01 2011
@@ -397,9 +397,6 @@ BrowserGlue.prototype = {
// Browser startup complete. All initial windows have opened.
_onBrowserStartup: function BG__onBrowserStartup() {
- // Show about:rights notification, if needed.
- if (this._shouldShowRights())
- this._showRightsNotification();
// Show update notification, if needed.
if (Services.prefs.prefHasUserValue("app.update.postupdate"))

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-build_unix_mozilla_in,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-build_unix_mozilla_in,v 1.3 2011/06/28 22:01:17 landry Exp $
--- build/unix/mozilla.in.orig Wed Jan 6 05:35:11 2010
+++ build/unix/mozilla.in Sun Jan 10 17:47:23 2010
@@ -50,6 +50,11 @@

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-build_unix_run-mozilla_sh,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-build_unix_run-mozilla_sh,v 1.3 2011/06/28 22:01:17 landry Exp $
find our gdb by default
--- build/unix/run-mozilla.sh.orig Thu Nov 4 21:05:18 2010
+++ build/unix/run-mozilla.sh Sat Nov 13 12:00:19 2010

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_autoconf_mk_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- config/autoconf.mk.in.orig Wed Feb 23 06:53:26 2011
+++ config/autoconf.mk.in Sat Feb 26 09:25:33 2011
@@ -311,7 +311,7 @@ OS_LDFLAGS = @LDFLAGS@
$OpenBSD: patch-config_autoconf_mk_in,v 1.3 2011/06/28 22:01:17 landry Exp $
--- config/autoconf.mk.in.orig Fri May 27 18:11:56 2011
+++ config/autoconf.mk.in Tue May 31 22:11:27 2011
@@ -306,7 +306,7 @@ OS_LDFLAGS = @LDFLAGS@
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-config_rules_mk,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-config_rules_mk,v 1.3 2011/06/28 22:01:17 landry Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
--- config/rules.mk.orig Thu Feb 3 21:11:40 2011
+++ config/rules.mk Tue Feb 8 22:37:33 2011
@@ -624,6 +624,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
--- config/rules.mk.orig Fri May 27 18:11:56 2011
+++ config/rules.mk Tue May 31 22:11:27 2011
@@ -571,6 +571,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
endif
endif

View File

@ -1,25 +1,22 @@
$OpenBSD: patch-configure_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- configure.in.orig Sat Apr 16 00:16:05 2011
+++ configure.in Tue May 3 11:04:00 2011
@@ -1229,7 +1229,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -L$(LIBXUL_DIST)/bin'
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
@@ -2676,7 +2676,7 @@ ia64*-hpux*)
$OpenBSD: patch-configure_in,v 1.3 2011/06/28 22:01:17 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648721
--- configure.in.orig Fri May 27 18:11:56 2011
+++ configure.in Tue May 31 23:13:14 2011
@@ -2626,7 +2626,12 @@ ia64*-hpux*)
;;
*-openbsd*)
- DLL_SUFFIX=".so.1.0"
+ DLL_SUFFIX=".so.${SO_VERSION}"
+ if test "$SO_VERSION"; then
+ DLL_SUFFIX=".so.$SO_VERSION"
+ else
+ DLL_SUFFIX=".so.1.0"
+ fi
+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -4525,7 +4525,7 @@ if test "$ac_cv_thread_keyword" = yes; then
@@ -4451,7 +4456,7 @@ if test "$ac_cv_thread_keyword" = yes; then
:
;;
*)
@ -28,7 +25,7 @@ $OpenBSD: patch-configure_in,v 1.2 2011/05/03 11:11:37 landry Exp $
;;
esac
fi
@@ -5813,14 +5813,7 @@ dnl ==================================================
@@ -5734,14 +5739,7 @@ dnl ==================================================
# The GNOME component is built if one of
# gnome-vfs, gio, gconf or libnotify is available.

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.3 2011/06/28 22:01:17 landry Exp $
fix for gcc3 archs ?
--- content/events/src/nsContentEventHandler.cpp.orig Thu Mar 3 23:11:22 2011
+++ content/events/src/nsContentEventHandler.cpp Thu Mar 10 15:39:40 2011

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-content_media_nsAudioStream_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- content/media/nsAudioStream.cpp.orig Wed Feb 23 06:53:27 2011
+++ content/media/nsAudioStream.cpp Sat Feb 26 09:25:34 2011
@@ -570,7 +570,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOffset()
$OpenBSD: patch-content_media_nsAudioStream_cpp,v 1.3 2011/06/28 22:01:17 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=651461
--- content/media/nsAudioStream.cpp.orig Fri May 27 18:11:57 2011
+++ content/media/nsAudioStream.cpp Tue May 31 22:11:27 2011
@@ -566,7 +566,7 @@ PRInt64 nsAudioStreamLocal::GetSampleOffset()
#if defined(XP_WIN)
positionType = SA_POSITION_WRITE_HARDWARE;
#endif

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-content_media_webm_nsWebMReader_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-content_media_webm_nsWebMReader_cpp,v 1.3 2011/06/28 22:01:17 landry Exp $
nsWebMReader.cpp:704: error: invalid conversion from 'PRUint64*' to 'uint64_t*'
--- content/media/webm/nsWebMReader.cpp.orig Thu Feb 3 21:11:41 2011
+++ content/media/webm/nsWebMReader.cpp Tue Feb 8 22:37:33 2011
@@ -774,7 +774,7 @@ nsresult nsWebMReader::GetBuffered(nsTimeRanges* aBuff
NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
--- content/media/webm/nsWebMReader.cpp.orig Fri May 27 18:11:57 2011
+++ content/media/webm/nsWebMReader.cpp Tue May 31 22:11:27 2011
@@ -786,7 +786,7 @@ nsresult nsWebMReader::GetBuffered(nsTimeRanges* aBuff
{
nsMediaStream* stream = mDecoder->GetCurrentStream();
- PRUint64 timecodeScale;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-content_xslt_public_txDouble_h,v 1.2 2011/05/03 11:11:37 landry Exp $
--- content/xslt/public/txDouble.h.orig Fri Jan 25 09:02:04 2008
+++ content/xslt/public/txDouble.h Mon Jul 14 01:25:38 2008
@@ -63,7 +63,7 @@ static fp_except_t oldmask = fpsetmask(~allmask);
*/
#if defined(__arm) || defined(__arm32__) || defined(__arm26__) || defined(__arm__)
-#if !defined(__VFP_FP__)
+#if !defined(__VFP_FP__) && !defined(__OpenBSD__) /* Armel ABI */
#define FPU_IS_ARM_FPA
#endif
#endif

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-content_xslt_src_base_txDouble_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
alignment issue on some arch ? been there since ffx3
--- content/xslt/src/base/txDouble.cpp.orig Wed Dec 15 02:02:41 2010
+++ content/xslt/src/base/txDouble.cpp Wed Dec 22 22:50:20 2010

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-extensions_auth_nsAuthGSSAPI_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-extensions_auth_nsAuthGSSAPI_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- extensions/auth/nsAuthGSSAPI.cpp.orig Tue Mar 16 10:54:56 2010
+++ extensions/auth/nsAuthGSSAPI.cpp Sat Mar 27 01:54:27 2010
@@ -159,9 +159,8 @@ gssInit()

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-extensions_pref_system-pref_src_gconf_nsSystemPrefService_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp.orig Wed Jan 6 05:35:15 2010
+++ extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp Sun Jan 10 17:47:26 2010
@@ -544,8 +544,8 @@ struct PrefNamePair {
const char
GConfProxy::sPrefGConfKey[] = "accessibility.unix.gconf2.shared-library";
-const char GConfProxy::sDefaultLibName1[] = "libgconf-2.so.4";
-const char GConfProxy::sDefaultLibName2[] = "libgconf-2.so";
+const char GConfProxy::sDefaultLibName1[] = "libgconf-2.so";
+const char GConfProxy::sDefaultLibName2[] = "libgconf-2.so.4";
#define GCONF_FUNCS_POINTER_BEGIN \
static GConfFuncListType sGConfFuncList[] = {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-extensions_spellcheck_hunspell_src_mozHunspell_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig Tue Jul 13 21:10:13 2010
+++ extensions/spellcheck/hunspell/src/mozHunspell.cpp Wed Jul 21 09:54:44 2010
@@ -63,6 +63,7 @@

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gfx_ots_include_opentype-sanitiser_h,v 1.2 2011/05/03 11:11:37 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=643137
--- gfx/ots/include/opentype-sanitiser.h.orig Thu Mar 24 11:31:50 2011
+++ gfx/ots/include/opentype-sanitiser.h Thu Mar 24 11:32:45 2011
@@ -68,8 +68,10 @@ class OTSStream {
}
while (length >= 4) {
- chksum_ += ntohl(*reinterpret_cast<const uint32_t*>(
- reinterpret_cast<const uint8_t*>(data) + offset));
+ uint32_t tmp;
+ std::memcpy(&tmp, reinterpret_cast<const uint8_t *>(data) + offset,
+ sizeof(uint32_t));
+ chksum_ += ntohl(tmp);
length -= 4;
offset += 4;
}

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-gfx_qcms_qcmstypes_h,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-gfx_qcms_qcmstypes_h,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=651444
--- gfx/qcms/qcmstypes.h.orig Wed Jul 21 02:52:13 2010
+++ gfx/qcms/qcmstypes.h Sun Aug 1 12:35:46 2010
@@ -13,14 +13,6 @@

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gfx_src_thebes_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- gfx/src/thebes/Makefile.in.orig Wed Jul 21 02:52:13 2010
+++ gfx/src/thebes/Makefile.in Sun Aug 1 12:32:32 2010
@@ -131,6 +131,10 @@ DEFINES += -DMOZ_ENABLE_GTK2
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-gfx_thebes_GLContextProviderGLX_cpp,v 1.1 2011/06/28 22:01:18 landry Exp $
Open correct libGL for WebGL
--- gfx/thebes/GLContextProviderGLX.cpp.orig Wed Jun 15 23:57:26 2011
+++ gfx/thebes/GLContextProviderGLX.cpp Wed Jun 22 14:24:23 2011
@@ -102,7 +102,11 @@ GLXLibrary::EnsureInitialized()
// see e.g. bug 608526: it is intrinsically interesting to know whether we have dynamically linked to libGL.so.1
// because at least the NVIDIA implementation requires an executable stack, which causes mprotect calls,
// which trigger glibc bug http://sourceware.org/bugzilla/show_bug.cgi?id=12225
+#ifdef __OpenBSD__
+ const char *libGLfilename = "libGL.so";
+#else
const char *libGLfilename = "libGL.so.1";
+#endif
ScopedGfxFeatureReporter reporter(libGLfilename);
mOGLLibrary = PR_LoadLibrary(libGLfilename);
if (!mOGLLibrary) {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-gfx_thebes_GLContext_h,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-gfx_thebes_GLContext_h,v 1.3 2011/06/28 22:01:18 landry Exp $
Allow to build with --enable-debug
--- gfx/thebes/GLContext.h.orig Thu Feb 3 21:11:48 2011
+++ gfx/thebes/GLContext.h Mon Feb 14 20:41:03 2011

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.1 2011/06/28 22:01:18 landry Exp $
--- gfx/thebes/Makefile.in.orig Tue May 31 22:22:46 2011
+++ gfx/thebes/Makefile.in Tue May 31 22:23:07 2011
@@ -443,6 +443,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
+ifdef MOZ_ENABLE_COREXFONTS
+EXTRA_DSO_LDOPTS += -lpangox-1.0
+endif
+
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-gfx_thebes_gfxTextRunWordCache_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-gfx_thebes_gfxTextRunWordCache_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- gfx/thebes/gfxTextRunWordCache.cpp.orig Thu Feb 3 21:11:48 2011
+++ gfx/thebes/gfxTextRunWordCache.cpp Mon Feb 14 20:41:37 2011
@@ -49,6 +49,10 @@

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-ipc_chromium_Makefile_in,v 1.1 2011/06/28 22:01:18 landry Exp $
http://hg.mozilla.org/mozilla-central/rev/b0df2e9b1489
https://bugzilla.mozilla.org/show_bug.cgi?id=643112
--- ipc/chromium/Makefile.in.orig Wed Jun 22 10:57:12 2011
+++ ipc/chromium/Makefile.in Wed Jun 22 10:58:10 2011
@@ -246,7 +246,6 @@ ifdef OS_LINUX # {
CPPSRCS += \
atomicops_internals_x86_gcc.cc \
base_paths_linux.cc \
- data_pack.cc \
file_util_linux.cc \
file_version_info_linux.cc \
idle_timer_none.cc \

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-ipc_chromium_src_base_atomicops_h,v 1.1 2011/06/28 22:01:18 landry Exp $
../../ipc/chromium/src/base/singleton.h:118: error: invalid conversion from 'base::subtle::AtomicWord*' to 'const volatile base::subtle::Atomic32*'
https://bugzilla.mozilla.org/show_bug.cgi?id=648735
--- ipc/chromium/src/base/atomicops.h.orig Wed Jun 22 10:23:36 2011
+++ ipc/chromium/src/base/atomicops.h Wed Jun 22 10:24:21 2011
@@ -45,7 +45,11 @@ typedef int64 Atomic64;
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
// Atomic64 routines below, depending on your architecture.
+#if defined(OS_OPENBSD) && !defined(ARCH_CPU_64_BITS)
+typedef Atomic32 AtomicWord;
+#else
typedef intptr_t AtomicWord;
+#endif
// Atomically execute:
// result = *ptr;

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-ipc_chromium_src_base_debug_util_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/debug_util_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/debug_util_posix.cc Wed Jun 1 08:48:32 2011
@@ -8,10 +8,12 @@
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
+#include <limits.h>
#include <sys/stat.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <unistd.h>
-#ifndef ANDROID
+#ifdef __GLIBC__
#include <execinfo.h>
#include <sys/sysctl.h>
#endif
@@ -119,7 +121,7 @@ StackTrace::StackTrace() {
const int kMaxCallers = 256;
void* callers[kMaxCallers];
-#ifndef ANDROID
+#ifdef __GLIBC__
int count = backtrace(callers, kMaxCallers);
#else
int count = 0;
@@ -138,7 +140,7 @@ StackTrace::StackTrace() {
void StackTrace::PrintBacktrace() {
fflush(stderr);
-#ifndef ANDROID
+#ifdef __GLIBC__
backtrace_symbols_fd(&trace_[0], trace_.size(), STDERR_FILENO);
#endif
}

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-ipc_chromium_src_base_file_util_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/file_util.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/file_util.h Wed Jun 1 08:48:32 2011
@@ -15,6 +15,7 @@
#elif defined(ANDROID)
#include <sys/stat.h>
#elif defined(OS_POSIX)
+#include <sys/types.h>
#include <fts.h>
#include <sys/stat.h>
#endif

View File

@ -0,0 +1,72 @@
$OpenBSD: patch-ipc_chromium_src_base_file_util_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/file_util_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/file_util_posix.cc Wed Jun 1 08:48:32 2011
@@ -71,8 +71,8 @@ int CountFilesCreatedAfter(const FilePath& path,
(strcmp(ent->d_name, "..") == 0))
continue;
- struct stat64 st;
- int test = stat64(path.Append(ent->d_name).value().c_str(), &st);
+ struct stat st;
+ int test = stat(path.Append(ent->d_name).value().c_str(), &st);
if (test != 0) {
LOG(ERROR) << "stat64 failed: " << strerror(errno);
continue;
@@ -106,8 +106,8 @@ int CountFilesCreatedAfter(const FilePath& path,
// here.
bool Delete(const FilePath& path, bool recursive) {
const char* path_str = path.value().c_str();
- struct stat64 file_info;
- int test = stat64(path_str, &file_info);
+ struct stat file_info;
+ int test = stat(path_str, &file_info);
if (test != 0) {
// The Windows version defines this condition as success.
bool ret = (errno == ENOENT || errno == ENOTDIR);
@@ -286,19 +286,19 @@ bool CopyDirectory(const FilePath& from_path,
}
bool PathExists(const FilePath& path) {
- struct stat64 file_info;
- return (stat64(path.value().c_str(), &file_info) == 0);
+ struct stat file_info;
+ return (stat(path.value().c_str(), &file_info) == 0);
}
bool PathIsWritable(const FilePath& path) {
FilePath test_path(path);
- struct stat64 file_info;
- if (stat64(test_path.value().c_str(), &file_info) != 0) {
+ struct stat file_info;
+ if (stat(test_path.value().c_str(), &file_info) != 0) {
// If the path doesn't exist, test the parent dir.
test_path = test_path.DirName();
// If the parent dir doesn't exist, then return false (the path is not
// directly writable).
- if (stat64(test_path.value().c_str(), &file_info) != 0)
+ if (stat(test_path.value().c_str(), &file_info) != 0)
return false;
}
if (S_IWOTH & file_info.st_mode)
@@ -311,8 +311,8 @@ bool PathIsWritable(const FilePath& path) {
}
bool DirectoryExists(const FilePath& path) {
- struct stat64 file_info;
- if (stat64(path.value().c_str(), &file_info) == 0)
+ struct stat file_info;
+ if (stat(path.value().c_str(), &file_info) == 0)
return S_ISDIR(file_info.st_mode);
return false;
}
@@ -449,8 +449,8 @@ bool CreateDirectory(const FilePath& full_path) {
}
bool GetFileInfo(const FilePath& file_path, FileInfo* results) {
- struct stat64 file_info;
- if (stat64(file_path.value().c_str(), &file_info) != 0)
+ struct stat file_info;
+ if (stat(file_path.value().c_str(), &file_info) != 0)
return false;
results->is_directory = S_ISDIR(file_info.st_mode);
results->size = file_info.st_size;

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-ipc_chromium_src_base_platform_file_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/platform_file_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/platform_file_posix.cc Wed Jun 1 08:48:32 2011
@@ -4,6 +4,9 @@
#include "base/platform_file.h"
+#ifdef __OpenBSD__
+#include <sys/stat.h>
+#endif
#include <fcntl.h>
#include <errno.h>
#ifdef ANDROID

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ipc_chromium_src_base_platform_thread_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/platform_thread_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/platform_thread_posix.cc Wed Jun 1 08:48:32 2011
@@ -33,6 +33,8 @@ PlatformThreadId PlatformThread::CurrentId() {
// into the kernel.
#if defined(OS_MACOSX)
return mach_thread_self();
+#elif defined(__OpenBSD__)
+ return getpid();
#elif defined(OS_LINUX)
return syscall(__NR_gettid);
#endif

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-ipc_chromium_src_base_string_util_posix_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/string_util_posix.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/string_util_posix.h Wed Jun 1 08:48:32 2011
@@ -36,7 +36,12 @@ inline int vsnprintf(char* buffer, size_t size,
inline int vswprintf(wchar_t* buffer, size_t size,
const wchar_t* format, va_list arguments) {
DCHECK(IsWprintfFormatPortable(format));
+#if defined(OS_OPENBSD)
+ // OpenBSD does not have a wide-char equivalent yet
+ return ::vsnprintf((char *)buffer, size, (const char *)format, arguments);
+#else
return ::vswprintf(buffer, size, format, arguments);
+#endif
}
} // namespace base

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg.h Wed Jun 1 08:48:32 2011
@@ -34,7 +34,7 @@
#include "base/third_party/nspr/prcpucfg_win.h"
#elif defined(__APPLE__)
#include "base/third_party/nspr/prcpucfg_mac.h"
-#elif defined(__linux__) || defined(ANDROID)
+#elif defined(__linux__) || defined(ANDROID) || defined(__OpenBSD__)
#include "base/third_party/nspr/prcpucfg_linux.h"
#else
#error Provide a prcpucfg.h appropriate for your platform

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ipc_chromium_src_base_third_party_nspr_prcpucfg_linux_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/third_party/nspr/prcpucfg_linux.h Wed Jun 1 08:48:32 2011
@@ -42,10 +42,6 @@
#define XP_UNIX
#endif
-#ifndef LINUX
-#define LINUX
-#endif
-
#define PR_AF_INET6 10 /* same as AF_INET6 */
#ifdef __powerpc64__

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ipc_chromium_src_base_time_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/base/time_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/base/time_posix.cc Wed Jun 1 08:48:32 2011
@@ -164,7 +164,7 @@ TimeTicks TimeTicks::Now() {
// With numer and denom = 1 (the expected case), the 64-bit absolute time
// reported in nanoseconds is enough to last nearly 585 years.
-#elif defined(OS_POSIX) && \
+#elif defined(__OpenBSD__) || defined(OS_POSIX) && \
defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
struct timespec ts;

View File

@ -0,0 +1,35 @@
$OpenBSD: patch-ipc_chromium_src_build_build_config_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/build/build_config.h.orig Wed Jun 15 02:35:08 2011
+++ ipc/chromium/src/build/build_config.h Wed Jun 22 09:20:26 2011
@@ -19,6 +19,8 @@
#define OS_MACOSX 1
#elif defined(__linux__) || defined(ANDROID)
#define OS_LINUX 1
+#elif defined(__OpenBSD__)
+#define OS_OPENBSD 1
#elif defined(_WIN32)
#define OS_WIN 1
#else
@@ -27,7 +29,7 @@
// For access to standard POSIX features, use OS_POSIX instead of a more
// specific macro.
-#if defined(OS_MACOSX) || defined(OS_LINUX)
+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_OPENBSD)
#define OS_POSIX 1
#endif
@@ -57,9 +59,12 @@
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
#define WCHAR_T_IS_UNSIGNED 1
-#elif defined(__ppc__)
+#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
+#elif defined(__sparc64__)
+#define ARCH_CPU_SPARC 1
+#define ARCH_CPU_64_BITS 1
#else
#error Please add support for your architecture in build/build_config.h
#endif

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_channel_posix_cc,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/chrome/common/ipc_channel_posix.cc.orig Fri May 27 18:12:07 2011
+++ ipc/chromium/src/chrome/common/ipc_channel_posix.cc Wed Jun 1 08:48:32 2011
@@ -12,6 +12,9 @@
#include <sys/stat.h>
#include <sys/un.h>
+// error: variable 'iovec iov' has initializer but incomplete type
+#include <sys/uio.h>
+
#include <string>
#include <map>

View File

@ -0,0 +1,38 @@
$OpenBSD: patch-ipc_chromium_src_chrome_common_ipc_message_utils_h,v 1.1 2011/06/28 22:01:18 landry Exp $
--- ipc/chromium/src/chrome/common/ipc_message_utils.h.orig Wed Jun 15 02:35:08 2011
+++ ipc/chromium/src/chrome/common/ipc_message_utils.h Wed Jun 22 09:08:48 2011
@@ -219,7 +219,33 @@ struct ParamTraits<unsigned long> {
}
};
-#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
+#if defined(OS_OPENBSD) && defined(ARCH_CPU_64_BITS)
+template <>
+struct ParamTraits<unsigned long long> {
+ typedef unsigned long long param_type;
+ static void Write(Message* m, const param_type& p) {
+ m->WriteData(reinterpret_cast<const char*>(&p), sizeof(param_type));
+ }
+ static bool Read(const Message* m, void** iter, param_type* r) {
+ const char *data;
+ int data_size = 0;
+ bool result = m->ReadData(iter, &data, &data_size);
+ if (result && data_size == sizeof(param_type)) {
+ memcpy(r, data, sizeof(param_type));
+ } else {
+ result = false;
+ NOTREACHED();
+ }
+
+ return result;
+ }
+ static void Log(const param_type& p, std::wstring* l) {
+ l->append(StringPrintf(L"%ull", p));
+ }
+};
+#endif
+
+#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
// There size_t is a synonym for |unsigned long| ...
template <>
struct ParamTraits<size_t> {

View File

@ -1,16 +1,13 @@
$OpenBSD: patch-js_src_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
Fix build error on sparc64, we dont want to force-enable assembler/jit
--- js/src/Makefile.in.orig Thu Mar 3 23:11:32 2011
+++ js/src/Makefile.in Sun Mar 13 11:34:19 2011
@@ -914,7 +914,11 @@ endif
# Needed to "configure" it correctly. Unfortunately these
# flags wind up being applied to all code in js/src, not just
# the code in js/src/assembler.
+ifneq (,$(filter-out sparc64,$(TARGET_CPU)))
CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
+else
+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1
+endif
$OpenBSD: patch-js_src_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bug638056.bugzilla.mozilla.org/attachment.cgi?id=520157
--- js/src/Makefile.in.orig Fri May 27 18:12:07 2011
+++ js/src/Makefile.in Tue May 31 22:18:21 2011
@@ -391,7 +391,7 @@ CPPSRCS += checks.cc \
# END enclude sources for V8 dtoa
#############################################
INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \

View File

@ -1,26 +1,20 @@
$OpenBSD: patch-js_src_configure_in,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-js_src_configure_in,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648721
https://bugzilla.mozilla.org/show_bug.cgi?id=650742
https://bugzilla.mozilla.org/show_bug.cgi?id=589754
--- js/src/configure.in.orig Thu Mar 3 23:11:32 2011
+++ js/src/configure.in Sun Mar 13 11:35:50 2011
@@ -1211,7 +1211,7 @@ WIN_TOP_SRC=
MOZ_USER_DIR=".mozilla"
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib -L$(LIBXUL_DIST)/bin'
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
@@ -2582,7 +2582,7 @@ ia64*-hpux*)
--- js/src/configure.in.orig Fri May 27 18:12:08 2011
+++ js/src/configure.in Tue May 31 22:18:21 2011
@@ -2517,7 +2517,8 @@ ia64*-hpux*)
;;
*-openbsd*)
- DLL_SUFFIX=".so.1.0"
+ DLL_SUFFIX=".so.${SO_VERSION}"
+ DLL_SUFFIX='.so.$(if $(SO_VERSION),$(SO_VERSION),1.0)'
+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2956,7 +2956,7 @@ arm*-*)
@@ -2869,7 +2870,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
@ -29,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
ENABLE_TRACEJIT=1
NANOJIT_ARCH=Sparc
AC_DEFINE(JS_CPU_SPARC)
@@ -3025,6 +3025,10 @@ arm*-*)
@@ -2938,6 +2939,10 @@ arm*-*)
sparc-*)
AC_DEFINE(AVMPLUS_SPARC)
;;
@ -40,7 +34,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
esac
case "$target" in
@@ -3039,6 +3043,9 @@ case "$target" in
@@ -2952,6 +2957,9 @@ case "$target" in
AC_DEFINE(AVMPLUS_UNIX)
;;
*-freebsd*|*-kfreebsd*)

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.3 2011/06/28 22:01:18 landry Exp $
--- js/src/ctypes/libffi/configure.orig Wed Aug 18 21:20:57 2010
+++ js/src/ctypes/libffi/configure Sat Sep 4 11:20:37 2010
@@ -11212,7 +11212,7 @@ case "$host" in

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-js_src_ctypes_libffi_src_dlmalloc_c,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-js_src_ctypes_libffi_src_dlmalloc_c,v 1.3 2011/06/28 22:01:18 landry Exp $
--- js/src/ctypes/libffi/src/dlmalloc.c.orig Sun Aug 1 13:16:05 2010
+++ js/src/ctypes/libffi/src/dlmalloc.c Sun Aug 1 13:16:17 2010
@@ -2517,17 +2517,15 @@ static int init_mparams(void) {

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-js_src_ctypes_libffi_src_mips_ffi_c,v 1.1 2011/06/28 22:01:18 landry Exp $
Allow building this on OpenBSD, where we don't provide the ICACHE related
defines in cachectl.h, but in sysarch.h.
--- js/src/ctypes/libffi/src/mips/ffi.c.orig Fri Apr 15 10:03:18 2011
+++ js/src/ctypes/libffi/src/mips/ffi.c Fri Apr 15 10:03:36 2011
@@ -37,7 +37,11 @@
#endif
#ifndef USE__BUILTIN___CLEAR_CACHE
-#include <sys/cachectl.h>
+# if defined(__OpenBSD__)
+# include <mips64/sysarch.h>
+# else
+# include <sys/cachectl.h>
+# endif
#endif
#ifdef FFI_DEBUG

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-js_src_ctypes_libffi_src_mips_ffitarget_h,v 1.1 2011/06/28 22:01:18 landry Exp $
There's no sgidefs on OpenBSD, so don't bother including it.
--- js/src/ctypes/libffi/src/mips/ffitarget.h.orig Fri Apr 15 10:03:48 2011
+++ js/src/ctypes/libffi/src/mips/ffitarget.h Fri Apr 15 10:04:04 2011
@@ -29,7 +29,7 @@
#ifdef linux
# include <asm/sgidefs.h>
-#else
+#elif !defined(__OpenBSD__)
# include <sgidefs.h>
#endif
# ifndef _ABIN32

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-js_src_jsnativestack_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-js_src_jsnativestack_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=634609
--- js/src/jsnativestack.cpp.orig Thu Nov 4 21:05:49 2010
+++ js/src/jsnativestack.cpp Sat Nov 13 11:56:34 2010
--- js/src/jsnativestack.cpp.orig Fri May 27 18:12:08 2011
+++ js/src/jsnativestack.cpp Tue May 31 22:18:21 2011
@@ -50,7 +50,7 @@
#elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX)
# include <pthread.h>
@ -11,34 +11,3 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=634609
# include <pthread_np.h>
# endif
@@ -198,24 +198,21 @@ GetNativeStackBaseImpl()
pthread_attr_init(&sattr);
# if defined(PTHREAD_NP_H) || defined(_PTHREAD_NP_H_) || defined(NETBSD)
/* e.g. on FreeBSD 4.8 or newer, neundorf@kde.org */
- pthread_attr_get_np(thread, &sattr);
# else
/*
* FIXME: this function is non-portable;
* other POSIX systems may have different np alternatives
*/
- pthread_getattr_np(thread, &sattr);
# endif
void *stackBase = 0;
size_t stackSize = 0;
-# ifdef DEBUG
- int rc =
-# endif
- pthread_attr_getstack(&sattr, &stackBase, &stackSize);
- JS_ASSERT(!rc);
- JS_ASSERT(stackBase);
- pthread_attr_destroy(&sattr);
+ stack_t ss;
+ int rslt;
+
+ rslt = pthread_stackseg_np(pthread_self(), &ss);
+ stackBase = (void*)((size_t)ss.ss_sp - ss.ss_size);
+ stackSize = ss.ss_size;
# if JS_STACK_GROWTH_DIRECTION > 0
return stackBase;

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-js_src_jsnum_h,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-js_src_jsnum_h,v 1.3 2011/06/28 22:01:18 landry Exp $
--- js/src/jsnum.h.orig Fri Aug 6 03:09:08 2010
+++ js/src/jsnum.h Sun Aug 15 14:08:46 2010
@@ -68,7 +68,7 @@

View File

@ -1,17 +1,8 @@
$OpenBSD: patch-js_src_jsval_h,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-js_src_jsval_h,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=599764
https://bugzilla.mozilla.org/show_bug.cgi?id=618485
--- js/src/jsval.h.orig Thu Feb 3 21:11:50 2011
+++ js/src/jsval.h Thu Feb 17 20:36:07 2011
@@ -347,6 +347,7 @@ typedef union jsval_layout
int32 i32;
uint32 u32;
JSWhyMagic why;
+ jsuword word;
} payload;
} s;
double asDouble;
@@ -815,7 +816,7 @@ extern "C++"
--- js/src/jsval.h.orig Fri Jun 3 10:44:49 2011
+++ js/src/jsval.h Fri Jun 3 10:45:23 2011
@@ -823,7 +823,7 @@ extern "C++"
#else /* defined(JS_USE_JSVAL_JSID_STRUCT_TYPES) */
/* Use different primitive types so overloading works. */

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-js_src_nanojit_NativeSparc_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-js_src_nanojit_NativeSparc_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- js/src/nanojit/NativeSparc.cpp.orig Thu Nov 4 21:05:50 2010
+++ js/src/nanojit/NativeSparc.cpp Sat Nov 13 11:56:34 2010
@@ -39,6 +39,7 @@

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- js/src/xpconnect/shell/Makefile.in.orig Wed Aug 18 21:21:00 2010
+++ js/src/xpconnect/shell/Makefile.in Sat Sep 4 11:20:50 2010
@@ -54,6 +54,8 @@ CMMSRCS += xpcshellMacUtils.mm
endif
LIBS = \
+ -Wl,-rpath-link,${LOCALBASE}/lib \
+ -Wl,-rpath-link,${X11BASE}/lib \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(LIBXUL_LIBS) \
$(XPCOM_LIBS) \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- js/src/xpconnect/src/Makefile.in.orig Sat Jan 22 01:26:05 2011
+++ js/src/xpconnect/src/Makefile.in Fri Jan 28 12:58:33 2011
@@ -212,6 +212,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
--- js/src/xpconnect/src/Makefile.in.orig Fri May 27 18:12:14 2011
+++ js/src/xpconnect/src/Makefile.in Tue May 31 22:18:25 2011
@@ -207,6 +207,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
--makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
$(ENABLE_TRACEABLE_FLAGS) \
$(srcdir)/dom_quickstubs.qsconf

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-layout_build_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- layout/build/Makefile.in.orig Tue Jan 11 04:26:19 2011
+++ layout/build/Makefile.in Sat Jan 15 01:03:20 2011
@@ -294,6 +294,10 @@ ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS)
endif
+# Sydney audio sndio backend.
+EXTRA_DSO_LDOPTS += -lsndio \
+ $(NULL)
+
ifdef MOZ_SYDNEYAUDIO
$OpenBSD: patch-layout_build_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- layout/build/Makefile.in.orig Fri May 27 18:12:15 2011
+++ layout/build/Makefile.in Tue May 31 22:18:25 2011
@@ -285,6 +285,9 @@ ifdef MOZ_SYDNEYAUDIO
ifeq ($(OS_ARCH),Linux)
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif
+ifeq ($(OS_ARCH),OpenBSD)
+EXTRA_DSO_LDOPTS += -lsndio
+endif
ifeq ($(OS_ARCH),Darwin)
OS_LIBS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon -framework IOKit
endif

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-media_libsydneyaudio_include_sydney_audio_h,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-media_libsydneyaudio_include_sydney_audio_h,v 1.3 2011/06/28 22:01:18 landry Exp $
--- media/libsydneyaudio/include/sydney_audio.h.orig Wed Jul 15 18:35:02 2009
+++ media/libsydneyaudio/include/sydney_audio.h Tue Jul 21 14:54:57 2009
@@ -48,7 +48,7 @@ async-signal safe.

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- media/libsydneyaudio/src/Makefile.in.orig Wed Jul 21 02:52:30 2010
+++ media/libsydneyaudio/src/Makefile.in Sun Aug 1 12:58:33 2010
@@ -93,6 +93,12 @@ CSRCS = \

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-memory_mozalloc_mozalloc_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-memory_mozalloc_mozalloc_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- memory/mozalloc/mozalloc.cpp.orig Thu Aug 5 21:51:32 2010
+++ memory/mozalloc/mozalloc.cpp Thu Aug 5 21:53:09 2010
@@ -43,6 +43,7 @@

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-modules_libpr0n_decoders_icon_gtk_nsIconChannel_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp.orig Wed Feb 23 06:53:46 2011
+++ modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp Sat Feb 26 09:25:36 2011
@@ -187,7 +187,7 @@ ensure_libgnomeui()

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-modules_plugin_base_src_nsPluginNativeWindowGtk2_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp.orig Wed Jul 21 02:52:34 2010
+++ modules/plugin/base/src/nsPluginNativeWindowGtk2.cpp Sun Aug 1 12:58:33 2010
@@ -365,7 +365,7 @@ nsresult nsPluginNativeWindowGtk2::CreateXCompositedWi
* ensures that those functions stay around even after flash is gone. */
static void *libplayback_handle;
if (!libplayback_handle) {
- libplayback_handle = dlopen("libplayback-1.so.0", RTLD_NOW);
+ libplayback_handle = dlopen("libplayback-1.so", RTLD_NOW);
}
}

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-modules_plugin_base_src_nsPluginsDirUnix_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- modules/plugin/base/src/nsPluginsDirUnix.cpp.orig Wed Jan 6 05:35:28 2010
+++ modules/plugin/base/src/nsPluginsDirUnix.cpp Sun Jan 10 17:47:27 2010
@@ -142,7 +142,7 @@ static PRBool LoadExtraSharedLib(const char *name, cha
#endif
/*
this function looks for
- user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so.6:libXext.so");
+ user_pref("plugin.soname.list", "/usr/X11R6/lib/libXt.so:libXext.so");
in user's pref.js
and loads all libs in specified order
*/

View File

@ -1,8 +0,0 @@
$OpenBSD: patch-other-licenses_branding_firefox_locales_browserconfig_properties,v 1.2 2011/05/03 11:11:37 landry Exp $
--- other-licenses/branding/firefox/locales/browserconfig.properties.orig Sat Jan 15 01:07:21 2011
+++ other-licenses/branding/firefox/locales/browserconfig.properties Sat Jan 15 01:07:44 2011
@@ -1,2 +1,3 @@
# Do NOT localize or otherwise change these values
-browser.startup.homepage=about:home
+browser.startup.homepage=about:blank
+browser.startup.homepage_reset=about:blank

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-other-licenses_branding_firefox_pref_firefox-branding_js,v 1.2 2011/05/03 11:11:37 landry Exp $
--- other-licenses/branding/firefox/pref/firefox-branding.js.orig Wed Dec 15 02:03:34 2010
+++ other-licenses/branding/firefox/pref/firefox-branding.js Wed Dec 22 22:33:03 2010
@@ -1,6 +1,6 @@
pref("startup.homepage_override_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
-pref("startup.homepage_welcome_url","http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
-pref("browser.panorama.welcome_url", "http://www.mozilla.com/firefox/panorama/");
+pref("startup.homepage_override_url","about:blank");
+pref("startup.homepage_welcome_url","about:blank");
// Interval: Time between checks for a new version (in seconds)
// nightly=6 hours, official=24 hours
pref("app.update.interval", 86400);

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-parser_html_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-parser_html_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
gcc runs out of memory with optimization.

View File

@ -1,25 +0,0 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.2 2011/05/03 11:11:37 landry Exp $
--- security/coreconf/OpenBSD.mk.orig Tue Mar 16 10:57:06 2010
+++ security/coreconf/OpenBSD.mk Sat Mar 27 16:34:28 2010
@@ -56,7 +56,7 @@ OS_LIBS += -pthread
DSO_LDOPTS += -pthread
endif
-DLL_SUFFIX = so.1.0
+DLL_SUFFIX = so.${SO_VERSION}
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -Wno-switch -pipe -DOPENBSD
@@ -64,10 +64,10 @@ OS_LIBS =
ARCH = openbsd
-DSO_CFLAGS = -fPIC -DPIC
+DSO_CFLAGS = -I${LOCALBASE}/include -DRAND_DEV=\"/dev/arandom\" -fPIC -DPIC
DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
USE_SYSTEM_ZLIB = 1
ZLIB_LIBS = -lz

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-security_coreconf_UNIX_mk,v 1.2 2011/05/03 11:11:37 landry Exp $
--- security/coreconf/UNIX.mk.orig Wed Jun 17 07:22:08 2009
+++ security/coreconf/UNIX.mk Sun Jun 21 17:58:10 2009
@@ -42,7 +42,7 @@ AR = ar cr $@
LDOPTS += -L$(SOURCE_LIB_DIR)
ifdef BUILD_OPT
- OPTIMIZER += -O
+ OPTIMIZER +=
DEFINES += -UDEBUG -DNDEBUG
else
OPTIMIZER += -g

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-security_manager_pki_resources_content_exceptionDialog_js,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-security_manager_pki_resources_content_exceptionDialog_js,v 1.3 2011/06/28 22:01:18 landry Exp $
Focus the 'add exception' button in the unknown ssl cert warning window
--- security/manager/pki/resources/content/exceptionDialog.js.orig Wed Jul 21 02:52:39 2010
+++ security/manager/pki/resources/content/exceptionDialog.js Sun Aug 1 12:58:33 2010
@@ -283,6 +283,7 @@ function updateCertStatus() {

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- security/manager/ssl/src/Makefile.in.orig Thu Nov 4 21:06:46 2010
+++ security/manager/ssl/src/Makefile.in Sat Nov 13 11:56:36 2010
@@ -118,7 +118,10 @@ CSRCS += md4.c
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
--- security/manager/ssl/src/Makefile.in.orig Fri May 27 18:12:40 2011
+++ security/manager/ssl/src/Makefile.in Tue May 31 22:18:26 2011
@@ -115,7 +115,10 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Wed Dec 15 02:03:34 2010
+++ security/manager/ssl/src/nsNSSComponent.cpp Wed Dec 22 22:33:04 2010
@@ -855,11 +855,10 @@ nsNSSComponent::InstallLoadableRoots()
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Fri May 27 18:12:40 2011
+++ security/manager/ssl/src/nsNSSComponent.cpp Tue May 31 22:18:26 2011
@@ -846,11 +846,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
const char *possible_ckbi_locations[] = {
@ -16,7 +16,7 @@ $OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.2 2011/05/03 11:
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -868,7 +867,7 @@ nsNSSComponent::InstallLoadableRoots()
@@ -859,7 +858,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.3 2011/06/28 22:01:18 landry Exp $
Fix libnss3 opening
--- services/crypto/modules/WeaveCrypto.js.orig Fri Mar 18 20:07:29 2011
+++ services/crypto/modules/WeaveCrypto.js Thu Mar 31 23:04:26 2011
--- services/crypto/modules/WeaveCrypto.js.orig Fri May 27 18:12:42 2011
+++ services/crypto/modules/WeaveCrypto.js Tue May 31 22:18:26 2011
@@ -151,20 +151,19 @@ WeaveCrypto.prototype = {
Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);

View File

@ -1,8 +1,9 @@
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
set secure_delete PRAGMA on by default, instead of using internal sqlite copy
--- storage/src/mozStorageConnection.cpp.orig Sat Mar 19 16:21:29 2011
+++ storage/src/mozStorageConnection.cpp Sat Mar 19 16:22:05 2011
@@ -464,6 +464,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
https://bugzilla.mozilla.org/show_bug.cgi?id=546162
--- storage/src/mozStorageConnection.cpp.orig Fri May 27 18:12:44 2011
+++ storage/src/mozStorageConnection.cpp Tue May 31 22:18:26 2011
@@ -558,6 +558,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- toolkit/components/downloads/src/nsDownloadManager.cpp.orig Tue Jan 11 04:27:36 2011
+++ toolkit/components/downloads/src/nsDownloadManager.cpp Sat Jan 15 01:03:06 2011
@@ -1166,7 +1166,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.1 2011/06/28 22:01:18 landry Exp $
--- toolkit/components/downloads/nsDownloadManager.cpp.orig Fri May 27 18:12:45 2011
+++ toolkit/components/downloads/nsDownloadManager.cpp Tue May 31 22:21:34 2011
@@ -1170,7 +1170,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
rv = downloadDir->Exists(&exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_components_downloads_src_nsDownloadManager_cpp,v 1.2 201
NS_ENSURE_SUCCESS(rv, rv);
}
}
@@ -1274,7 +1274,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
@@ -1278,7 +1278,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
(void)customDirectory->Exists(&exists);
if (!exists) {

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
--- toolkit/crashreporter/client/crashreporter_linux.cpp.orig Wed Feb 23 06:53:51 2011
+++ toolkit/crashreporter/client/crashreporter_linux.cpp Sat Feb 26 09:25:37 2011
@@ -364,11 +364,11 @@ typedef const GnomeModuleInfo * (*_libgnomeui_module_i

View File

@ -1,16 +1,30 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- toolkit/library/Makefile.in.orig Sat Apr 16 00:16:27 2011
+++ toolkit/library/Makefile.in Tue May 3 11:04:01 2011
@@ -283,6 +283,12 @@ ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
https://bugzilla.mozilla.org/show_bug.cgi?id=648730
--- toolkit/library/Makefile.in.orig Fri May 27 18:12:47 2011
+++ toolkit/library/Makefile.in Tue May 31 22:18:40 2011
@@ -158,6 +158,12 @@ OS_LIBS += \
$(NULL)
endif
+# GTK2 widget and Sydney audio sndio backends.
+ifeq ($(OS_ARCH),OpenBSD)
+ifdef MOZ_SYDNEYAUDIO
+EXTRA_DSO_LDOPTS += -lsndio
+endif
+endif
+
ifeq ($(OS_ARCH),Darwin)
ifdef MOZ_SYDNEYAUDIO
EXTRA_DSO_LDOPTS += \
@@ -251,6 +257,11 @@ export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UT
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
+endif
+
+ifeq ($(OS_ARCH),OpenBSD)
+# Needed by nsAuthGSSAPI
+EXTRA_DSO_LDOPTS += -lkrb5 -lcrypto
+
+OS_LIBS += -lkrb5 -lcrypto
endif
ifdef MOZ_JAVAXPCOM
dlldeps-javaxpcom.cpp: $(topsrcdir)/extensions/java/xpcom/src/dlldeps-javaxpcom.cpp
$(INSTALL) $^ .

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.3 2011/06/28 22:01:18 landry Exp $
Ensure systemwide nss is taken
Ensure local libjs is taken (build failure when spidermonkey is installed,
its libjs_static.a is found first in lib search path)
https://bugzilla.mozilla.org/show_bug.cgi?id=646375
--- toolkit/library/libxul-config.mk.orig Sat Mar 19 00:34:11 2011
+++ toolkit/library/libxul-config.mk Wed Mar 30 10:17:13 2011
@@ -365,13 +365,14 @@ EXTRA_DSO_LDOPTS += \
--- toolkit/library/libxul-config.mk.orig Fri May 27 18:12:47 2011
+++ toolkit/library/libxul-config.mk Tue May 31 22:18:40 2011
@@ -340,13 +340,14 @@ EXTRA_DSO_LDOPTS += \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(QCMS_LIBS) \

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.3 2011/06/28 22:01:18 landry Exp $
install headers/idl/sdk libs only if xulrunner
--- toolkit/mozapps/installer/packager.mk.orig Sat Apr 16 00:16:28 2011
+++ toolkit/mozapps/installer/packager.mk Tue May 3 11:03:58 2011
@@ -630,7 +630,7 @@ endif
--- toolkit/mozapps/installer/packager.mk.orig Fri May 27 18:12:54 2011
+++ toolkit/mozapps/installer/packager.mk Tue May 31 22:18:40 2011
@@ -718,7 +718,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)

View File

@ -1,4 +1,6 @@
$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- toolkit/xre/nsNativeAppSupportUnix.cpp.orig Wed Jul 21 02:53:08 2010
+++ toolkit/xre/nsNativeAppSupportUnix.cpp Sun Aug 1 12:58:34 2010
@@ -496,11 +496,11 @@ nsNativeAppSupportUnix::Start(PRBool *aRetVal)

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- toolkit/xre/nsXREDirProvider.cpp.orig Wed Feb 23 06:53:53 2011
+++ toolkit/xre/nsXREDirProvider.cpp Sat Feb 26 09:25:37 2011
@@ -1169,11 +1169,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
Look for extensions in LOCALBASE
--- toolkit/xre/nsXREDirProvider.cpp.orig Fri May 27 18:12:58 2011
+++ toolkit/xre/nsXREDirProvider.cpp Tue May 31 22:18:40 2011
@@ -1154,11 +1154,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

View File

@ -1,12 +1,16 @@
$OpenBSD: patch-widget_src_gtk2_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- widget/src/gtk2/Makefile.in.orig Wed Jul 21 02:53:08 2010
+++ widget/src/gtk2/Makefile.in Sun Aug 1 12:58:34 2010
@@ -53,6 +53,8 @@ LIBXUL_LIBRARY = 1
$OpenBSD: patch-widget_src_gtk2_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- widget/src/gtk2/Makefile.in.orig Sat Mar 19 00:34:13 2011
+++ widget/src/gtk2/Makefile.in Sat Apr 9 10:49:11 2011
@@ -53,6 +53,11 @@ LIBXUL_LIBRARY = 1
NATIVE_THEME_SUPPORT = 1
+# GTK2 widget sndio backend.
+ifeq ($(OS_ARCH),OpenBSD)
+ifdef MOZ_SYDNEYAUDIO
+EXTRA_DSO_LDOPTS += -lsndio
+endif
+endif
CSRCS = \
mozcontainer.c \

View File

@ -1,4 +1,6 @@
$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- widget/src/gtk2/nsBidiKeyboard.cpp.orig Thu Mar 5 23:32:52 2009
+++ widget/src/gtk2/nsBidiKeyboard.cpp Fri Mar 13 17:26:18 2009
@@ -55,10 +55,10 @@ nsBidiKeyboard::nsBidiKeyboard()

View File

@ -1,4 +1,6 @@
$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- widget/src/gtk2/nsIdleServiceGTK.cpp.orig Wed Jul 21 02:53:08 2010
+++ widget/src/gtk2/nsIdleServiceGTK.cpp Sun Aug 1 12:58:34 2010
@@ -67,7 +67,7 @@ NS_IMPL_ISUPPORTS2(nsIdleServiceGTK, nsIdleService, ns

View File

@ -1,4 +1,6 @@
$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- widget/src/gtk2/nsScreenManagerGtk.cpp.orig Wed Jun 17 07:22:21 2009
+++ widget/src/gtk2/nsScreenManagerGtk.cpp Sat Jun 20 22:09:11 2009
@@ -174,7 +174,7 @@ nsScreenManagerGtk :: Init()

View File

@ -1,4 +1,6 @@
$OpenBSD: patch-widget_src_qt_nsIdleServiceQt_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-widget_src_qt_nsIdleServiceQt_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- widget/src/qt/nsIdleServiceQt.cpp.orig Thu Nov 4 21:06:58 2010
+++ widget/src/qt/nsIdleServiceQt.cpp Sat Nov 13 11:56:38 2010
@@ -77,7 +77,7 @@ static void Initialize()

View File

@ -1,4 +1,6 @@
$OpenBSD: patch-widget_src_qt_nsSound_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-widget_src_qt_nsSound_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
https://bugzilla.mozilla.org/show_bug.cgi?id=650772
--- widget/src/qt/nsSound.cpp.orig Wed Jul 21 02:53:09 2010
+++ widget/src/qt/nsSound.cpp Sun Aug 1 13:00:45 2010
@@ -123,7 +123,7 @@ nsSound::Init()

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-widget_src_xpwidgets_nsPrintSettingsImpl_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-widget_src_xpwidgets_nsPrintSettingsImpl_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- widget/src/xpwidgets/nsPrintSettingsImpl.cpp.orig Wed Jul 21 02:53:09 2010
+++ widget/src/xpwidgets/nsPrintSettingsImpl.cpp Sun Aug 1 12:58:34 2010
@@ -61,7 +61,7 @@ nsPrintSettings::nsPrintSettings() :

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
OBSD specific patch
--- xpcom/base/nsStackWalk.cpp.orig Wed Dec 15 02:03:41 2010
+++ xpcom/base/nsStackWalk.cpp Wed Dec 22 22:33:05 2010
@@ -1236,7 +1236,7 @@ myinit()

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xpcom_io_SpecialSystemDirectory_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- xpcom/io/SpecialSystemDirectory.cpp.orig Tue Jan 11 04:27:51 2011
+++ xpcom/io/SpecialSystemDirectory.cpp Sat Jan 15 01:03:08 2011
@@ -522,7 +522,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
$OpenBSD: patch-xpcom_io_SpecialSystemDirectory_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
--- xpcom/io/SpecialSystemDirectory.cpp.orig Fri May 27 18:12:59 2011
+++ xpcom/io/SpecialSystemDirectory.cpp Tue May 31 22:18:41 2011
@@ -485,7 +485,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
if (NS_FAILED(rv))
return rv;
if (!exists) {

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-xpcom_io_nsAppFileLocationProvider_cpp,v 1.2 2011/05/03 11:11:37 landry Exp $
--- xpcom/io/nsAppFileLocationProvider.cpp.orig Wed Jul 21 02:53:09 2010
+++ xpcom/io/nsAppFileLocationProvider.cpp Sun Aug 1 12:58:35 2010
@@ -238,12 +238,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, P
$OpenBSD: patch-xpcom_io_nsAppFileLocationProvider_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
Lookup for plugins in LOCALBASE
--- xpcom/io/nsAppFileLocationProvider.cpp.orig Fri May 27 18:12:59 2011
+++ xpcom/io/nsAppFileLocationProvider.cpp Tue May 31 22:18:41 2011
@@ -234,12 +234,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, P
}
#ifdef XP_UNIX
else if (nsCRT::strcmp(prop, NS_SYSTEM_PLUGINS_DIR) == 0) {

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Wed Dec 15 02:03:42 2010
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Wed Dec 22 22:33:05 2010
@@ -231,7 +231,7 @@ endif
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749
--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Fri May 27 18:13:00 2011
+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Tue May 31 22:18:41 2011
@@ -219,7 +219,7 @@ endif
#
# OpenBSD/ARM
#
@ -10,7 +11,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.2 2011/05/03 1
CPPSRCS := xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp
endif
@@ -382,6 +382,7 @@ endif
@@ -370,6 +370,7 @@ endif
ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDpowerpc)
CPPSRCS := xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp
ASFILES := xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=650749
--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s.orig Sun Dec 23 01:57:11 2007
+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s Sun Sep 14 22:24:42 2008
@@ -1,43 +1,43 @@

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=650749
--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s.orig Sun Dec 23 01:57:11 2007
+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s Sun Sep 14 22:21:55 2008
@@ -1,43 +1,43 @@

View File

@ -1,11 +1,17 @@
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- xulrunner/app/Makefile.in.orig Wed Dec 15 02:03:42 2010
+++ xulrunner/app/Makefile.in Wed Dec 22 22:33:06 2010
@@ -108,6 +108,7 @@ endif
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
--- xulrunner/app/Makefile.in.orig Fri May 27 18:13:00 2011
+++ xulrunner/app/Makefile.in Tue May 31 22:18:41 2011
@@ -87,6 +87,12 @@ EXTRA_DSO_LIBS += xul
endif
endif
+ifeq ($(OS_ARCH),OpenBSD)
+ifdef MOZ_SYDNEYAUDIO
+LIBS += -lsndio
+endif
+endif
+
LIBS += \
$(EXTRA_DSO_LIBS) \
$(MOZ_JS_LIBS) \
+ -lsndio \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(EXTRA_DSO_LIBS) \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-xulrunner_installer_libxul-embedding_pc_in,v 1.2 2011/05/03 11:11:37 landry Exp $
$OpenBSD: patch-xulrunner_installer_libxul-embedding_pc_in,v 1.3 2011/06/28 22:01:18 landry Exp $
no libdl on OpenBSD
--- xulrunner/installer/libxul-embedding.pc.in.orig Sun Feb 20 21:50:47 2011
+++ xulrunner/installer/libxul-embedding.pc.in Sun Feb 20 21:50:52 2011

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/05/03 11:11:37 landry Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/06/28 22:01:18 landry Exp $
bin/${MOZILLA_PROJECT}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini
@ -46,6 +46,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/contentSecurityPolicy.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/crypto-SDR.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/interfaces.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/jsconsole-clhandler.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/messageWakeupService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/mobile.xpt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsBadCertHandler.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsBlocklistService.js
@ -105,6 +106,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/AddonUpdateChecker.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/CSPUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/CertUtils.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/CommonDialog.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/Dict.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/DownloadLastDir.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/DownloadPaths.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/DownloadUtils.jsm
@ -163,14 +165,15 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/utils.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/video.jsm
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/mozilla-xremote-client
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/platform.ini
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/plugin-container
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/precomplete
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/removed-files
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/EditorOverride.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/contenteditable.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/designmode.css
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/dtd/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/dtd/mathml.dtd
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/dtd/xhtml11.dtd
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/dtd/htmlmathml-f.ent
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/entityTables/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/entityTables/html40Latin1.properties
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/res/entityTables/html40Special.properties