Better patches for sndio integration and kerberos/gssapi authentication
as pushed upstream, see https://bugzilla.mozilla.org/show_bug.cgi?id=648726 and https://bugzilla.mozilla.org/show_bug.cgi?id=648730 No binary change..
This commit is contained in:
landry
parent
a43e9c88f8
commit
e0a6f526c5
@ -1,4 +1,7 @@
|
||||
$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.5 2011/03/30 21:39:14 landry Exp $
|
||||
$OpenBSD: patch-js_src_xpconnect_shell_Makefile_in,v 1.6 2011/04/09 11:05:06 landry Exp $
|
||||
/usr/bin/ld: warning: libSM.so.8.0, needed by /usr/X11R6/lib/libXt.so.10.0, not found (try using -rpath or -rpath-link)
|
||||
/usr/bin/ld: warning: libICE.so.9.0, needed by /usr/X11R6/lib/libXt.so.10.0, not found (try using -rpath or -rpath-link)
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=648721
|
||||
--- 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
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-layout_build_Makefile_in,v 1.2 2011/03/30 21:39:14 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/04/09 11:05:06 landry Exp $
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
|
||||
--- layout/build/Makefile.in.orig Sat Mar 19 00:33:55 2011
|
||||
+++ layout/build/Makefile.in Sat Apr 9 10:45:55 2011
|
||||
@@ -298,6 +298,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
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.3 2011/03/30 21:39:14 landry Exp $
|
||||
$OpenBSD: patch-media_libsydneyaudio_src_Makefile_in,v 1.4 2011/04/09 11:05:06 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 = \
|
||||
|
||||
@ -1,16 +1,30 @@
|
||||
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.5 2011/03/30 21:39:14 landry Exp $
|
||||
--- toolkit/library/Makefile.in.orig Wed Dec 15 02:03:37 2010
|
||||
+++ toolkit/library/Makefile.in Wed Dec 22 22:33:04 2010
|
||||
@@ -280,6 +280,12 @@ ifdef MOZ_ENABLE_LIBXUL
|
||||
include $(srcdir)/libxul-rules.mk
|
||||
$OpenBSD: patch-toolkit_library_Makefile_in,v 1.6 2011/04/09 11:05:06 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 Sat Mar 19 00:34:11 2011
|
||||
+++ toolkit/library/Makefile.in Sat Apr 9 11:34:06 2011
|
||||
@@ -187,6 +187,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 += \
|
||||
@@ -278,6 +284,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) $^ .
|
||||
|
||||
@ -1,12 +1,16 @@
|
||||
$OpenBSD: patch-widget_src_gtk2_Makefile_in,v 1.3 2011/03/30 21:39:14 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.4 2011/04/09 11:05:06 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 \
|
||||
|
||||
@ -1,11 +1,17 @@
|
||||
$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.3 2011/03/30 21:39:14 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.4 2011/04/09 11:05:06 landry Exp $
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=648726
|
||||
--- xulrunner/app/Makefile.in.orig Sat Mar 19 00:34:14 2011
|
||||
+++ xulrunner/app/Makefile.in Sat Apr 9 10:50:43 2011
|
||||
@@ -105,6 +105,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) \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user