summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2015-03-08 18:10:48 +0000
committerJan Beich <jbeich@FreeBSD.org>2015-03-08 18:10:48 +0000
commit5c7f1a2ed4aa85b1de20e269cc959b0db906b612 (patch)
treee881bb2f9265834eee124e71f494c002853470bf
parentx11-toolkits/ocaml-lablgtk2: fix build without DOCS (diff)
- Add CANBERRA and enable by default for Thunderbird and SeaMonkey [1]
- Bump version requirements for harfbuzz and libvorbis PR: 198142 [1] See also: https://dxr.mozilla.org/comm-central/search?q=nsISound [1]
Notes
Notes: svn path=/head/; revision=380782
Diffstat
-rw-r--r--Mk/bsd.gecko.mk4
-rw-r--r--mail/thunderbird/Makefile5
-rw-r--r--mail/thunderbird/files/patch-z-bug5174222
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox-esr/files/patch-z-bug5174222
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/Makefile.options6
-rw-r--r--www/firefox/files/patch-bug8475682
-rw-r--r--www/firefox/files/patch-z-bug5174222
-rw-r--r--www/libxul/Makefile2
-rw-r--r--www/libxul/files/patch-z-bug5174222
-rw-r--r--www/seamonkey/Makefile7
-rw-r--r--www/seamonkey/files/patch-bug8475682
-rw-r--r--www/seamonkey/files/patch-z-bug5174222
14 files changed, 26 insertions, 18 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 4519ae5c8407..f2b18c8828aa 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -284,6 +284,10 @@ MOZ_OPTIONS+= --enable-optimize
MOZ_OPTIONS+= --disable-optimize
.endif
+.if ${PORT_OPTIONS:MCANBERRA}
+RUN_DEPENDS+= libcanberra>0:${PORTSDIR}/audio/libcanberra
+.endif
+
.if ${PORT_OPTIONS:MDBUS}
BUILD_DEPENDS+= libnotify>0:${PORTSDIR}/devel/libnotify
LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 681e7e1d5e67..1602456c901c 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,6 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 31.5.0
+PORTREVISION= 1
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -19,7 +20,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
- libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
+ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
@@ -58,7 +59,7 @@ SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
OPTIONS_DEFINE= ENIGMAIL LIGHTNING
-OPTIONS_DEFAULT=ENIGMAIL LIGHTNING
+OPTIONS_DEFAULT=CANBERRA ENIGMAIL LIGHTNING
.include "${.CURDIR}/../../www/firefox/Makefile.options"
diff --git a/mail/thunderbird/files/patch-z-bug517422 b/mail/thunderbird/files/patch-z-bug517422
index bc7f0c545bb8..aa2758e4e12d 100644
--- a/mail/thunderbird/files/patch-z-bug517422
+++ b/mail/thunderbird/files/patch-z-bug517422
@@ -157,7 +157,7 @@ index 87db361..7947626 100644
+MOZ_NATIVE_VORBIS=)
+
+if test -n "$MOZ_NATIVE_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
+fi
+
+AC_SUBST(MOZ_NATIVE_VORBIS)
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index f50aaa1db271..866f06fd6609 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
- libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
+ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
diff --git a/www/firefox-esr/files/patch-z-bug517422 b/www/firefox-esr/files/patch-z-bug517422
index 17432a29775c..1c0f0dd2aab8 100644
--- a/www/firefox-esr/files/patch-z-bug517422
+++ b/www/firefox-esr/files/patch-z-bug517422
@@ -157,7 +157,7 @@ index 87db361..7947626 100644
+MOZ_NATIVE_VORBIS=)
+
+if test -n "$MOZ_NATIVE_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
+fi
+
+AC_SUBST(MOZ_NATIVE_VORBIS)
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index c97a0a517cf6..0bf68b576de4 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -17,9 +17,9 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
- harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+ harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
- libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
+ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
sqlite3>=3.8.7.4:${PORTSDIR}/databases/sqlite3 \
diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options
index a0c4b7ca95d1..969d49dd4db8 100644
--- a/www/firefox/Makefile.options
+++ b/www/firefox/Makefile.options
@@ -1,12 +1,14 @@
# -*- makefile-bsdmake -*-
-OPTIONS_DEFINE+= DBUS DEBUG DTRACE GCONF GIO GNOMEUI GSTREAMER \
- LIBPROXY LOGGING OPTIMIZED_CFLAGS PGO PROFILE TEST
+OPTIONS_DEFINE+= CANBERRA DBUS DEBUG DTRACE GCONF GIO GNOMEUI \
+ GSTREAMER LIBPROXY LOGGING OPTIMIZED_CFLAGS \
+ PGO PROFILE TEST
OPTIONS_DEFAULT+= ALSA DBUS GIO GSTREAMER LOGGING OPTIMIZED_CFLAGS
OPTIONS_MULTI+= AUDIO
OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO
+CANBERRA_DESC?= Sound theme alerts
ENIGMAIL_DESC?= Enigmail extension
GNOMEUI_DESC?= libgnomeui support module
LIBPROXY_DESC?= Proxy support via libproxy
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index 2ffb2dbfb5e8..bc53bcd16c8d 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -46,7 +46,7 @@ index ac38f40..87536b7 100644
+MOZ_NATIVE_HARFBUZZ=)
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
-+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34)
+fi
+
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422
index 13432e8deb4f..f837f2db6735 100644
--- a/www/firefox/files/patch-z-bug517422
+++ b/www/firefox/files/patch-z-bug517422
@@ -154,7 +154,7 @@ index 87db361..7947626 100644
+MOZ_NATIVE_VORBIS=)
+
+if test -n "$MOZ_NATIVE_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
+fi
+
+AC_SUBST(MOZ_NATIVE_VORBIS)
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 476197cc483e..7c112aadef1b 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
- libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
+ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \
diff --git a/www/libxul/files/patch-z-bug517422 b/www/libxul/files/patch-z-bug517422
index 17432a29775c..1c0f0dd2aab8 100644
--- a/www/libxul/files/patch-z-bug517422
+++ b/www/libxul/files/patch-z-bug517422
@@ -157,7 +157,7 @@ index 87db361..7947626 100644
+MOZ_NATIVE_VORBIS=)
+
+if test -n "$MOZ_NATIVE_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
+fi
+
+AC_SUBST(MOZ_NATIVE_VORBIS)
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index c5d6c8a33e7a..a3da1436a70c 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,6 +3,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.32.1
+PORTREVISION= 1
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -17,9 +18,9 @@ BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \
libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \
cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \
soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \
- harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \
+ harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
- libvorbis>=1.3.4:${PORTSDIR}/audio/libvorbis \
+ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
opus>=1.1:${PORTSDIR}/audio/opus \
libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
sqlite3>=3.8.6:${PORTSDIR}/databases/sqlite3 \
@@ -53,7 +54,7 @@ MOZ_PKGCONFIG_FILES=
NOT_FOR_ARCHS= ia64
OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
+OPTIONS_DEFAULT=CANBERRA CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
diff --git a/www/seamonkey/files/patch-bug847568 b/www/seamonkey/files/patch-bug847568
index 197494504ade..4b63e91a02d4 100644
--- a/www/seamonkey/files/patch-bug847568
+++ b/www/seamonkey/files/patch-bug847568
@@ -46,7 +46,7 @@ index ac38f40..87536b7 100644
+MOZ_NATIVE_HARFBUZZ=)
+
+if test -n "$MOZ_NATIVE_HARFBUZZ"; then
-+ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.25)
++ PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 0.9.34)
+fi
+
+AC_SUBST(MOZ_NATIVE_HARFBUZZ)
diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422
index b11c6790c393..57310a8e6741 100644
--- a/www/seamonkey/files/patch-z-bug517422
+++ b/www/seamonkey/files/patch-z-bug517422
@@ -154,7 +154,7 @@ index 87db361..7947626 100644
+MOZ_NATIVE_VORBIS=)
+
+if test -n "$MOZ_NATIVE_VORBIS"; then
-+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.4)
++ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5)
+fi
+
+AC_SUBST(MOZ_NATIVE_VORBIS)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-04 15:37:00 +0000