Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (5af448c95bb4cd258a783c7e58738cac5e433130)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (5af448c95bb4cd258a783c7e58738cac5e433130)
  • Date: Fri, 13 Jan 2012 13:23:56 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

mail/thunderbird/DEPENDS | 34 ++++++++++++----------------------
mail/thunderbird/HISTORY | 3 +++
x11-libs/cairo/HISTORY | 4 ++++
x11-libs/cairo/SUB_DEPENDS | 4 +++-
4 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit 5af448c95bb4cd258a783c7e58738cac5e433130
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: Remove my debug echo

commit 539921b8001594a431b789c005878fb41ff64f98
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cairo: Remove prior TEE entries in CAIRO_OPTS to keep the list sane
Override any other entries in CAIRO_OPTS when doing a sub-dependency

$ cat /etc/sorcery/local/depends/cairo.p
CAIRO_DEVEL="y"
CAIRO_OPTS="--enable-tee=yes --enable-tee=yes --enable-tee=no
--enable-xlib-xcb"

Ends up with tee disabled if you first compiled cairo without it,
even though it was requested:
$ gaze compile cairo
...
Tee: no (disabled, use --enable-tee to enable)

commit 7761b7471bb8a635678685f3f782558b09bb9470
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

thunderbird: cairo is no longer optional (no pure GTK+ option anymore)

checking for application to build... mail
checking if app-specific confvars.sh exists... ./mail/confvars.sh
configure: error: You must specify a default toolkit (perhaps
cairo-gtk2).

From ./configure --help:
--enable-default-toolkit=TK
Select default toolkit
Platform specific defaults:
BeOS - cairo-beos
Mac OS X - cairo-cocoa
Neutrino/QNX - photon
OS/2 - cairo-os2
Win32/WinCE - cairo-windows
Gtk2 with DirectFB - cairo-gtk2-dfb
* - cairo-gtk2
* - cairo-qt

diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 331aea4..569ddb6 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,14 +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 libidl
&&
-depends libmng '--with-system-mng'
&&
-depends perl
&&
-depends zip
&&
-depends gtk+2
\
- '--enable-xft --disable-freetype2 --enable-default-toolkit=gtk2'
&&
+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 libidl &&
+depends libmng '--with-system-mng' &&
+depends perl &&
+depends zip &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends -sub 'TEE' cairo "--enable-system-cairo \
+ --enable-default-toolkit=cairo-gtk2" &&
#
# LDAP support doesn't work (fails to build)
#
@@ -22,17 +23,6 @@ optional_depends gnome-vfs2 \
"--disable-gnomevfs" \
"for GnomeVFS support" &&

-optional_depends cairo \
- "--enable-system-cairo \
- --enable-default-toolkit=cairo-gtk2" \
- "" \
- "for native SVG rendering" &&
-
-# tee surface backend must be enabled in cairo
-if is_depends_enabled $SPELL cairo; then
- depends -sub "TEE" cairo
-fi &&
-
optional_depends startup-notification \
'--enable-startup-notification' \
'--disable-startup-notification' \
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 8314cdf..78d4076 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,6 @@
+2012-01-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: cairo is now required (not pure gtk2 toolkit option)
+
2012-01-03 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 9.0.1, SECURITY_PATCH=29
* DEPENDS: if cairo dependency is enabled, cairo must have tee surface
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f46c4b6..2d3ecd9 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2012-01-13 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS: Remove prior TEE entries in CAIRO_OPTS to keep the
list sane
+ Override any other entries in CAIRO_OPTS when doing a sub-dependency
+
2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD, CONFIGURE, {{REPAIR^all^,}PRE_,}SUB_DEPENDS: simplified tee
backend selection
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 8fe658f..3286867 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -12,7 +12,9 @@ case $THIS_SUB_DEPENDS in
X) message "Cairo with Xlib support requested, forcing libx11
dependency" &&
depends libx11 "--enable-xlib";;
TEE) message "Cairo with tee backend request, forcing it" &&
- CAIRO_OPTS="--enable-tee=yes $CAIRO_OPTS" ;;
+ list_remove CAIRO_OPTS '--enable-tee=no' &&
+ list_remove CAIRO_OPTS '--enable-tee=yes' &&
+ CAIRO_OPTS="$CAIRO_OPTS --enable-tee=yes" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (5af448c95bb4cd258a783c7e58738cac5e433130), Eric Sandall, 01/13/2012

Archive powered by MHonArc 2.6.24.

Top of Page