Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (337601ab079565f1d997a19f8d0abe9c1422ae06)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (337601ab079565f1d997a19f8d0abe9c1422ae06)
  • Date: Wed, 12 Jun 2013 09:47:09 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

http/firefox/BUILD | 4 +-
http/firefox/DEPENDS | 87
+++++++++++++++++++++++++++++++++++------------
http/firefox/HISTORY | 6 +++
http/firefox/PRE_BUILD | 17 ---------
http/firefox/mozconfig | 10 +----
mail/thunderbird/DEPENDS | 45 ++++++++++++++++++++----
mail/thunderbird/DETAILS | 4 +-
mail/thunderbird/HISTORY | 4 ++
8 files changed, 120 insertions(+), 57 deletions(-)

New commits:
commit 337601ab079565f1d997a19f8d0abe9c1422ae06
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

firefox: fix up dependencies

commit 33facd2957a0563f78fc6320df53598467de687e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

thunderbird: version 17.0.6, fix up dependencies

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 6e7d374..e2ce3dd 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -30,7 +30,9 @@ if [[ $gccmajor == "4" ]] && [[ $gccminor -ge "6" ]]; then
CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
fi

-echo ac_add_options --enable-optimize=-O2 >> .mozconfig &&
+for option in $OPTS; do
+ echo "ac_add_options $option" >> .mozconfig
+done &&

make_single &&
make -f client.mk build &&
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 7c8d6d7..a17e3d2 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,26 +1,69 @@
-depends castfs &&
-depends atk &&
-depends curl &&
-depends -sub CXX gcc &&
-depends glib2 &&
-depends libjpeg-turbo &&
-depends pango &&
-depends perl &&
-depends zip &&
-depends zlib &&
-depends cairo &&
-depends python &&
-depends libnotify &&
-depends nspr &&
-depends -sub "3.14.x" nss &&
-depends autoconf-2.13 &&
-depends gtk+2 &&
-depends libidl &&
-
-optional_depends yasm "" "" "Support for WebM media (VP8 video and Vorbis
Audio)" &&
-optional_depends wireless_tools "" "" "for geolocation via WiFi access
points" &&
-optional_depends alsa-lib "" "" "for audio support" &&
+depends -sub CXX gcc &&
+depends nspr '--with-system-nspr' &&
+depends -sub "3.14.x" nss '--with-system-nss' &&
+depends zlib '--with-system-zlib' &&
+depends libjpeg-turbo '--with-system-jpeg' &&
+depends libidl &&
+depends perl &&
+depends python &&
+depends zip &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
+depends pysqlite &&

+depends atk &&
+depends glib2 &&
+depends pango &&
+depends cairo &&
+
+optional_depends gnome-vfs2 \
+ "--enable-gnomevfs" \
+ "--disable-gnomevfs" \
+ "for GnomeVFS support" &&
+
+optional_depends startup-notification \
+ '--enable-startup-notification' \
+ '--disable-startup-notification' \
+ 'for startup notifications' &&
+
+optional_depends gconf2 \
+ '--enable-gconf' \
+ '--disable-gconf' \
+ 'for gconf support' &&
+
+optional_depends 'wireless_tools' \
+ '--enable-necko-wifi' \
+ '--disable-necko-wifi' \
+ 'for Necko WiFi scanning' &&
+
+# Firefox is currently borked and does not compile without alsa-lib, this
+# should be fixed after Firefox starts using Mozilla core 23
+depends alsa-lib &&
+#optional_depends alsa-lib \
+# '--enable-wave' \
+# '--disable-wave --disable-ogg --disable-webm
--disable-dash' \
+# 'for audio/video support' &&
+
+if is_depends_enabled $SPELL alsa-lib; then
+ # Firefox tries to use ogg/ogg.h even with --disable-ogg given
+ #optional_depends libogg \
+ # '--enable-ogg' \
+ # '--disable-ogg' \
+ # 'for sound support' &&
+ depends libogg &&
+
+ # configure script checks for yasm even when --disable-webm and
--disable-dash are given
+ #optional_depends yasm \
+ # '--enable-webm --enable-dash' \
+ # '--disable-webm --disable-dash' \
+ # 'for WebM video support'
+ depends yasm
+fi &&
+
+optional_depends dbus-glib \
+ '--enable-dbus' \
+ '--disable-dbus' \
+ 'for dbus support' &&

suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 39d8663..d4c3bcb 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,9 @@
+2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: Fix up dependencies
+ * BUILD, mozconfig: use proper way to add flags to .mozconfig
+ * PRE_BUILD: removed unnecessary options constructs in lieu of OPTS
+ handling in BUILD
+
2013-04-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 21.0, SECURITY_PATCH++

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 1ed86c5..e3142bb 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -19,23 +19,6 @@ else
sed -i '27iac_add_options --disable-safe-browsing' .mozconfig
fi &&

-if is_depends_enabled $SPELL wireless_tools; then
- sed -i '27iac_add_options --enable-necko-wifi' .mozconfig
-else
- sed -i '27iac_add_options --disable-necko-wifi' .mozconfig
-fi &&
-
-if is_depends_enabled $SPELL yasm; then
- sed -i '27iac_add_options --enable-webm' .mozconfig
-else
- sed -i '27iac_add_options --disable-webm' .mozconfig
-fi &&
-
-if ! is_depends_enabled $SPELL alsa-lib; then
- sed -i '27iac_add_options --disable-ogg' .mozconfig &&
- sed -i '27iac_add_options --disable-wave' .mozconfig
-fi &&
-
if [[ "$FIREFOX_STRIP" == "y" ]]; then
sed -i '27iac_add_options --enable-strip' .mozconfig
fi &&
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index 609fcbb..7e41a7e 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -5,22 +5,16 @@
# Options for client.mk.
mk_add_options MOZ_CO_PROJECT=browser
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
-mk_add_options AUTOCONF=autoconf2.13
+#mk_add_options AUTOCONF=autoconf2.13

# Options for 'configure' (same as command-line options).
+ac_add_options --enable-application=browser
ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
ac_add_options --disable-system-png
-ac_add_options --enable-application=browser
ac_add_options --disable-system-cairo
ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
ac_add_options --enable-pango
ac_add_options --enable-svg
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --disable-dbus
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 8864d7b..5e397cd 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,13 +1,15 @@
depends -sub CXX gcc &&
-depends nspr '--with-system-nspr' &&
-depends nss '--with-system-nss' &&
-depends zlib '--with-system-zlib' &&
-depends JPEG '--with-system-jpeg' &&
+depends nspr '--with-system-nspr' &&
+depends -sub "3.14.x" nss '--with-system-nss' &&
+depends zlib '--with-system-zlib' &&
+depends JPEG '--with-system-jpeg' &&
depends libidl &&
-depends libmng '--with-system-mng' &&
depends perl &&
+depends python &&
depends zip &&
-depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
+depends pysqlite &&
#depends -sub 'TEE' cairo "--enable-system-cairo \
# --enable-default-toolkit=cairo-gtk2" &&
#
@@ -36,4 +38,33 @@ optional_depends gconf2 \
optional_depends 'wireless_tools' \
'--enable-necko-wifi' \
'--disable-necko-wifi' \
- 'for Necko WiFi scanning'
+ 'for Necko WiFi scanning' &&
+
+# Thunderbird is currently borked and does not compile without alsa-lib, this
+# should be fixed after Thunderbird starts using Mozilla core 23
+depends alsa-lib &&
+#optional_depends alsa-lib \
+# '--enable-wave' \
+# '--disable-wave --disable-ogg --disable-webm' \
+# 'for audio/video support'
+
+if is_depends_enabled $SPELL alsa-lib; then
+ # Thunderbird tries to use ogg/ogg.h even with --disable-ogg given
+ #optional_depends libogg \
+ # '--enable-ogg' \
+ # '--disable-ogg' \
+ # 'for sound support'
+ depends libogg &&
+
+ # configure script checks for yasm even when using the system JPEG
+ #optional_depends yasm \
+ # '--enable-webm' \
+ # '--disable-webm' \
+ # 'for WebM video support'
+ depends yasm
+fi &&
+
+optional_depends dbus-glib \
+ '--enable-dbus' \
+ '--disable-dbus' \
+ 'for dbus support'
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index a1d6e35..164fe6f 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,5 @@
SPELL=thunderbird
- VERSION=17.0.5
+ VERSION=17.0.6
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=36
+ SECURITY_PATCH=37
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index acebc2a..ce6b00e 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,7 @@
+2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS; version 17.0.6, SECURITY_PATCH++
+ * DEPENDS: Fix up dependencies
+
2013-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 17.0.5, SECURITY_PATCH++
* BUILD: disable avx which causes a segfault



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (337601ab079565f1d997a19f8d0abe9c1422ae06), Remko van der Vossen, 06/12/2013

Archive powered by MHonArc 2.6.24.

Top of Page