landry 2011-04-19 09:16:33 +00:00
parent 0722051832
commit d135da184a
16 changed files with 94 additions and 35 deletions

View File

@ -1,26 +1,20 @@
$OpenBSD: patch-js_src_configure_in,v 1.3 2011/04/05 09:00:42 landry Exp $
$OpenBSD: patch-js_src_configure_in,v 1.4 2011/04/19 09:16:33 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 Sat Mar 19 00:33:47 2011
+++ js/src/configure.in Sun Apr 17 23:31:47 2011
@@ -2582,7 +2582,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*-*)
@@ -2956,7 +2957,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*-*)
@@ -3025,6 +3026,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
@@ -3039,6 +3044,9 @@ case "$target" in
AC_DEFINE(AVMPLUS_UNIX)
;;
*-freebsd*|*-kfreebsd*)

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.3 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.4 2011/04/19 09:16:33 landry Exp $
set secure_delete PRAGMA on by default, instead of using internal sqlite copy
https://bugzilla.mozilla.org/show_bug.cgi?id=546162
--- 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,

View File

@ -0,0 +1,51 @@
$OpenBSD: patch-toolkit_components_startup_src_nsAppStartup_cpp,v 1.1 2011/04/19 09:16:33 landry Exp $
https://bugzilla.mozilla.org/show_bug.cgi?id=633193
http://hg.mozilla.org/projects/cedar/rev/c5fcc4d54945
--- toolkit/components/startup/src/nsAppStartup.cpp.orig Thu Feb 3 21:12:14 2011
+++ toolkit/components/startup/src/nsAppStartup.cpp Thu Feb 10 16:19:26 2011
@@ -26,6 +26,7 @@
* Benjamin Smedberg <bsmedberg@covad.net>
* Daniel Brooks <db48x@db48x.net>
* Taras Glek <tglek@mozilla.com>
+ * Landry Breuil <landry@openbsd.org>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -90,6 +91,11 @@
#include <sys/sysctl.h>
#endif
+#ifdef __OpenBSD__
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
+
static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
#ifdef MOZ_ENABLE_LIBXUL
extern PRTime gXRE_mainTimestamp;
@@ -641,6 +647,25 @@ CalculateProcessCreationTimestamp()
}
PRTime starttime = static_cast<PRTime>(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC;
starttime += proc->kp_proc.p_un.__p_starttime.tv_usec;
+ free(proc);
+ return starttime;
+}
+#elif defined(__OpenBSD__)
+static PRTime
+CalculateProcessCreationTimestamp()
+{
+ int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 };
+ size_t buffer_size;
+ if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0))
+ return 0;
+
+ struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size);
+ if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) {
+ free(proc);
+ return 0;
+ }
+ PRTime starttime = static_cast<PRTime>(proc->p_ustart_sec) * PR_USEC_PER_SEC;
+ starttime += proc->p_ustart_usec;
free(proc);
return starttime;
}

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.4 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-toolkit_crashreporter_client_crashreporter_linux_cpp,v 1.5 2011/04/19 09:16:33 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,4 +1,5 @@
$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.4 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-toolkit_xre_nsNativeAppSupportUnix_cpp,v 1.5 2011/04/19 09:16:33 landry Exp $
OBSD specific patch
--- 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,6 +1,7 @@
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.4 2011/03/30 21:39:14 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
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.5 2011/04/19 09:16:33 landry Exp $
Look for extensions in LOCALBASE
--- toolkit/xre/nsXREDirProvider.cpp.orig Sat Mar 19 00:34:12 2011
+++ toolkit/xre/nsXREDirProvider.cpp Sun Apr 17 23:36:19 2011
@@ -1169,11 +1169,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
$OpenBSD: patch-widget_src_gtk2_nsBidiKeyboard_cpp,v 1.3 2011/04/19 09:16:33 landry Exp $
OBSD specific patch
--- 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,5 @@
$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.3 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-widget_src_gtk2_nsIdleServiceGTK_cpp,v 1.4 2011/04/19 09:16:33 landry Exp $
OBSD specific patch
--- 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,5 @@
$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.2 2010/04/26 19:55:58 landry Exp $
$OpenBSD: patch-widget_src_gtk2_nsScreenManagerGtk_cpp,v 1.3 2011/04/19 09:16:33 landry Exp $
OBSD specific patch
--- 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,5 @@
$OpenBSD: patch-widget_src_qt_nsIdleServiceQt_cpp,v 1.2 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-widget_src_qt_nsIdleServiceQt_cpp,v 1.3 2011/04/19 09:16:33 landry Exp $
OBSD specific patch
--- 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,5 @@
$OpenBSD: patch-widget_src_qt_nsSound_cpp,v 1.2 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-widget_src_qt_nsSound_cpp,v 1.3 2011/04/19 09:16:33 landry Exp $
OBSD specific patch
--- 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,5 @@
$OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.3 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-xpcom_base_nsStackWalk_cpp,v 1.4 2011/04/19 09:16:33 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,6 +1,7 @@
$OpenBSD: patch-xpcom_io_nsAppFileLocationProvider_cpp,v 1.2 2011/03/30 21:39:14 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
$OpenBSD: patch-xpcom_io_nsAppFileLocationProvider_cpp,v 1.3 2011/04/19 09:16:33 landry Exp $
Lookup for plugins in LOCALBASE
--- xpcom/io/nsAppFileLocationProvider.cpp.orig Sat Mar 19 00:34:13 2011
+++ xpcom/io/nsAppFileLocationProvider.cpp Sun Apr 17 23:36:19 2011
@@ -238,12 +238,7 @@ nsAppFileLocationProvider::GetFile(const char *prop, P
}
#ifdef XP_UNIX

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.12 2011/03/30 21:39:14 landry Exp $
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.13 2011/04/19 09:16:33 landry Exp $
chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749
--- 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

View File

@ -1,4 +1,5 @@
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.2 2010/04/26 19:55:58 landry Exp $
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.3 2011/04/19 09:16:33 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 2010/04/26 19:55:58 landry Exp $
$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.3 2011/04/19 09:16:33 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 @@