diff options
| author | flo <flo@FreeBSD.org> | 2013-08-10 06:47:48 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2013-08-10 06:47:48 +0800 |
| commit | 48ed54754b616d3c95207e55efc2f5e2a4d67153 (patch) | |
| tree | 000d1456e6ffd2ee37afe3c4e25cc23d514b50fc | |
| parent | 561f6d108e07f31f0640d46494b5cb311348e4d9 (diff) | |
| download | freebsd-ports-gnome-48ed54754b616d3c95207e55efc2f5e2a4d67153.tar.gz freebsd-ports-gnome-48ed54754b616d3c95207e55efc2f5e2a4d67153.tar.zst freebsd-ports-gnome-48ed54754b616d3c95207e55efc2f5e2a4d67153.zip | |
Fix build with pulseaudio.
Fix build without MAILNEWS
| -rw-r--r-- | www/seamonkey/Makefile | 2 | ||||
| -rw-r--r-- | www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk | 11 | ||||
| -rw-r--r-- | www/seamonkey/files/extra-patch-configure.in | 14 | ||||
| -rw-r--r-- | www/seamonkey/files/patch-bug897300 | 30 |
4 files changed, 30 insertions, 27 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 62e0bb3b416c..b28cf72ae3ad 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -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 diff --git a/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk b/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk deleted file mode 100644 index 76cd7b97fdd4..000000000000 --- a/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk +++ /dev/null @@ -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 diff --git a/www/seamonkey/files/extra-patch-configure.in b/www/seamonkey/files/extra-patch-configure.in deleted file mode 100644 index fd516d09132e..000000000000 --- a/www/seamonkey/files/extra-patch-configure.in +++ /dev/null @@ -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 diff --git a/www/seamonkey/files/patch-bug897300 b/www/seamonkey/files/patch-bug897300 new file mode 100644 index 000000000000..316adf643bc9 --- /dev/null +++ b/www/seamonkey/files/patch-bug897300 @@ -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; + |