[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (7200f28db0698a744bc1434a6dcf8ac0f3878e15)

Vlad Glagolev scm at sourcemage.org
Sat Dec 10 23:00:16 EST 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 chat-im/pidgin/DETAILS                          |    4 
 chat-im/pidgin/HISTORY                          |    4 
 dev/null                                        |binary
 devel/guile/DEPENDS                             |    1 
 devel/guile/HISTORY                             |    3 
 ftp-libs/libtorrent/DETAILS                     |    4 
 ftp-libs/libtorrent/HISTORY                     |    4 
 ftp-libs/libtorrent/UP_TRIGGERS                 |   12 ++
 ftp/rtorrent/DETAILS                            |    4 
 ftp/rtorrent/HISTORY                            |    4 
 ftp/rtorrent/PRE_BUILD                          |    2 
 gnome2-apps/gedit/DETAILS                       |    4 
 gnome2-apps/gedit/HISTORY                       |    5 +
 gnome2-apps/gedit/PRE_BUILD                     |    5 +
 gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig       |    0 
 gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig        |binary
 http/seamonkey/BUILD                            |   42 ++++++++-
 http/seamonkey/CONFIGURE                        |  107 +++++++++++++++++-------
 http/seamonkey/DEPENDS                          |   70 ++++++++++-----
 http/seamonkey/DETAILS                          |    4 
 http/seamonkey/HISTORY                          |   17 +++
 http/seamonkey/INSTALL                          |    4 
 http/seamonkey/PRE_BUILD                        |   47 ----------
 http/seamonkey/blfs-mozconfig                   |   83 ------------------
 http/seamonkey/ldap.patch                       |   15 +++
 http/seamonkey/mailnews.patch                   |   38 ++++++++
 libs/iksemel/DETAILS                            |    4 
 libs/iksemel/HISTORY                            |    3 
 net/nsd/DETAILS                                 |    4 
 net/nsd/HISTORY                                 |    3 
 video-libs/libdc1394/DETAILS                    |    8 -
 video-libs/libdc1394/HISTORY                    |    3 
 video-libs/libdc1394/libdc1394-2.1.4.tar.gz.sig |binary
 33 files changed, 308 insertions(+), 200 deletions(-)

New commits:
commit 34f6b219cd7b20c992e964b13d6e1750fe2c055d
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    seamonkey: post-update fixes

commit fef48c12bf5b0a58550d6a3f639355196756cbd1
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    pidgin: => 2.10.1
    SECURITY_PATCH=12, CVE-2011-3594 & CVE-2011-4601

commit 9509a58f1ee85b4649d6da42292871fe7df2f1c4
Author: Sukneet Basuta <sukneet at sourcemage.org>
Commit: Sukneet Basuta <sukneet at sourcemage.org>

    gedit: => 3.2.5
    bz2 -> xz
    PRE_BUILD added to handle xz archive

commit 160e6d10da4602da41ca23332e7963a40d79b3ef
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    nsd: => 3.2.9

commit 9371de3bf713741c64f28b2dbe46f86c2605b431
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    rtorrent: updated to 0.9.0

commit 9e8e251fc33ab2174f21419d8b690522f9b3e535
Author: Andraž Levstik <ruskie+2054d253 at codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 at codemages.net>

    libtorrent: update to 0.13.0

commit 8ed302d74cf6a39a578503b6f02bd4d29c5a5451
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    seamonkey: => 2.5

commit 802559d6dad22b4bb5d755be737e129fe61b2765
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    devel/guile: add libffi dependency
    
    Guile depends on libffi, otherwise it fails configure:
    
    checking for LIBFFI... configure: error: Package requirements (libffi)
    were not met:
    
    Adding libffi as a dependency fixes this problem.

commit 59a8766c8821e9a4c8d7a6a9a40cc8d7148bde17
Author: Robin Cook <rcook at wyrms.net>
Commit: Robin Cook <rcook at wyrms.net>

    libdc1394: updated to 2.1.4

commit fb0a952fa6b6c15c47aec707f9d7da271dcfa2d7
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    doc/epdfview: added PRE_BUILD to fix compilation with new glib2

commit 5ad3373a57146d7c2bbad6950e1997df79c35c7a
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    libs/iksemel: update to 1.4
    
    Updated iksemel to version 1.4, which was released in 2009.

diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 44273c9..8e22880 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pidgin
-         VERSION=2.10.0
-  SECURITY_PATCH=11
+         VERSION=2.10.1
+  SECURITY_PATCH=12
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 55e5ebc..28c0abc 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,7 @@
+2011-12-10 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 2.10.1,
+	  SECURITY_PATCH=12, CVE-2011-3594 & CVE-2011-4601
+
 2011-09-26 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: converted to upstream signature checking
 	* 4C292FCC.gpg: added gpg keyring
diff --git a/devel/guile/DEPENDS b/devel/guile/DEPENDS
index 249bc70..bb41f3c 100755
--- a/devel/guile/DEPENDS
+++ b/devel/guile/DEPENDS
@@ -1,4 +1,5 @@
 depends gmp &&
 depends libunistring &&
 depends libgc &&
+depends libffi &&
 depends libtool
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index bc4417f..bfbbf00 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,6 @@
+2011-12-10 Justin Boffemmyer <flux at sourcemage.org>
+	* DEPENDS: added libffi, fails to build without it
+
 2011-10-23 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.0.3
 
diff --git a/ftp-libs/libtorrent/DETAILS b/ftp-libs/libtorrent/DETAILS
index 1b22696..84ddbe9 100755
--- a/ftp-libs/libtorrent/DETAILS
+++ b/ftp-libs/libtorrent/DETAILS
@@ -1,12 +1,12 @@
            SPELL=libtorrent
-         VERSION=0.12.9
+         VERSION=0.13.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
         WEB_SITE=http://libtorrent.rakshasa.no
          ENTERED=20050117
       LICENSE[0]=GPL
-     SOURCE_HASH=sha512:dde2c4edbf08edce5bcb2c3487b8a5952a1e84f84ccd2c54e3f6530571b87bd994f4fc0e8175e0188adf831f562c9c35ae8b7f318d81543c590a1eb37151774c
+     SOURCE_HASH=sha512:fc7c7dfdfff9005d88fde0cbdb443be266a9e236ae77a70c05221f741590a83b38f65a454a915278daacf6faa041e7a89d0dab2dbf1e5c35ab642b2d4b157107
         KEYWORDS="bittorrent ftp libs"
            SHORT='LibTorrent is a BitTorrent library written in C++ for *nix.'
 cat << EOF
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index be93708..2c84299 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,3 +1,7 @@
+2011-12-10 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 0.13.0
+	* UP_TRIGGERS: incompatible update
+
 2011-09-20 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: updated spell to 0.12.9
 	* PRE_BUILD, gcc44.patch: removed patch, no longer needed
diff --git a/ftp-libs/libtorrent/UP_TRIGGERS b/ftp-libs/libtorrent/UP_TRIGGERS
new file mode 100755
index 0000000..6577381
--- /dev/null
+++ b/ftp-libs/libtorrent/UP_TRIGGERS
@@ -0,0 +1,12 @@
+local OLD_SPELL_VERSION=""
+if spell_ok  $SPELL; then
+  OLD_SPELL_VERSION="$(installed_version $SPELL)"
+  if test "${VERSION}" != "${OLD_SPELL_VERSION}"; then
+    message "This is a possibly incompatible update of $SPELL..."
+    message "Figuring out what spells need to be recast, this may take a while."
+    for each in $(show_up_depends $SPELL); do
+       up_trigger $each cast_self
+    done
+  fi
+fi
+
diff --git a/ftp/rtorrent/DETAILS b/ftp/rtorrent/DETAILS
index ef8f46a..d88c3bf 100755
--- a/ftp/rtorrent/DETAILS
+++ b/ftp/rtorrent/DETAILS
@@ -1,12 +1,12 @@
            SPELL=rtorrent
-         VERSION=0.8.9
+         VERSION=0.9.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://libtorrent.rakshasa.no/downloads/$SOURCE
         WEB_SITE=http://libtorrent.rakshasa.no
          ENTERED=20050214
       LICENSE[0]=GPL
-     SOURCE_HASH=sha512:32b6377279fc22a0e42f80f0d4275a9b940866bed639e0b022088380b9a6bffe9ec642eba3866f5ee3fb1d3cc1c63b75283b15726b59fead790f643d6a053b7d
+     SOURCE_HASH=sha512:e1a53ffc0f9aba8f024059a6eee00ec1b7351d2c66c4b79290be627ed5c8dc47d3b5a1b004ce877aeb58ea96c1298063a850f6c52bb23137c0d7abbd6281f080
         KEYWORDS="bittorrent ftp"
            SHORT='Rtorrent is a bittorrent client using libTorrent.'
 cat << EOF
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index 3f818d4..7ba8dfb 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,3 +1,7 @@
+2011-12-10 Andraž "ruskie" Levstik <ruskie+f03a580f at codemages.net>
+	* DETAILS: updated spell to 0.9.0
+	* PRE_BUILD: patch only needed for ncurses 5.8
+
 2011-09-20 Arjan Bouter <abouter at sourcemage.org>
 	* DETAILS: version 0.8.9
 	* DEPENDS use simple_version_check_force_depends on libtorrent to avoid
diff --git a/ftp/rtorrent/PRE_BUILD b/ftp/rtorrent/PRE_BUILD
index be02560..c435e61 100755
--- a/ftp/rtorrent/PRE_BUILD
+++ b/ftp/rtorrent/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
+if [[ $(installed_version ncurses) == 5.8 ]]; then
 patch -p0 < ${SPELL_DIRECTORY}/rtorrent-ncurses.patch
+fi
diff --git a/gnome2-apps/gedit/DETAILS b/gnome2-apps/gedit/DETAILS
index 94328ec..8e0eb5b 100755
--- a/gnome2-apps/gedit/DETAILS
+++ b/gnome2-apps/gedit/DETAILS
@@ -1,7 +1,7 @@
            SPELL=gedit
-         VERSION=3.2.3
+         VERSION=3.2.5
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
-          SOURCE=$SPELL-$VERSION.tar.bz2
+          SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-apps/gedit/HISTORY b/gnome2-apps/gedit/HISTORY
index 8730c92..6345e05 100644
--- a/gnome2-apps/gedit/HISTORY
+++ b/gnome2-apps/gedit/HISTORY
@@ -1,3 +1,8 @@
+2011-12-10 Sukneet Basuta <sukneet at sourcemage.org>
+	* DETAILS: updated spell to 3.2.5
+	  bz2 -> xz
+	* PRE_BUILD: added, to extract xz
+
 2011-11-18 Sukneet Basuta <sukneet at sourcemage.org>
 	* DETAILS: updated spell to 3.2.3
 
diff --git a/gnome2-apps/gedit/PRE_BUILD b/gnome2-apps/gedit/PRE_BUILD
new file mode 100755
index 0000000..8240c01
--- /dev/null
+++ b/gnome2-apps/gedit/PRE_BUILD
@@ -0,0 +1,5 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $BUILD_DIRECTORY &&
+verify_file '' &&
+xz -dc $SOURCE_CACHE/$SOURCE | tar -xf - &&
+cd $SOURCE_DIRECTORY
diff --git a/gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig b/gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig
deleted file mode 100644
index 9740a13..0000000
Binary files a/gnome2-apps/gedit/gedit-3.2.3.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig b/gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig
new file mode 100644
index 0000000..0c28e42
Binary files /dev/null and b/gnome2-apps/gedit/gedit-3.2.5.tar.xz.sig differ
diff --git a/http/seamonkey/BUILD b/http/seamonkey/BUILD
index 7450676..16350de 100755
--- a/http/seamonkey/BUILD
+++ b/http/seamonkey/BUILD
@@ -7,6 +7,44 @@ MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey  &&
 CFLAGS="${CFLAGS//-O3/-O2}"      &&
 CXXFLAGS="${CXXFLAGS//-O3/-O2}"  &&
 
-make_single                                                  &&
-make -f client.mk build                                      &&
+MOZCONFIG="--prefix=$INSTALL_ROOT/usr \
+           --with-default-mozilla-five-home=$INSTALL_ROOT/usr/lib/seamonkey \
+           --enable-extensions=${SEAMONKEY_EXT// /,} \
+           --enable-application=suite \
+           --enable-jemalloc \
+           --enable-svg \
+           --enable-canvas \
+           --enable-system-ffi \
+           --enable-system-sqlite \
+           --with-pthreads \
+           --with-system-nspr \
+           --with-system-nss \
+           --with-system-zlib \
+           --with-system-jpeg \
+           --with-system-libevent \
+           --disable-crashreporter \
+           --disable-installer \
+           --disable-updater \
+           --disable-tests \
+           --disable-debug \
+           $SEAMONKEY_OPTS" &&
+
+# TODO: we don't have recent libpng yet
+MOZCONFIG="--without-system-png $MOZCONFIG" &&
+
+# GNOME support is broken (at least for download manager)
+MOZCONFIG="--disable-gconf \
+           --disable-gnomeui \
+           --disable-gnomevfs \
+           $MOZCONFIG" &&
+
+# multijob build
+echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$MAKE_NJOBS\"" >> .mozconfig &&
+
+for o in $MOZCONFIG; do
+  echo "ac_add_options $o" >> .mozconfig
+done &&
+
+make_single &&
+make -f client.mk build &&
 make_normal
diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index e0e60fd..27361c7 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -1,28 +1,79 @@
-config_query SEAMONKEY_OFFICIAL "Enable official branding? If enabled, you may \
-be restricted in distributing these binaries IAW mozilla policies" n &&
-
-#Will not build without the Mail News client
-#config_query  SEAMONKEY_MAILNEWS                             \
-#                     "Build Mail News client?"        \
-#                      n                                   &&
-
-config_query  SEAMONKEY_COMPOSER                          \
-                     'Build Composer component?'           \
-                     n                                    &&
-
-config_query  SEAMONKEY_CAIRO                             \
-                     "Use system installed cairo?"        \
-                      n                                   &&
-
-config_query  SEAMONKEY_PANGO                             \
-                     'Enable Pango support for complex font rendering?' \
-                     n                                    &&
-
-config_query  SEAMONKEY_STRIP                              \
-                     'Remove debugging symbols?' \
-                     n                                    &&
-
-#Getting rid of that annoying nullplugin
-config_query  SEAMONKEY_NULLPLUGIN                       \
-"Do you want nullplugin installed (to enable auto search and install of other plugins)" \
-              y
+source $GRIMOIRE/config_query_multi.function &&
+
+config_query SEAMONKEY_NULLPLUGIN "Do you want nullplugin installed (to enable auto search and install of other plugins)" y &&
+
+config_query_option SEAMONKEY_OPTS "Build mail & news components?" y \
+                                   "--enable-mailnews" \
+                                   "--disable-mailnews" &&
+
+if list_find "$SEAMONKEY_OPTS" "--disable-mailnews"; then
+  message "${MESSAGE_COLOR}"
+  message "SeaMonkey doesn't work when built without mail & news components"
+  message "support at the moment. Forcing '--enable-mailnews' configure option."
+  message "${DEFAULT_COLOR}"
+
+  list_remove "SEAMONKEY_OPTS" "--disable-mailnews" &&
+  list_add "SEAMONKEY_OPTS" "--enable-mailnews"
+fi &&
+
+config_query_option SEAMONKEY_OPTS "Build Composer component?" n \
+                                   "--enable-composer" \
+                                   "--disable-composer" &&
+
+config_query_option SEAMONKEY_OPTS "Build Lightning calendar extension?" n \
+                                   "--enable-calendar" \
+                                   "--disable-calendar" &&
+
+config_query_option SEAMONKEY_OPTS "Enable Personal Security Manager?" y \
+                                   "--enable-crypto" \
+                                   "--disable-crypto" &&
+
+config_query_option SEAMONKEY_OPTS "Enable WebM support?" y \
+                                   "--enable-webm" \
+                                   "--disable-webm" &&
+
+config_query_option SEAMONKEY_OPTS "Enable official branding? If enabled, you may be restricted in distributing these binaries IAW mozilla policies" n \
+                                   "--enable-official-branding" \
+                                   "--disable-official-branding" &&
+
+config_query_option SEAMONKEY_OPTS "Use system installed cairo?" n \
+                                   "--enable-system-cairo" \
+                                   "--disable-system-cairo" &&
+
+config_query_option SEAMONKEY_OPTS "Enable Pango support for complex font rendering?" n \
+                                   "--enable-pango" \
+                                   "--disable-pango" &&
+
+if list_find "$SEAMONKEY_OPTS" "--enable-mailnews"; then
+  config_query_option SEAMONKEY_OPTS "Enable LDAP support?" n \
+                                     "--enable-ldap" \
+                                     "--disable-ldap"
+else
+  list_add "SEAMONKEY_OPTS" "--disable-ldap"
+fi &&
+
+config_query_multi SEAMONKEY_EXT "What extensions must be built?" \
+                                 default \
+                                 irc &&
+
+config_query_option SEAMONKEY_OPTS "Enable geolocation via WiFi access points?" n \
+                                   "--enable-necko-wifi" \
+                                   "--disable-necko-wifi" &&
+
+config_query_option SEAMONKEY_OPTS "Enable dbus support?" y \
+                                   "--enable-dbus" \
+                                   "--disable-dbus" &&
+
+if list_find "$SEAMONKEY_OPTS" "--enable-dbus"; then
+  list_add "SEAMONKEY_OPTS" "--enable-libnotify"
+else
+  list_add "SEAMONKEY_OPTS" "--disable-libnotify"
+fi &&
+
+config_query_option SEAMONKEY_OPTS "Enable a11y (accessibility) support?" n \
+                                   "--enable-accessibility" \
+                                   "--disable-accessibility" &&
+
+config_query_option SEAMONKEY_OPTS "Remove debugging symbols?" n \
+                                   "--enable-strip" \
+                                   "--disable-strip"
diff --git a/http/seamonkey/DEPENDS b/http/seamonkey/DEPENDS
index df37acb..db0ef86 100755
--- a/http/seamonkey/DEPENDS
+++ b/http/seamonkey/DEPENDS
@@ -1,24 +1,52 @@
-if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
-   depends cairo
+depends JPEG &&
+depends gtk+2 &&
+depends libidl &&
+depends libxft &&
+depends nspr &&
+depends -sub 3.12.x nss &&
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite &&
+depends perl &&
+depends zip &&
+depends zlib &&
+depends libxt &&
+depends libffi &&
+depends libevent &&
+
+if list_find "$SEAMONKEY_OPTS" "--enable-system-cairo"; then
+  depends cairo
+fi &&
+
+if list_find "$SEAMONKEY_OPTS" "--enable-pango"; then
+  depends pango
+fi &&
+
+if list_find "$SEAMONKEY_OPTS" "--enable-ldap"; then
+  depends openldap
+fi &&
+
+if list_find "$SEAMONKEY_OPTS" "--enable-necko-wifi"; then
+  depends wireless_tools
 fi &&
-depends  gtk+2  &&
-depends  JPEG   &&
-depends  libidl  &&
-depends  libxft &&
-depends  nspr &&
-depends  -sub 3.12.x nss &&
-depends  perl  &&
-depends  zip &&
-depends  zlib &&
-depends  libxt &&
-depends  dbus-glib &&
-depends  yasm &&
-depends  autoconf-2.13 &&
-depends  libnotify &&
-
-if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
-   depends pango 
+
+if list_find "$SEAMONKEY_OPTS" "--enable-dbus"; then
+  depends dbus-glib &&
+  depends libnotify
+fi &&
+
+if list_find "$SEAMONKEY_OPTS" "--enable-webm"; then
+  depends yasm &&
+  depends alsa-lib &&
+
+  optional_depends libvpx "" "" "to use system libvpx for WebM support"
+else
+  optional_depends alsa-lib "" "" "for audio support"
+fi &&
+
+if is_depends_enabled $SPELL libvpx; then
+  list_add "SEAMONKEY_OPTS" "--with-system-libvpx"
 fi &&
 
-optional_depends alsa-lib "" "" "for audio support" &&
-optional_depends wireless_tools "" "" "for geolocation via WiFi access points"
+if ! is_depends_enabled $SPELL alsa-lib; then
+  list_add "SEAMONKEY_OPTS" "--disable-ogg" &&
+  list_add "SEAMONKEY_OPTS" "--disable-wave"
+fi
diff --git a/http/seamonkey/DETAILS b/http/seamonkey/DETAILS
index 49a9005..b467b07 100755
--- a/http/seamonkey/DETAILS
+++ b/http/seamonkey/DETAILS
@@ -1,7 +1,7 @@
            SPELL=seamonkey
-         VERSION=2.4.1
+         VERSION=2.5
           SOURCE=$SPELL-$VERSION.source.tar.bz2
-     SOURCE_HASH=sha512:49be011bf106e0b27c29f5efea6b0d813ec837d709820d0f066cba6e4ea42e2171d99b2b535957b5257a4a7ae84870b2290c7192e64e4166017a0f3fb5f5908d
+     SOURCE_HASH=sha512:803259425ab0e75cce61c33f37873a8765bbc2b0e6c70aa1b9b21a9947a732c3dbd4a033a08d779a9a830c990fe30c5ed37b0c36c890722b31319df78d9b9ef1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       SOURCE_URI=seamonkey/releases/$VERSION/source/$SOURCE
    SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/$SOURCE_URI
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 73a07a1..a053c52 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,20 @@
+2011-12-11 Vlad Glagolev <stealth at sourcemage.org>
+	* BUILD: switched to MOZCONFIG var, corrected multijob build; added
+	  missing configure options (pthreads support)
+	* CONFIGURE: added missing options, message about non-working setup
+	* DEPENDS: made dbus support optional
+	* mailnews.patch: updated, for correct detection of a var
+
+2011-12-10 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.5
+	* BUILD: apply required options
+	* CONFIGURE, DEPENDS: rewritten, added missing options and deps
+	* INSTALL: removed extra stuff
+	* PRE_BUILD: removed dirty hacks, apply the patches
+	* blfs-mozconfig: removed
+	* {ldap,mailnews}.patch: added, to fix compilation with and without
+	  different options and deps
+
 2011-11-09 Vlad Glagolev <stealth at sourcemage.org>
 	* DEPENDS: added missing dependency
 
diff --git a/http/seamonkey/INSTALL b/http/seamonkey/INSTALL
index 3f4eb6f..7e1b500 100755
--- a/http/seamonkey/INSTALL
+++ b/http/seamonkey/INSTALL
@@ -1,5 +1,3 @@
-make_normal  &&
-
 MOZILLA_HOME=$INSTALL_ROOT/usr/lib/seamonkey &&
 
 #
@@ -31,7 +29,7 @@ if  test  -f   $INSTALL_ROOT/usr/lib/libnssckbi.so;  then
   if  !  test  -f   $MOZILLA_HOME/libnssckbi.so  ||
          test  -h   $MOZILLA_HOME/libnssckbi.so; then
     ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so  $MOZILLA_HOME/libnssckbi.so
-  fi                                                                  
+  fi
 fi  &&
 if [[ "$SEAMONKEY_NULLPLUGIN" == "n" ]]
 then
diff --git a/http/seamonkey/PRE_BUILD b/http/seamonkey/PRE_BUILD
index 9fff8df..a0bb413 100755
--- a/http/seamonkey/PRE_BUILD
+++ b/http/seamonkey/PRE_BUILD
@@ -3,48 +3,5 @@ cd             $SOURCE_DIRECTORY  &&
 unpack_file    ''                 &&
 cd             comm-release       &&
 
-cp -v $SPELL_DIRECTORY/blfs-mozconfig .mozconfig &&
-
-if [[ "$SEAMONKEY_OFFICIAL" == "y" ]]; then
-   sed -i '78iac_add_options --enable-official-branding' .mozconfig
-fi &&
-
-#This option is broke will not build without mailnews component
-#if [[ "$SEAMONKEY_MAILNEWS" == "n" ]]; then
-#   sed -i '78iac_add_options --disable-mailnews' .mozconfig
-#fi &&
-
-if [[ "$SEAMONKEY_COMPOSER" == "n" ]]; then
-   sed -i '78iac_add_options --disable-composer' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_CAIRO" == "y" ]]; then
-   sed -i '78iac_add_options --enable-system-cairo' .mozconfig
-else
-   sed -i '78iac_add_options --disable-system-cairo' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_PANGO" == "y" ]]; then
-   sed -i '78iac_add_options --enable-pango' .mozconfig
-fi &&
-
-if [[ "$SEAMONKEY_STRIP" == "y" ]]; then
-   sed -i '78iac_add_options --enable-strip' .mozconfig
-fi &&
-
-if is_depends_enabled $SPELL wireless_tools; then
-   sed -i '78iac_add_options --enable-necko-wifi' .mozconfig
-else
-   sed -i '78iac_add_options --disable-necko-wifi' .mozconfig
-fi &&
-
-if ! is_depends_enabled $SPELL alsa-lib; then
-   sed -i '78iac_add_options --disable-ogg' .mozconfig &&
-   sed -i '78iac_add_options --disable-wave' .mozconfig
-fi &&
-
-# GNOME support is broken (at least for download manager)
-echo "ac_add_options --disable-gnomeui" >> .mozconfig &&
-echo "ac_add_options --disable-gnomevfs" >> .mozconfig &&
-
-echo "ac_add_options --disable-crashreporter" >> .mozconfig
+patch -p0 < "$SPELL_DIRECTORY/ldap.patch" &&
+patch -p0 < "$SPELL_DIRECTORY/mailnews.patch"
diff --git a/http/seamonkey/blfs-mozconfig b/http/seamonkey/blfs-mozconfig
deleted file mode 100644
index e2fc65d..0000000
--- a/http/seamonkey/blfs-mozconfig
+++ /dev/null
@@ -1,83 +0,0 @@
-# $LastChangedBy: bdubbs $
-# $Date: 2009-11-04 14:57:47 +0000 (Wed, 04 Nov 2009) $
-#
-# This file contains the options used in the SeaMonkey build. You may
-# need to specify additional options for your specific build needs.
-# Use the information provided by running './configure --help' to
-# help you determine if you need to add any additional options.
-# Some additional options can be added by uncommenting the examples
-# in this file or adding options by inserting a line containing
-# 'ac_add_options --some-option-you-need'.
-
-
-# Create an object directory and specify to build the package in that
-# directory. If desired, modify the location of the object directory
-# to a directory inside the source tree by removing '../' from the
-# line below.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/seamonkey-build
-mk_add_options AUTOCONF=autoconf2.13
-
-# This option is used to specify that the SeaMonkey suite is
-# being built and to use all the default options for SeaMonkey.
-ac_add_options --enable-application=suite
-
-# Specify the installation prefix. If you would prefer SeaMonkey
-# installed in a different prefix, modify the line below to fit
-# your needs. You'll also need to modify some of the instructions in
-# the BLFS book to point to your desired prefix.
-ac_add_options --prefix=/usr
-
-# These options are used so that the SeaMonkey binaries are linked to
-# the system-installed copies of the specified libraries instead of
-# the source tree code which may not be the most recent versions.
-ac_add_options --with-system-zlib
-ac_add_options --without-system-png
-ac_add_options --with-system-jpeg
-
-# This option specifies to include support for rendering the HTML
-# <canvas></canvas> tag in the SeaMonkey browser.
-ac_add_options --enable-canvas
-
-# This option is added so that test libraries and programs are not
-# built. These would only be required for debugging purposes.
-ac_add_options --disable-tests
-
-# This option is added so that the Mozilla Installer program is not
-# built or installed. The program is not required for a BLFS
-# installation of SeaMonkey.
-ac_add_options --disable-installer
-
-# This option is used to disable the a11y support in the SeaMonkey
-# binaries. Comment out this option if you require a11y support.
-ac_add_options --disable-accessibility
-
-# This option is used to enable support for rendering SVG files in the
-# SeaMonkey browser.
-ac_add_options --enable-svg
-
-# This option is used to enable source tree included LDAP support in
-# the SeaMonkey binaries.
-ac_add_options --enable-ldap
-
-# Uncomment this option if you desire support for dual-monitor
-# display of SeaMonkey using the X-Window Xinerama libraries.
-#ac_add_options --enable-xinerama
-
-# Complex scripts such as Thai can only be rendered in SeaMonkey with the
-# help of Pango. This option significantly slows rendering, so only use
-# it if necessary.
-#ac_add_options --enable-pango
-
-# This option identifies the default binary directory of the SeaMonkey
-# installation and is used to locate SeaMonkey's installed files. This
-# option is not required for end-user browsing, and is only used for
-# development purposes.
-ac_add_options --with-default-mozilla-five-home=/usr/lib/seamonkey
-
-# These two options enable support for building SeaMonkey with
-# system-installed versions of the Network Security Services (NSS)
-# and Netscape Portable Runtime (NSPR) libraries. Uncomment both
-# lines to enable support for system-installed NSS/NSPR.
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --enable-crypto
diff --git a/http/seamonkey/ldap.patch b/http/seamonkey/ldap.patch
new file mode 100644
index 0000000..a4ede55
--- /dev/null
+++ b/http/seamonkey/ldap.patch
@@ -0,0 +1,15 @@
+--- bridge/bridge.mk.orig	2011-11-21 14:20:07.000000000 +0400
++++ bridge/bridge.mk	2011-12-10 03:22:55.578752146 +0400
+@@ -38,10 +38,10 @@
+ 
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
+ 
+-#ifdef MOZ_LDAP_XPCOM
++ifdef MOZ_LDAP_XPCOM
+ APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
+-#endif
++endif
+ 
+ #ifdef MOZ_MORK
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork
diff --git a/http/seamonkey/mailnews.patch b/http/seamonkey/mailnews.patch
new file mode 100644
index 0000000..2f402a9
--- /dev/null
+++ b/http/seamonkey/mailnews.patch
@@ -0,0 +1,38 @@
+--- mozilla/configure.orig	2011-11-21 14:29:14.000000000 +0400
++++ mozilla/configure	2011-12-10 16:04:46.337188291 +0400
+@@ -14788,6 +14788,7 @@
+ MOZ_FEEDS=1
+ MOZ_INSTALLER=1
+ MOZ_JSDEBUGGER=1
++MOZ_MAIL_NEWS=
+ MOZ_AUTH_EXTENSION=1
+ MOZ_OGG=1
+ MOZ_RAW=
+@@ -17714,8 +17715,17 @@
+ fi
+ 
+ 
+-
+-
++# Check whether --enable-mailnews or --disable-mailnews was given.
++if test "${enable_mailnews+set}" = set; then
++  enableval="$enable_mailnews"
++  if test "$enableval" = "no"; then
++    MOZ_MAIL_NEWS=
++  elif test "$enableval" = "yes"; then
++    MOZ_MAIL_NEWS=1 
++  else
++    { echo "configure: error: Option, mailnews, does not take an argument ($enableval)." 1>&2; exit 1; }
++  fi
++fi
+ 
+ 
+ # Check whether --enable-crypto or --disable-crypto was given.
+@@ -26203,6 +26213,7 @@
+ s%@MOZ_DFB@%$MOZ_DFB%g
+ s%@MOZ_X11@%$MOZ_X11%g
+ s%@MOZ_UI_LOCALE@%$MOZ_UI_LOCALE%g
++s%@MOZ_MAIL_NEWS@%$MOZ_MAIL_NEWS%g
+ s%@MOZ_OFFICIAL_BRANDING@%$MOZ_OFFICIAL_BRANDING%g
+ s%@MOZ_BRANDING_DIRECTORY@%$MOZ_BRANDING_DIRECTORY%g
+ s%@MOZ_DISTRIBUTION_ID@%$MOZ_DISTRIBUTION_ID%g
diff --git a/libs/iksemel/DETAILS b/libs/iksemel/DETAILS
index 5a9a5a7..a35657e 100755
--- a/libs/iksemel/DETAILS
+++ b/libs/iksemel/DETAILS
@@ -12,10 +12,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
    SOURCE_IGNORE=volatile
 else
 
-         VERSION=1.3
+         VERSION=1.4
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}
-     SOURCE_HASH=sha512:57a0f8d5c3e675419b8d4d04580c144ed20466d1b41ea23006bbb588eead595f189088b3fe559b62d527a2773cc4f92b6c09d19ed7a2b8f446d9ba13546a9d03
+     SOURCE_HASH=sha512:902e326647b63a5e58b1c396a401bdd136ad01ecabca81b543c0ed76ebd8d2110377015fec1be09551b92651ee093e480fa37aa2186f7791147f29e0933852cc
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
 fi
         WEB_SITE="http://code.google.com/p/iksemel/"
diff --git a/libs/iksemel/HISTORY b/libs/iksemel/HISTORY
index f442129..340d253 100644
--- a/libs/iksemel/HISTORY
+++ b/libs/iksemel/HISTORY
@@ -1,2 +1,5 @@
+2011-12-10 Justin Boffemmyer <flux at sourcemage.org>
+	* DETAILS: bump to 1.4
+
 2007-08-11 Martin Spitzbarth <m.spitzbarth at gmx.de>
 	* PREPARE, DETAILS, DEPENDS, PRE_BUILD, HISTORY: created spell
diff --git a/net/nsd/DETAILS b/net/nsd/DETAILS
index ab20e67..964b7ae 100755
--- a/net/nsd/DETAILS
+++ b/net/nsd/DETAILS
@@ -1,9 +1,9 @@
            SPELL=nsd
-         VERSION=3.2.8
+         VERSION=3.2.9
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:ddd2916a8043a509443b6dd111f815ace93479a102441f0b274f5412a365a044d4840f98f5344695322d82f67f215708b2137f32ee17b072610984d3f08b1794
+     SOURCE_HASH=sha512:1146c5ac1035ec2b3421ef8c7bb2eea4505928546678f76f287c0544db9fc449521a26b47a716e57c4ae90f3eb531c02930f07d6aca0e2c74e9e2ee64858f3e3
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.nlnetlabs.nl/projects/nsd/
       LICENSE[0]=BSD
diff --git a/net/nsd/HISTORY b/net/nsd/HISTORY
index a6d312b..78475c8 100644
--- a/net/nsd/HISTORY
+++ b/net/nsd/HISTORY
@@ -1,3 +1,6 @@
+2011-12-10 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 3.2.9
+
 2011-04-26 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 3.2.8
 	* init.d/nsd: fixed pidfile path
diff --git a/video-libs/libdc1394/DETAILS b/video-libs/libdc1394/DETAILS
index 0e86c07..65a3a15 100755
--- a/video-libs/libdc1394/DETAILS
+++ b/video-libs/libdc1394/DETAILS
@@ -1,12 +1,12 @@
            SPELL=libdc1394
-         VERSION=2.1.2
-     SOURCE_HASH=sha512:e4e302e22b9d1434a3a41aa55e579868315c3b15d680bbbf66e652e99f6466d0a0951e2c8a83af91270755bb37c54eceb6b12751d5848c2e5ab11bd63bd1f560
+         VERSION=2.1.4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-      LICENSE[0]=LGPL
-        WEB_SITE=http://sourceforge.net/projects/libdc1394
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
    SOURCE_URL[1]=$KERNEL_URL/pub/linux/libs/ieee1394/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+      LICENSE[0]=LGPL
+        WEB_SITE=http://sourceforge.net/projects/libdc1394
          ENTERED=20020125
         KEYWORDS="video libs"
            SHORT="library to control IEEE 1394 based cameras"
diff --git a/video-libs/libdc1394/HISTORY b/video-libs/libdc1394/HISTORY
index ba0f906..38fb617 100644
--- a/video-libs/libdc1394/HISTORY
+++ b/video-libs/libdc1394/HISTORY
@@ -1,3 +1,6 @@
+2011-12-09 Robin Cook <rcook at wyrms.net>
+	* DETAILS: updated VERSION to 2.1.4
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/video-libs/libdc1394/libdc1394-2.1.4.tar.gz.sig b/video-libs/libdc1394/libdc1394-2.1.4.tar.gz.sig
new file mode 100644
index 0000000..e3f8e62
Binary files /dev/null and b/video-libs/libdc1394/libdc1394-2.1.4.tar.gz.sig differ


More information about the SM-Commit mailing list