[SM-Commit] GIT changes to master grimoire by Eric Sandall (f976dc7a8550860360031889122c14376465743b)

Eric Sandall scm at sourcemage.org
Tue Dec 22 14:10:53 EST 2009


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

 ChangeLog                                                                  |    5 ++
 dev/null                                                                   |binary
 gnome2-apps/evolution/DETAILS                                              |    2 
 gnome2-apps/evolution/HISTORY                                              |    3 +
 gnome2-apps/evolution/evolution-2.28.1.tar.bz2.sig                         |    0 
 gnome2-apps/evolution/evolution-2.28.2.tar.bz2.sig                         |binary
 gnome2-libs/evolution-data-server/DETAILS                                  |    2 
 gnome2-libs/evolution-data-server/HISTORY                                  |    3 +
 gnome2-libs/evolution-data-server/evolution-data-server-2.28.1.tar.bz2.sig |    0 
 gnome2-libs/evolution-data-server/evolution-data-server-2.28.2.tar.bz2.sig |binary
 gnome2-libs/evolution-exchange/DETAILS                                     |    2 
 gnome2-libs/evolution-exchange/HISTORY                                     |    3 +
 gnome2-libs/evolution-exchange/evolution-exchange-2.28.1.tar.bz2.sig       |    0 
 gnome2-libs/evolution-exchange/evolution-exchange-2.28.2.tar.bz2.sig       |binary
 mail/thunderbird/BUILD                                                     |   11 +----
 mail/thunderbird/CONFIGURE                                                 |    2 
 mail/thunderbird/DEPENDS                                                   |   15 ++++--
 mail/thunderbird/DETAILS                                                   |   16 -------
 mail/thunderbird/HISTORY                                                   |   22 ++++++++++
 mail/thunderbird/INSTALL                                                   |    7 ---
 mail/thunderbird/PREPARE                                                   |    1 
 mail/thunderbird/PRE_BUILD                                                 |   12 -----
 mail/thunderbird/enigmail.gpg                                              |    0 
 mail/thunderbird/mozilla.gpg                                               |    0 
 mail/thunderbird/thunderbird-2.0-visibility.patch                          |   14 ------
 mozilla.gpg                                                                |binary
 26 files changed, 57 insertions(+), 63 deletions(-)

New commits:
commit f976dc7a8550860360031889122c14376465743b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    thunderbird: Updated to 3.0
    SOURCE uses .source instead of -source
    Removed Enigmail, install Add-on instead from
    https://addons.mozilla.org/en-US/thunderbird/addon/71
    Use top-level mozilla.gpg
    New flags for using cairo
    Optionally depends on startup-notification
    Extracts to comm-1.9.1 instead of mozilla
    Do not apply thunderbird-2.0-visibility.patch
    Now requires "--enable-static" to build:
      Makefile:98: * you need an "--enable-static" build to package a build.
    Remove $THUNDERBIRD_HOME/chrome/app-chrome.manifest before install
    regxpcom is no longer installed, use the one in SOURCE_DIRECTORY

commit 5201dd14257c79bc7b7f2baee6bc5e16ee01201b
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    evolution-exchange: Updated to 2.28.2

commit 98b8ae5dba507aed955e579ecd4ec35b1293db43
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    evolution: Updated to 2.28.2

commit b34b0f67e8cf5eae7b5c76660ae8c92bf09ada21
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    evolution-data-server: Updated to 2.28.2

commit 15c2df9dd89208f8daa0e08b01eb40d267aeebb7
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mozilla.gpg: Added 0x6CE2996F
    Verified from
    http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0/KEY
    and subkeys.pgp.net

diff --git a/ChangeLog b/ChangeLog
index 752fafb..f58e868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22 Eric Sandall <sandalle at sourcemage.org>
+	* mozilla.gpg: Added 0x6CE2996F
+	Verified fromhttp://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0/KEY
+	and subkeys.pgp.net
+
 2009-12-18 Arjan Bouter <abouter at sourcemage.org>
 	* wm-addons/sawfish-pager: new spell, sawfish's native pager
 	* libs/libvterm: new spell, terminal emulator library
diff --git a/gnome2-apps/evolution/DETAILS b/gnome2-apps/evolution/DETAILS
index a30c9f6..3e124f6 100755
--- a/gnome2-apps/evolution/DETAILS
+++ b/gnome2-apps/evolution/DETAILS
@@ -1,5 +1,5 @@
 	   SPELL=evolution
-         VERSION=2.28.1
+         VERSION=2.28.2
           BRANCH=${VERSION:0:4}
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/evolution/HISTORY b/gnome2-apps/evolution/HISTORY
index 60d4309..3b334c2 100644
--- a/gnome2-apps/evolution/HISTORY
+++ b/gnome2-apps/evolution/HISTORY
@@ -1,3 +1,6 @@
+2009-12-22 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 2.28.2
+
 2009-11-24 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: gnome-doc-utils is again required, not optional
 	  Depends on gnome-desktop
diff --git a/gnome2-apps/evolution/evolution-2.28.1.tar.bz2.sig b/gnome2-apps/evolution/evolution-2.28.1.tar.bz2.sig
deleted file mode 100644
index f525a27..0000000
Binary files a/gnome2-apps/evolution/evolution-2.28.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-apps/evolution/evolution-2.28.2.tar.bz2.sig b/gnome2-apps/evolution/evolution-2.28.2.tar.bz2.sig
new file mode 100644
index 0000000..4a4a824
Binary files /dev/null and b/gnome2-apps/evolution/evolution-2.28.2.tar.bz2.sig differ
diff --git a/gnome2-libs/evolution-data-server/DETAILS b/gnome2-libs/evolution-data-server/DETAILS
index 45b435c..2887ea0 100755
--- a/gnome2-libs/evolution-data-server/DETAILS
+++ b/gnome2-libs/evolution-data-server/DETAILS
@@ -1,5 +1,5 @@
            SPELL=evolution-data-server
-         VERSION=2.28.1
+         VERSION=2.28.2
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-data-server/HISTORY b/gnome2-libs/evolution-data-server/HISTORY
index 0a25b03..877acd9 100644
--- a/gnome2-libs/evolution-data-server/HISTORY
+++ b/gnome2-libs/evolution-data-server/HISTORY
@@ -1,3 +1,6 @@
+2009-12-22 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 2.28.2
+
 2009-10-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.28.1
 
diff --git a/gnome2-libs/evolution-data-server/evolution-data-server-2.28.1.tar.bz2.sig b/gnome2-libs/evolution-data-server/evolution-data-server-2.28.1.tar.bz2.sig
deleted file mode 100644
index 02b5c66..0000000
Binary files a/gnome2-libs/evolution-data-server/evolution-data-server-2.28.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/evolution-data-server/evolution-data-server-2.28.2.tar.bz2.sig b/gnome2-libs/evolution-data-server/evolution-data-server-2.28.2.tar.bz2.sig
new file mode 100644
index 0000000..8d107b6
Binary files /dev/null and b/gnome2-libs/evolution-data-server/evolution-data-server-2.28.2.tar.bz2.sig differ
diff --git a/gnome2-libs/evolution-exchange/DETAILS b/gnome2-libs/evolution-exchange/DETAILS
index 72f6644..6bd11a6 100755
--- a/gnome2-libs/evolution-exchange/DETAILS
+++ b/gnome2-libs/evolution-exchange/DETAILS
@@ -1,5 +1,5 @@
 	   SPELL=evolution-exchange
-         VERSION=2.28.1
+         VERSION=2.28.2
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/evolution-exchange/HISTORY b/gnome2-libs/evolution-exchange/HISTORY
index b8e68bd..4c3bf30 100644
--- a/gnome2-libs/evolution-exchange/HISTORY
+++ b/gnome2-libs/evolution-exchange/HISTORY
@@ -1,3 +1,6 @@
+2009-12-22 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 2.28.2
+
 2009-10-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.28.1
 
diff --git a/gnome2-libs/evolution-exchange/evolution-exchange-2.28.1.tar.bz2.sig b/gnome2-libs/evolution-exchange/evolution-exchange-2.28.1.tar.bz2.sig
deleted file mode 100644
index a89eba4..0000000
Binary files a/gnome2-libs/evolution-exchange/evolution-exchange-2.28.1.tar.bz2.sig and /dev/null differ
diff --git a/gnome2-libs/evolution-exchange/evolution-exchange-2.28.2.tar.bz2.sig b/gnome2-libs/evolution-exchange/evolution-exchange-2.28.2.tar.bz2.sig
new file mode 100644
index 0000000..e73372b
Binary files /dev/null and b/gnome2-libs/evolution-exchange/evolution-exchange-2.28.2.tar.bz2.sig differ
diff --git a/mail/thunderbird/BUILD b/mail/thunderbird/BUILD
index ec39237..6f73593 100755
--- a/mail/thunderbird/BUILD
+++ b/mail/thunderbird/BUILD
@@ -1,4 +1,4 @@
-cd  $SOURCE_DIRECTORY/mozilla  &&
+cd  $SOURCE_DIRECTORY/comm-1.9.1  &&
 
 THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
 export  MOZ_THUNDERBIRD="1"   &&
@@ -32,12 +32,7 @@ fi
 ./configure --prefix=${INSTALL_ROOT}/usr     \
             --with-user-appdir=.thunderbird  \
             --enable-application=mail        \
-            --enable-optimize="$CFLAGS"      \
+            --enable-static                  \
               $OPTS                          &&
 
-make  &&
-
-if [[ "$BUILD_ENIGMAIL" == 'y' ]]; then
-   build/autoconf/make-makefile mailnews/extensions/enigmail &&
-   make -C mailnews/extensions/enigmail
-fi
+make
diff --git a/mail/thunderbird/CONFIGURE b/mail/thunderbird/CONFIGURE
index cae6196..34f2348 100755
--- a/mail/thunderbird/CONFIGURE
+++ b/mail/thunderbird/CONFIGURE
@@ -1,4 +1,2 @@
-config_query  BUILD_ENIGMAIL  "Build enigmail?"  y
-
 config_query THUNDERBIRD_OFFICIAL "Enable official branding? If enabled, you may \
 be restricted in distributing these binaries IAW mozilla policies" n
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index e9559ec..14a9d6e 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -23,8 +23,13 @@ optional_depends  gnome-vfs2              \
                   "--disable-gnomevfs"    \
                   "for GnomeVFS support"  &&
 
-optional_depends  cairo                                       \
-                  "--enable-system-cairo                      \
-                   --enable-svg --enable-svg-renderer=cairo"  \
-                  ""                                          \
-                  "for native SVG rendering"
+optional_depends  cairo                                  \
+                  "--enable-system-cairo                 \
+                   --enable-default-toolkit=cairo-gtk2"  \
+                  ""                                     \
+                  "for native SVG rendering"             &&
+
+optional_depends  startup-notification  \
+                  '--enable-startup-notification' \
+                  '--disable-startup-notification' \
+                  'for startup notifications'
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index 4a0b780..2313a4b 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,24 +1,12 @@
            SPELL=thunderbird
-         VERSION=2.0.0.23
-          SOURCE=$SPELL-$VERSION-source.tar.bz2
+         VERSION=3.0
+          SOURCE=$SPELL-$VERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG="mozilla.gpg:$SOURCE2:UPSTREAM_KEY"
 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
-if  [ "$BUILD_ENIGMAIL" = "y" ];  then
-ENIGMAIL_VERSION=0.96.0
-      PATCHLEVEL=2
-         SOURCE3=enigmail-$ENIGMAIL_VERSION.tar.gz
-         SOURCE4=${SOURCE3}.asc
-  SOURCE4_IGNORE=signature
-     SOURCE3_GPG="enigmail.gpg:$SOURCE4:UPSTREAM_KEY"
-  SOURCE3_URL[0]=http://www.mozilla-enigmail.org/download/source/$SOURCE3
-  SOURCE4_URL[0]=${SOURCE3_URL}.asc
-      LICENSE[1]=MPL
-      LICENSE[2]=MPL
-fi
   SECURITY_PATCH=16
         WEB_SITE=http://www.mozilla.org/products/thunderbird/
          ENTERED=20041028
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 7212c82..bd9a2e2 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,25 @@
+2009-12-22 Eric Sandall <sandalle at sourcemage.org>
+	* PREPARE: Removed, unused
+	* DETAILS: Updated to 3.0
+	  SOURCE uses .source instead of -source
+	  Removed Enigmail, install Add-on instead from
+	  https://addons.mozilla.org/en-US/thunderbird/addon/71
+	* mozilla.gpg: Removed, use top-level mozilla.gpg
+	* CONFIGURE: Removed Enigmail
+	* DEPENDS: New flags for using cairo
+	  Optionally depends on startup-notification
+	* PRE_BUILD: Extracts to comm-1.9.1 instead of mozilla
+	  Removed Enigmail
+	  Do not apply thunderbird-2.0-visibility.patch
+	* BUILD: Extracts to comm-1.9.1 instead of mozilla
+	  Removed Enigmail
+	  Now requires "--enable-static" to build:
+	  Makefile:98: * you need an "--enable-static" build to package a build.
+	* INSTALL: Removed Enigmail
+	  Remove $THUNDERBIRD_HOME/chrome/app-chrome.manifest before install
+	  regxpcom is no longer installed, use the one in SOURCE_DIRECTORY
+	* thunderbird-2.0-visibility.patch: Removed
+
 2009-09-05 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated to version 2.0.0.23. SECURITY_PATCH++
 	* PRE_BUILD: Added patch to fix build.
diff --git a/mail/thunderbird/INSTALL b/mail/thunderbird/INSTALL
index c3035ef..d77dc14 100755
--- a/mail/thunderbird/INSTALL
+++ b/mail/thunderbird/INSTALL
@@ -2,16 +2,13 @@ THUNDERBIRD_HOME=${INSTALL_ROOT}/usr/lib/thunderbird &&
 mkdir -p $THUNDERBIRD_HOME &&
 ln -s $THUNDERBIRD_HOME $THUNDERBIRD_HOME-$VERSION &&
 
+rm -f $THUNDERBIRD_HOME/chrome/app-chrome.manifest &&
 make install &&
 
-if [ "$BUILD_ENIGMAIL" == "y" ]; then
-  make -C mailnews/extensions/enigmail install
-fi &&
-
 cd ${INSTALL_ROOT}/usr/lib/thunderbird &&
 export LD_LIBRARY_PATH="$THUNDERBIRD_HOME" &&
 export MOZILLA_FIVE_HOME="$THUNDERBIRD_HOME" &&
-./regxpcom &&
+$SOURCE_DIRECTORY/comm-1.9.1/mozilla/dist/bin/regxpcom &&
 touch `find . -name *.rdf` &&
 
 
diff --git a/mail/thunderbird/PREPARE b/mail/thunderbird/PREPARE
deleted file mode 100755
index c76ce1d..0000000
--- a/mail/thunderbird/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-#config_query  CRYPTO  "Enable enigmail encryption?"  y
diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 7d3fa83..d0c048e 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -1,14 +1,4 @@
 mk_source_dir  $SOURCE_DIRECTORY  &&
 cd             $SOURCE_DIRECTORY  &&
 unpack_file    ''                 &&
-cd             mozilla            &&
-
-cp  mail/config/mozconfig  .mozconfig  &&
-
-
-patch -p1 < $SCRIPT_DIRECTORY/thunderbird-2.0-visibility.patch &&
-
-if  [ "$BUILD_ENIGMAIL" = "y" ];  then
-  cd  mailnews/extensions  &&
-  unpack_file  3
-fi
+cd             comm-1.9.1
diff --git a/mail/thunderbird/enigmail.gpg b/mail/thunderbird/enigmail.gpg
deleted file mode 100644
index 5d436a4..0000000
Binary files a/mail/thunderbird/enigmail.gpg and /dev/null differ
diff --git a/mail/thunderbird/mozilla.gpg b/mail/thunderbird/mozilla.gpg
deleted file mode 100644
index 717c8f8..0000000
Binary files a/mail/thunderbird/mozilla.gpg and /dev/null differ
diff --git a/mail/thunderbird/thunderbird-2.0-visibility.patch b/mail/thunderbird/thunderbird-2.0-visibility.patch
deleted file mode 100644
index 9144aaa..0000000
--- a/mail/thunderbird/thunderbird-2.0-visibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mozilla/configure.vis	2009-08-19 14:43:58.000000000 +0200
-+++ mozilla/configure	2009-08-19 15:15:11.000000000 +0200
-@@ -8015,7 +8015,7 @@ EOF
-                       if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
-                         if egrep '\.(hidden|extern_private).*foo_hidden' conftest.s >/dev/null; then
-                           if ! egrep '\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then
--                            ac_cv_visibility_pragma=yes
-+                            ac_cv_visibility_pragma=no
-                           fi
-                         fi
-                       fi
-
-
-
diff --git a/mozilla.gpg b/mozilla.gpg
index ac6f678..5ca3154 100644
Binary files a/mozilla.gpg and b/mozilla.gpg differ



More information about the SM-Commit mailing list