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

Update to fennec/firefox mobile 6.0.

Browse Source 
Remove patches merged upstream.
This commit is contained in:
landry 2011-08-23 20:55:53 +00:00
parent aeb4e6206d
commit 9395b3e04c
34 changed files with 118 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/fennec/Makefile
View File

@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.9 2011/08/23 08:38:13 landry Exp $
# $OpenBSD: Makefile,v 1.10 2011/08/23 20:55:53 landry Exp $
COMMENT = Mozilla mobile web browser
MOZILLA_VERSION = 5.0
MOZILLA_BRANCH = mobile-${MOZILLA_VERSION}
MOZILLA_VERSION = 6.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = fennec
MOZILLA_CODENAME = mobile
REVISION = 0
SO_VERSION = 1.0
NSS_SO_VERSION = 27.0
SO_VERSION = 2.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = mozalloc xpcom xul

10
www/fennec/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (mozilla/fennec-6.0.source.tar.bz2) = TLWX0ItrVu2JQanhhUn4Hg==
RMD160 (mozilla/fennec-6.0.source.tar.bz2) = HuPgzco0UFB/X5wTruRZ7IejY8U=
SHA1 (mozilla/fennec-6.0.source.tar.bz2) = MoEl+q9y4jgGHWIwhJTKlj9up+w=
SHA256 (mozilla/fennec-6.0.source.tar.bz2) = G5OC/6O56skuhXlNiSuqEl7CLYoOkpZP/0r+Vh++cLY=
SIZE (mozilla/fennec-6.0.source.tar.bz2) = 67919463

18
www/fennec/patches/patch-browser_app_profile_firefox_js
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-browser_app_profile_firefox_js,v 1.4 2011/08/23 20:55:53 landry Exp $
--- browser/app/profile/firefox.js.orig Fri Aug 12 01:28:57 2011
+++ browser/app/profile/firefox.js Tue Aug 23 22:46:44 2011
@@ -134,7 +134,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.3 2011/06/28 22:01:17 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
@@ -582,7 +582,7 @@ pref("accessibility.typeaheadfind.flashBar", 1);
@@ -565,7 +565,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.3 2011/06/28 22:01:17 landry
pref("plugins.hide_infobar_for_outdated_plugin", false);
#ifdef XP_MACOSX
@@ -705,10 +705,10 @@ pref("gecko.handlerService.allowRegisterFromDifferentH
@@ -688,10 +688,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.3 2011/06/28 22:01:17 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");
@@ -770,10 +770,8 @@ pref("browser.EULA.version", 3);
@@ -753,10 +753,8 @@ pref("browser.EULA.version", 3);
pref("browser.rights.version", 3);
pref("browser.rights.3.shown", false);
@ -42,5 +42,5 @@ $OpenBSD: patch-browser_app_profile_firefox_js,v 1.3 2011/06/28 22:01:17 landry
pref("browser.rights.override", true);
-#endif
#ifdef WINCE
pref("browser.sessionstore.resume_from_crash", false);
pref("browser.sessionstore.resume_from_crash", true);
pref("browser.sessionstore.resume_session_once", false);

8
www/fennec/patches/patch-config_autoconf_mk_in
View File

@ -1,7 +1,7 @@
$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@
$OpenBSD: patch-config_autoconf_mk_in,v 1.4 2011/08/23 20:55:53 landry Exp $
--- config/autoconf.mk.in.orig Fri Aug 12 01:28:58 2011
+++ config/autoconf.mk.in Tue Aug 23 22:46:45 2011
@@ -307,7 +307,7 @@ OS_LDFLAGS = @LDFLAGS@
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@

8
www/fennec/patches/patch-config_rules_mk
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-config_rules_mk,v 1.3 2011/06/28 22:01:17 landry Exp $
$OpenBSD: patch-config_rules_mk,v 1.4 2011/08/23 20:55:53 landry Exp $
Add -rpath $(installdir) to be sure libxul/libxpcom can open their
depending libs when being dlopen()'ed themselves
--- 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
--- config/rules.mk.orig Fri Aug 12 01:28:58 2011
+++ config/rules.mk Tue Aug 23 22:46:45 2011
@@ -564,6 +564,14 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
endif
endif

43
www/fennec/patches/patch-configure_in
View File

@ -1,43 +0,0 @@
$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"
+ 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'
@@ -4451,7 +4456,7 @@ if test "$ac_cv_thread_keyword" = yes; then
:
;;
*)
- AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
+dnl AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
;;
esac
fi
@@ -5734,14 +5739,7 @@ dnl ==================================================
# The GNOME component is built if one of
# gnome-vfs, gio, gconf or libnotify is available.
-if test "$MOZ_ENABLE_GCONF" -o \
- "$MOZ_ENABLE_GNOMEVFS" -o \
- "$MOZ_ENABLE_GIO" -o \
- "$MOZ_ENABLE_LIBNOTIFY"; then
- MOZ_ENABLE_GNOME_COMPONENT=1
-else
- MOZ_ENABLE_GNOME_COMPONENT=
-fi
+MOZ_ENABLE_GNOME_COMPONENT=
AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT)
dnl ========================================================

8
www/fennec/patches/patch-content_events_src_nsContentEventHandler_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.3 2011/06/28 22:01:17 landry Exp $
$OpenBSD: patch-content_events_src_nsContentEventHandler_cpp,v 1.4 2011/08/23 20:55:53 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
@@ -1029,7 +1029,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
--- content/events/src/nsContentEventHandler.cpp.orig Fri Aug 12 01:28:59 2011
+++ content/events/src/nsContentEventHandler.cpp Tue Aug 23 22:46:45 2011
@@ -1028,7 +1028,8 @@ nsContentEventHandler::OnSelectionEvent(nsSelectionEve
selPrivate->EndBatchChanges();
NS_ENSURE_SUCCESS(rv, rv);

13
www/fennec/patches/patch-content_media_nsAudioStream_cpp
View File

@ -1,13 +0,0 @@
$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
- PRInt64 position = 0;
+ int64_t position = 0;
if (sa_stream_get_position(static_cast<sa_stream_t*>(mAudioHandle),
positionType, &position) == SA_SUCCESS) {
return position / sizeof(short);

13
www/fennec/patches/patch-content_media_webm_nsWebMReader_cpp
View File

@ -1,13 +0,0 @@
$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 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;
+ uint64_t timecodeScale;
if (!mContext || nestegg_tstamp_scale(mContext, &timecodeScale) == -1) {
return NS_OK;
}

14
www/fennec/patches/patch-gfx_thebes_GLContext_h
View File

@ -1,14 +0,0 @@
$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
@@ -42,6 +42,9 @@
#define GLCONTEXT_H_
#include <stdio.h>
+#if defined(XP_UNIX)
+#include <stdint.h>
+#endif
#include <string.h>
#include <ctype.h>

8
www/fennec/patches/patch-gfx_thebes_Makefile_in
View File

@ -1,7 +1,7 @@
$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)
$OpenBSD: patch-gfx_thebes_Makefile_in,v 1.2 2011/08/23 20:55:53 landry Exp $
--- gfx/thebes/Makefile.in.orig Fri Aug 12 01:29:04 2011
+++ gfx/thebes/Makefile.in Tue Aug 23 22:47:31 2011
@@ -436,6 +436,10 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif

14
www/fennec/patches/patch-gfx_thebes_gfxTextRunWordCache_cpp
View File

@ -1,14 +0,0 @@
$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 @@
#include "nsBidiUtils.h"
+#if defined(XP_UNIX)
+#include <stdint.h>
+#endif
+
#ifdef DEBUG
#include <stdio.h>
#endif

13
www/fennec/patches/patch-ipc_chromium_Makefile_in
View File

@ -1,13 +0,0 @@
$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 \

14
www/fennec/patches/patch-ipc_chromium_src_build_build_config_h
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-ipc_chromium_src_build_build_config_h,v 1.2 2011/08/23 20:55:53 landry Exp $
--- ipc/chromium/src/build/build_config.h.orig Fri Jul 22 00:18:39 2011
+++ ipc/chromium/src/build/build_config.h Sat Jul 30 15:38:37 2011
@@ -19,6 +19,8 @@
#define OS_MACOSX 1
#elif defined(__linux__) || defined(ANDROID)
@ -19,12 +19,8 @@ $OpenBSD: patch-ipc_chromium_src_build_build_config_h,v 1.1 2011/06/28 22:01:18
#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__)
@@ -60,6 +62,9 @@
#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
+#elif defined(__sparc64__)

13
www/fennec/patches/patch-js_src_Makefile_in
View File

@ -1,13 +0,0 @@
$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
#############################################
-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
+ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
VPATH += $(srcdir)/assembler \
$(srcdir)/assembler/wtf \

18
www/fennec/patches/patch-js_src_configure_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-js_src_configure_in,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-js_src_configure_in,v 1.4 2011/08/23 20:55:53 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 Fri May 27 18:12:08 2011
+++ js/src/configure.in Tue May 31 22:18:21 2011
@@ -2517,7 +2517,8 @@ ia64*-hpux*)
--- js/src/configure.in.orig Fri Aug 12 01:29:07 2011
+++ js/src/configure.in Tue Aug 23 22:46:50 2011
@@ -2382,7 +2382,8 @@ ia64*-hpux*)
;;
*-openbsd*)
@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -2869,7 +2870,7 @@ arm*-*)
@@ -2734,7 +2735,7 @@ arm*-*)
AC_DEFINE(JS_CPU_ARM)
AC_DEFINE(JS_NUNBOX32)
;;
@ -22,8 +22,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
+sparc-*)
ENABLE_TRACEJIT=1
NANOJIT_ARCH=Sparc
AC_DEFINE(JS_CPU_SPARC)
@@ -2938,6 +2939,10 @@ arm*-*)
ENABLE_METHODJIT=1
@@ -2808,6 +2809,10 @@ arm*-*)
sparc-*)
AC_DEFINE(AVMPLUS_SPARC)
;;
@ -34,7 +34,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
esac
case "$target" in
@@ -2952,6 +2957,9 @@ case "$target" in
@@ -2822,6 +2827,9 @@ case "$target" in
AC_DEFINE(AVMPLUS_UNIX)
;;
*-freebsd*|*-kfreebsd*)
@ -43,4 +43,4 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
+*-openbsd*)
AC_DEFINE(AVMPLUS_UNIX)
;;
*-gnu*)
*-openbsd*)

13
www/fennec/patches/patch-js_src_jsnativestack_cpp
View File

@ -1,13 +0,0 @@
$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 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>
-# if defined(__FreeBSD__)
+# if defined(__FreeBSD__) || defined (__OpenBSD__)
# include <pthread_np.h>
# endif

12
www/fennec/patches/patch-js_src_jsnum_h
View File

@ -1,12 +0,0 @@
$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 @@
* the high and low words are in big endian order).
*/
#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

11
www/fennec/patches/patch-js_src_nanojit_NativeSparc_cpp
View File

@ -1,11 +0,0 @@
$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 @@
*
* ***** END LICENSE BLOCK ***** */
+#include <sys/types.h>
#include <sys/mman.h>
#include <errno.h>
#include "nanojit.h"

8
www/fennec/patches/patch-js_src_xpconnect_src_Makefile_in
View File

@ -1,7 +1,7 @@
$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 \
$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.4 2011/08/23 20:55:53 landry Exp $
--- js/src/xpconnect/src/Makefile.in.orig Fri Aug 12 01:29:10 2011
+++ js/src/xpconnect/src/Makefile.in Tue Aug 23 22:47:23 2011
@@ -203,6 +203,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
--makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
$(ENABLE_TRACEABLE_FLAGS) \
$(srcdir)/dom_quickstubs.qsconf

8
www/fennec/patches/patch-layout_build_Makefile_in
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-layout_build_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-layout_build_Makefile_in,v 1.4 2011/08/23 20:55:53 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
--- layout/build/Makefile.in.orig Fri Aug 12 01:29:12 2011
+++ layout/build/Makefile.in Tue Aug 23 22:47:12 2011
@@ -284,6 +284,9 @@ endif
ifeq ($(OS_ARCH),Linux)
EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
endif

10
www/fennec/patches/patch-memory_mozalloc_mozalloc_cpp
View File

@ -1,8 +1,8 @@
$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 @@
#include <string.h>
$OpenBSD: patch-memory_mozalloc_mozalloc_cpp,v 1.4 2011/08/23 20:55:53 landry Exp $
--- memory/mozalloc/mozalloc.cpp.orig Fri Aug 12 01:29:17 2011
+++ memory/mozalloc/mozalloc.cpp Tue Aug 23 22:46:54 2011
@@ -45,6 +45,7 @@
#include <sys/types.h>
#if defined(MALLOC_H)
+#include <sys/types.h>

11
www/fennec/patches/patch-mobile_app_Makefile_in
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-mobile_app_Makefile_in,v 1.2 2011/05/03 11:11:37 landry Exp $
--- mobile/app/Makefile.in.orig Fri Mar 18 20:21:36 2011
+++ mobile/app/Makefile.in Thu Mar 31 23:04:30 2011
@@ -70,6 +70,7 @@ APP_XPCOM_LIBS = $(XPCOM_LIBS)
endif
LIBS += $(APP_XPCOM_LIBS) \
+ -L${X11BASE}/lib \
$(NSPR_LIBS) \
$(NULL)

10
www/fennec/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
View File

@ -1,7 +1,7 @@
$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()
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.4 2011/08/23 20:55:53 landry Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Fri Aug 12 01:29:20 2011
+++ security/manager/ssl/src/nsNSSComponent.cpp Tue Aug 23 22:46:56 2011
@@ -821,11 +821,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
const char *possible_ckbi_locations[] = {
@ -16,7 +16,7 @@ $OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.3 2011/06/28 22:
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -859,7 +858,7 @@ nsNSSComponent::InstallLoadableRoots()
@@ -834,7 +833,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{

19
www/fennec/patches/patch-services_crypto_modules_WeaveCrypto_js
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.4 2011/08/23 20:55:53 landry Exp $
Fix libnss3 opening
--- 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 = {
--- services/crypto/modules/WeaveCrypto.js.orig Thu Aug 11 23:41:22 2011
+++ services/crypto/modules/WeaveCrypto.js Fri Aug 19 11:16:12 2011
@@ -158,12 +158,12 @@ WeaveCrypto.prototype = {
Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
// Open the NSS library.
@ -17,14 +17,3 @@ Fix libnss3 opening
nsslib = ctypes.open(path);
} catch(e) {
// In case opening the library without a full path fails,
// try again with a full path.
- let file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
- file.append(path);
- this.log("Trying again with path " + file.path);
- nsslib = ctypes.open(file.path);
+ let path2 = '${LOCALBASE}/lib/libnss3.so.${NSS_SO_VERSION}';
+ this.log("Trying again with path " + path2);
+ nsslib = ctypes.open(path2);
}
this.log("Initializing NSS types and function declarations...");

8
www/fennec/patches/patch-storage_src_mozStorageConnection_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.4 2011/08/23 20:55:53 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 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,
--- storage/src/mozStorageConnection.cpp.orig Fri Aug 12 01:29:23 2011
+++ storage/src/mozStorageConnection.cpp Tue Aug 23 22:46:56 2011
@@ -555,6 +555,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
return convertResultCode(srv);
}

10
www/fennec/patches/patch-toolkit_components_downloads_nsDownloadManager_cpp
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.2 2011/08/23 20:55:53 landry Exp $
--- toolkit/components/downloads/nsDownloadManager.cpp.orig Fri Aug 12 01:29:24 2011
+++ toolkit/components/downloads/nsDownloadManager.cpp Tue Aug 23 22:46:56 2011
@@ -1159,7 +1159,7 @@ nsDownloadManager::GetDefaultDownloadsDirectory(nsILoc
rv = downloadDir->Exists(&exists);
NS_ENSURE_SUCCESS(rv, rv);
if (!exists) {
@ -10,7 +10,7 @@ $OpenBSD: patch-toolkit_components_downloads_nsDownloadManager_cpp,v 1.1 2011/06
NS_ENSURE_SUCCESS(rv, rv);
}
}
@@ -1278,7 +1278,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
@@ -1267,7 +1267,7 @@ nsDownloadManager::GetUserDownloadsDirectory(nsILocalF
(void)customDirectory->Exists(&exists);
if (!exists) {

29
www/fennec/patches/patch-toolkit_library_Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.4 2011/08/23 20:55:53 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 += \
--- toolkit/library/Makefile.in.orig Fri Jul 22 00:18:55 2011
+++ toolkit/library/Makefile.in Sun Jul 31 19:42:21 2011
@@ -157,6 +157,12 @@ OS_LIBS += \
$(NULL)
endif
@ -16,15 +16,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648730
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
+OS_LIBS += -lkrb5 -lcrypto
@@ -165,12 +171,6 @@ EXTRA_DSO_LDOPTS += \
-framework AudioToolbox \
-framework AudioUnit \
$(NULL)
-endif
-endif
-
-ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
-ifdef MOZ_SYDNEYAUDIO
-EXTRA_DSO_LDOPTS += -lossaudio
endif
endif
ifdef MOZ_JAVAXPCOM

8
www/fennec/patches/patch-toolkit_library_libxul-config_mk
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.4 2011/08/23 20:55:53 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 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 += \
--- toolkit/library/libxul-config.mk.orig Fri Aug 12 01:29:25 2011
+++ toolkit/library/libxul-config.mk Tue Aug 23 22:46:56 2011
@@ -331,13 +331,14 @@ EXTRA_DSO_LDOPTS += \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(QCMS_LIBS) \

8
www/fennec/patches/patch-toolkit_mozapps_installer_packager_mk
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.4 2011/08/23 20:55:53 landry Exp $
install headers/idl/sdk libs only if xulrunner
--- 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
--- toolkit/mozapps/installer/packager.mk.orig Fri Aug 12 01:29:25 2011
+++ toolkit/mozapps/installer/packager.mk Tue Aug 23 22:46:57 2011
@@ -704,7 +704,7 @@ endif
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)

8
www/fennec/patches/patch-toolkit_xre_nsXREDirProvider_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.4 2011/08/23 20:55:53 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
--- toolkit/xre/nsXREDirProvider.cpp.orig Fri Aug 12 01:29:27 2011
+++ toolkit/xre/nsXREDirProvider.cpp Tue Aug 23 22:46:57 2011
@@ -1122,11 +1122,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_UNIX)
static const char *const sysSExtDir =

8
www/fennec/patches/patch-xpcom_io_SpecialSystemDirectory_cpp
View File

@ -1,7 +1,7 @@
$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
$OpenBSD: patch-xpcom_io_SpecialSystemDirectory_cpp,v 1.4 2011/08/23 20:55:53 landry Exp $
--- xpcom/io/SpecialSystemDirectory.cpp.orig Fri Aug 12 01:29:29 2011
+++ xpcom/io/SpecialSystemDirectory.cpp Tue Aug 23 22:46:59 2011
@@ -459,7 +459,7 @@ GetUnixXDGUserDirectory(SystemDirectories aSystemDirec
if (NS_FAILED(rv))
return rv;
if (!exists) {

10
www/fennec/patches/patch-xulrunner_app_Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.4 2011/08/23 20:55:53 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
--- xulrunner/app/Makefile.in.orig Fri Aug 12 01:29:29 2011
+++ xulrunner/app/Makefile.in Tue Aug 23 22:47:24 2011
@@ -79,6 +79,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
TK_LIBS := -framework Cocoa $(TK_LIBS)
endif
+ifeq ($(OS_ARCH),OpenBSD)

5
www/fennec/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2011/06/28 22:01:18 landry Exp $
@comment $OpenBSD: PLIST,v 1.4 2011/08/23 20:55:53 landry Exp $
bin/${MOZILLA_PROJECT}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini
@ -65,7 +65,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsLivemarkService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsLoginInfo.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsLoginManager.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsLoginManagerPrompter.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsMicrosummaryService.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsPlacesAutoComplete.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsPlacesExpiration.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/nsPrompter.js
@ -95,6 +94,8 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.dic
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}_icon.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/greprefs.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_en_US.dic
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxul.so.${LIBxul_VERSION}