22556270 thunderbird bugdb component is wrong in the Makefile
22556275 thunderbird doesn't package on the userland nightly (s12-91)
22569305 ffox/tbird should put .mozconfig in $(BUILD*)
22573385 web/browser/firefox has 3 new missing dependencies
--- a/components/desktop/firefox/Makefile Thu Jan 21 05:17:42 2016 -0800
+++ b/components/desktop/firefox/Makefile Thu Jan 21 13:49:37 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
#
# parfait is a bit unhappy (22527218)
@@ -72,41 +72,43 @@
CLEAN_PATHS += $(COMPONENT_SRC)
+MOZCONFIG = $(BUILD_DIR_32)/mozconfig
+
COMPONENT_PRE_CONFIGURE_ACTION += \
- echo "mk_add_options BUILD_OFFICIAL=1" > .mozconfig ; \
- echo "mk_add_options MOZILLA_OFFICIAL=1" >> .mozconfig ; \
- echo "ac_add_options --prefix=/usr" >> .mozconfig ; \
- echo "ac_add_options --libdir=/usr/lib" >> .mozconfig ; \
- echo "ac_add_options --mandir=/usr/share/man" >> .mozconfig ; \
- echo "ac_add_options --enable-official-branding" >> .mozconfig ; \
- echo "ac_add_options --disable-updater" >> .mozconfig ; \
- echo "ac_add_options --enable-debug-symbols=no" >> .mozconfig ; \
- echo "ac_add_options --enable-update-packaging" >> .mozconfig ; \
- echo "ac_add_options --enable-update-channel=esr" >> .mozconfig ; \
- echo "ac_add_options --disable-tests" >> .mozconfig ; \
- echo "ac_add_options --with-system-libevent" >> .mozconfig ; \
- echo "ac_add_options --with-system-zlib" >> .mozconfig ; \
- echo "ac_add_options --with-system-bz2" >> .mozconfig ; \
- echo "ac_add_options --enable-system-ffi" >> .mozconfig ; \
- echo "ac_add_options --enable-system-sqlite" >> .mozconfig ; \
- echo "ac_add_options --enable-jemalloc" >> .mozconfig ; \
- echo "ac_add_options --enable-xinerama" >> .mozconfig ; \
- echo "ac_add_options --disable-crashreporter" >> .mozconfig ; \
- echo "ac_add_options --disable-pulseaudio" >> .mozconfig ; \
- echo "ac_add_options --enable-gstreamer" >> .mozconfig ; \
- echo "ac_add_options --without-intl-api" >> .mozconfig ; \
- echo "ac_add_options --enable-system-libffi" >> .mozconfig ; \
- echo "ac_add_options --enable-ipc" >> .mozconfig ; \
- echo "ac_add_options --enable-system-pixman" >> .mozconfig ; \
- echo "ac_add_options --enable-startup-notification" >> .mozconfig ; \
- echo "ac_add_options --enable-dtrace" >> .mozconfig ;
+ echo "mk_add_options BUILD_OFFICIAL=1" > $(MOZCONFIG) ; \
+ echo "mk_add_options MOZILLA_OFFICIAL=1" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --prefix=/usr" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --libdir=/usr/lib" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --mandir=/usr/share/man" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-official-branding" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-updater" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-debug-symbols=no" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-update-packaging" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-update-channel=esr" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-tests" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-libevent" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-zlib" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-bz2" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-system-ffi" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-system-sqlite" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-jemalloc" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-xinerama" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-crashreporter" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-pulseaudio" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-gstreamer" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --without-intl-api" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-system-libffi" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-ipc" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-system-pixman" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-startup-notification" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-dtrace" >> $(MOZCONFIG) ;
CXXFLAGS += -Wno-invalid-offsetof
CONFIGURE_ENV += PKG_CONFIG_PATH=$(CONFIGURE_LIBDIR.$(BITS))/pkgconfig
CONFIGURE_ENV += OS_DEFINES="-D__USE_LEGACY_PROTOTYPES__"
-CONFIGURE_ENV += MOZCONFIG=$(shell pwd)/.mozconfig
+CONFIGURE_ENV += MOZCONFIG=$(MOZCONFIG)
CONFIGURE_ENV += "CC=$(CC)"
CONFIGURE_ENV += "CXX=$(CXX)"
CONFIGURE_ENV += "CFLAGS=$(CFLAGS)"
@@ -171,6 +173,7 @@
REQUIRED_PACKAGES += library/desktop/gtk2
REQUIRED_PACKAGES += library/desktop/pango
REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gnome/gnome-libs
REQUIRED_PACKAGES += library/graphics/pixman
REQUIRED_PACKAGES += library/libevent
REQUIRED_PACKAGES += library/libffi
--- a/components/desktop/thunderbird/Makefile Thu Jan 21 05:17:42 2016 -0800
+++ b/components/desktop/thunderbird/Makefile Thu Jan 21 13:49:37 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
#
# parfait is a bit unhappy (22527218)
@@ -40,7 +40,7 @@
sha256:ccbf8cbb740bc1b30ecf4fe39aab226607f9a41e23a07e994c508a90e8b70508
MOZILLA_FTP = http://ftp.mozilla.org/pub/mozilla.org/$(COMPONENT_NAME)/releases/$(COMPONENT_VERSION)
COMPONENT_ARCHIVE_URL= $(MOZILLA_FTP)/source/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB= thunderbird/mailer
+COMPONENT_BUGDB= tbird/mailer
TPNO= 22326
@@ -67,35 +67,38 @@
# /usr/sbin needed for dtrace.
PATH = /usr/gnu/bin:/usr/bin:/usr/sbin
+MOZCONFIG = $(BUILD_DIR_32)/mozconfig
+
COMPONENT_PRE_CONFIGURE_ACTION += \
- echo "mk_add_options BUILD_OFFICIAL=1" > .mozconfig ; \
- echo "mk_add_options MOZILLA_OFFICIAL=1" >> .mozconfig ; \
- echo "ac_add_options --prefix=/usr" >> .mozconfig ; \
- echo "ac_add_options --libdir=/usr/lib" >> .mozconfig ; \
- echo "ac_add_options --mandir=/usr/share/man" >> .mozconfig ; \
- echo "ac_add_options --disable-debug" >> .mozconfig ; \
- echo "ac_add_options --enable-optimize" >> .mozconfig ; \
- echo "ac_add_options --disable-tests" >> .mozconfig ; \
- echo "ac_add_options --with-system-libevent" >> .mozconfig ; \
- echo "ac_add_options --with-system-zlib" >> .mozconfig ; \
- echo "ac_add_options --with-system-bz2" >> .mozconfig ; \
- echo "ac_add_options --enable-system-ffi" >> .mozconfig ; \
- echo "ac_add_options --enable-system-sqlite" >> .mozconfig ; \
- echo "ac_add_options --enable-libxul" >> .mozconfig ; \
- echo "ac_add_options --enable-jemalloc" >> .mozconfig ; \
- echo "ac_add_options --enable-official-branding" >> .mozconfig ; \
- echo "ac_add_options --disable-updater" >> .mozconfig ; \
- echo "ac_add_options --enable-update-packaging" >> .mozconfig ; \
- echo "ac_add_options --enable-ipc" >> .mozconfig ; \
- echo "ac_add_options --with-system-zlib" >> .mozconfig ; \
- echo "ac_add_options --with-system-bz2" >> .mozconfig ; \
- echo "ac_add_options --enable-gstreamer" >> .mozconfig ; \
- echo "ac_add_options --enable-system-pixman" >> .mozconfig ; \
- echo "ac_add_options --without-intl-api" >> .mozconfig ; \
- echo "ac_add_options --disable-crashreporter" >> .mozconfig ; \
- echo "ac_add_options --enable-debug-symbols=no" >> .mozconfig ; \
- echo "ac_add_options --enable-calendar" >> .mozconfig ; \
- echo "ac_add_options --enable-startup-notification" >> .mozconfig ;
+ echo "mk_add_options BUILD_OFFICIAL=1" > $(MOZCONFIG) ; \
+ echo "mk_add_options MOZILLA_OFFICIAL=1" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --prefix=/usr" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --libdir=/usr/lib" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --mandir=/usr/share/man" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-debug" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-optimize" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-tests" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-libevent" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-zlib" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-bz2" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-system-ffi" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-system-sqlite" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-libxul" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-jemalloc" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-official-branding" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-updater" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-update-packaging" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-ipc" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-zlib" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --with-system-bz2" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-gstreamer" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-system-pixman" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --without-intl-api" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --disable-crashreporter" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-debug-symbols=no" >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-calendar" >> $(MOZCONFIG) ; \
+ echo 'ac_add_options --with-rpath="\\\\\\$$\\$$ORIGIN"' >> $(MOZCONFIG) ; \
+ echo "ac_add_options --enable-startup-notification" >> $(MOZCONFIG) ;
CXXFLAGS += -Wno-invalid-offsetof
@@ -103,7 +106,7 @@
CONFIGURE_ENV += OS_DEFINES="-D__USE_LEGACY_PROTOTYPES__"
CONFIGURE_ENV += LDFLAGS="-z ignore"
-CONFIGURE_ENV += MOZCONFIG=$(shell pwd)/.mozconfig
+CONFIGURE_ENV += MOZCONFIG=$(MOZCONFIG)
CONFIGURE_ENV += "CC=$(CC)"
CONFIGURE_ENV += "CXX=$(CXX)"
CONFIGURE_ENV += "CFLAGS=$(CFLAGS)"
--- a/components/desktop/thunderbird/thunderbird.p5m Thu Jan 21 05:17:42 2016 -0800
+++ b/components/desktop/thunderbird/thunderbird.p5m Thu Jan 21 13:49:37 2016 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
#
# pkg.linted actions are needed to prevent bad RUNPATH lint errors.
@@ -116,8 +116,8 @@
file path=usr/lib/thunderbird/libfreebl_32int64_3.chk variant.arch=sparc
file path=usr/lib/thunderbird/libfreebl_32int64_3.so com.oracle.elfsign=false \
pkg.linted.userland.action001.3=true variant.arch=sparc
-file path=usr/lib/thunderbird/libldap60.so
-file path=usr/lib/thunderbird/libldif60.so
+file path=usr/lib/thunderbird/libldap60.so pkg.linted.userland.action001.3=true
+file path=usr/lib/thunderbird/libldif60.so pkg.linted.userland.action001.3=true
file path=usr/lib/thunderbird/libmozalloc.so \
pkg.linted.userland.action001.3=true
file path=usr/lib/thunderbird/libnspr4.so
@@ -131,7 +131,7 @@
file path=usr/lib/thunderbird/libplc4.so pkg.linted.userland.action001.3=true
file path=usr/lib/thunderbird/libplds4.so pkg.linted.userland.action001.3=true
file path=usr/lib/thunderbird/libprldap60.so \
- pkg.depend.bypass-generate=libnspr4.so
+ pkg.depend.bypass-generate=libnspr4.so pkg.linted.userland.action001.3=true
file path=usr/lib/thunderbird/libsmime3.so pkg.linted.userland.action001.3=true
file path=usr/lib/thunderbird/libsoftokn3.chk
file path=usr/lib/thunderbird/libsoftokn3.so com.oracle.elfsign=false \