mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

Fix build with pulseaudio.

Browse Source 
Fix build without MAILNEWS
This commit is contained in:
Florian Smeets 2013-08-09 22:47:48 +00:00
parent 12cdec36f5
commit cec8fe3df8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=324463
4 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/seamonkey/Makefile
View File

@ -77,8 +77,6 @@ MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
.if ! ${PORT_OPTIONS:MMAILNEWS}
EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk \
${FILESDIR}/extra-patch-configure.in
MOZ_OPTIONS+= --disable-ldap --disable-mailnews
.else
# mail and news desired, but not LDAP

11
www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
View File

@ -1,11 +0,0 @@
--- bridge/bridge.mk.orig 2012-03-13 06:23:10.000000000 +0100
+++ bridge/bridge.mk 2012-03-14 12:28:03.000000000 +0100
@@ -47,8 +47,10 @@
APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
#endif
+ifdef disabled
APP_LIBXUL_DIRS += \
$(DEPTH)$(SUBDIR)/mailnews \
$(NULL)
+endif

14
www/seamonkey/files/extra-patch-configure.in
View File

@ -1,14 +0,0 @@
--- configure.in.orig 2012-03-14 14:18:03.000000000 +0100
+++ configure.in 2012-03-14 14:18:25.000000000 +0100
@@ -837,11 +837,6 @@
AC_PROG_CPP
AC_PROG_CXXCPP
-MAIL_COMPONENT="mail msgsmime import"
-export MAIL_COMPONENT
-MAIL_MODULE="MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule)"
-export MAIL_MODULE
-
if test -n "$_WIN32_MSVC"; then
SKIP_PATH_CHECKS=1
SKIP_COMPILER_CHECKS=1

30
www/seamonkey/files/patch-bug897300 Normal file
View File

@ -0,0 +1,30 @@
# HG changeset patch
# User Randell Jesup <rjesup@jesup.org>
# Date 1375222105 14400
# Node ID 64c5cc9bad2e84a9b1d6392b095ad06a75b94a4e
# Parent 0368f4123c8aeb2209582fb8faf3bcb04acd0e13
Bug897300: Correct mis-merge for pulse audio on Aurora from bug 886886 r=padenot a=bajaj
diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
--- mozilla/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
+++ mozilla/media/webrtc/trunk/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h
@@ -305,17 +305,17 @@ private:
AudioMixerManagerLinuxPulse _mixerManager;
WebRtc_UWord16 _inputDeviceIndex;
WebRtc_UWord16 _outputDeviceIndex;
bool _inputDeviceIsSpecified;
bool _outputDeviceIsSpecified;
- WebRtc_Word32 sampling_rate_hz;
+ WebRtc_Word32 sample_rate_hz_;
WebRtc_UWord8 _recChannels;
WebRtc_UWord8 _playChannels;
AudioDeviceModule::BufferType _playBufType;
private:
bool _initialized;
bool _recording;