[Lunar-commits] r15227 - moonbase/trunk/mail/thunderbird

Moritz Heiber moe at lunar-linux.org
Thu Jun 2 13:48:11 UTC 2005


Author: moe
Date: 2005-06-02 13:48:10 +0000 (Thu, 02 Jun 2005)
New Revision: 15227

Added:
   moonbase/trunk/mail/thunderbird/PRE_BUILD
Modified:
   moonbase/trunk/mail/thunderbird/BUILD
   moonbase/trunk/mail/thunderbird/DEPENDS
   moonbase/trunk/mail/thunderbird/DETAILS
   moonbase/trunk/mail/thunderbird/POST_INSTALL
   moonbase/trunk/mail/thunderbird/POST_REMOVE
Log:
Alright ..

* Added enigmail support if gnupg is installed
* Properly use the integrated gnome support
* RSS support works now (!!!)
* Moved installation into BUILD (.desktop and .xpm files)

Overall, thunderbird got somewhat faster (I think) .. and
of course the rss support .. I win.



Modified: moonbase/trunk/mail/thunderbird/BUILD
===================================================================
--- moonbase/trunk/mail/thunderbird/BUILD	2005-06-02 13:12:13 UTC (rev 15226)
+++ moonbase/trunk/mail/thunderbird/BUILD	2005-06-02 13:48:10 UTC (rev 15227)
@@ -1,41 +1,94 @@
 ( 
+  if module_is_expired $MODULE ; then
+        set_module_config OLD_VER "`installed_version $MODULE`"
+  fi &&
+  
   MOZILLA_HOME=/usr/lib/$MODULE-$VERSION 
-  
-  OPTS="$OPTS --enable-application=mail"
-  OPTS="$OPTS --disable-mathml"
-  OPTS="$OPTS --disable-installer"
-  OPTS="$OPTS --disable-activex"
-  OPTS="$OPTS --disable-activex-scripting"
-  OPTS="$OPTS --enable-xft"
-  OPTS="$OPTS --disable-oji"
-  OPTS="$OPTS --disable-necko-disk-cache"
-  OPTS="$OPTS --disable-profilesharing --enable-single-profile"
-  OPTS="$OPTS --enable-extensions=wallet,spellcheck,xmlextras,webservices,-irc,-venkman"
-  OPTS="$OPTS --enable-necko-protocols=http,file,jar,viewsource,res,data"
-  OPTS="$OPTS --enable-image-decoders=default,-xbm"
-  
+  MOZ_EXTENSIONS="wallet,spellcheck,xmlextras,webservices"
+  NECKO_PROT="http,file,jar,viewsource,res,data"
+
+  if in_depends heimdal ; then
+	MOZ_EXTENSIONS="${MOZ_EXTENSIONS},negotiateauth"
+  else
+	MOZ_EXTENSIONS="${MOZ_EXTENSIONS},-negotiateauth"
+  fi &&
+
+  export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
   export MOZ_THUNDERBIRD=1
+  export MOZILLA_OFFICIAL=1
   export BUILD_OFFICIAL=1
-  export MOZ_CO_PROJECT=mail
 
-    ./configure \
-    --prefix=/usr	 \
-    --with-x             \
-    --with-pthreads      \
-    --enable-reorder     \
-    --enable-cpp-rtti    \
+  ./configure 		\
+    --prefix=/usr	\
+    --with-x            \
+    --with-pthreads     \
+    --with-default-mozilla-five-home=$MOZILLA_HOME \
+    --with-user-appdir=".thunderbird"       \
+    --with-system-zlib	\
+    --with-system-png   \
+    --with-system-jpeg  \
+    --enable-necko-protocols=${NECKO_PROT}	\
+    --enable-extensions=${MOZ_EXTENSIONS}	\
+    --enable-xft	\
+    --enable-single-profile	\
+    --enable-application=mail	\
+    --enable-default-toolkit=gtk2       \
+    --enable-reorder    \
+    --enable-cpp-rtti   \
     --enable-optimize="$CFLAGS"   \
-    --with-default-mozilla-five-home=$MOZILLA_HOME \
-    --disable-debug      \
-    --disable-tests      \
-    --disable-pedantic   \
-    --disable-toolkit-gtk  \
-    --enable-default-toolkit=gtk2  \
-    --with-gtk2          \
-    --enable-crypto      \
-    --enable-optimize	 \
+    --enable-crypto     \
+    --enable-strip	\
+    --enable-strip-libs \
+    --enable-xterm-updates	\
+    --enable-svg	\
+    --enable-svg-renderer-cairo	\
+    --enable-plaintext-editor-only	\
+    --enable-image-decoders=default,-xbm	\
+    --disable-debug     \
+    --disable-tests     \
+    --disable-oji	\
+    --disable-plugins	\
+    --disable-necko-disk-cache	\
+    --disable-installer \
+    --disable-pedantic  \
+    --disable-logging	\
+    --disable-accessibility	\
+    --disable-freetype2	\
+    --disable-ldap	\
+    --disable-profilesharing	\
+    --disable-mathml	\
     $OPTS               &&
               
-    default_make
+    make	&&
+    prepare_install &&
+    make install &&
 
+    if module_installed gnupg ; then
+      build/autoconf/make-makefile extensions/ipc \
+                extensions/enigmail
+      make -C extensions/ipc
+      make -C extensions/enigmail
+      make -C extensions/ipc install 
+      make -C extensions/enigmail install
+    fi
+
+    # Needed for rss support
+    install -d $MOZILLA_HOME/defaults/isp/US &&
+    install -m644 $SOURCE_DIRECTORY/mail/extensions/newsblog/rss.rdf \
+		  $MOZILLA_HOME/defaults/isp &&
+    install -m644 $SOURCE_DIRECTORY/mail/extensions/newsblog/rss.rdf \
+                  $MOZILLA_HOME/defaults/isp/US &&
+
+    # Put some important headers in place
+    install -d /usr/include/$MODULE-$VERSION/nss &&
+    cp -Lf dist/private/nss/*.h dist/public/nss/*.h \
+    		/usr/include/$MODULE-$VERSION/nss &&
+
+    # Now the .desktop file and the icon
+    install -d /usr/share/applications /usr/share/pixmaps &&
+    install -m644 $SOURCE_CACHE/$SOURCE4 /usr/share/applications
+    rm -f /usr/share/pixmaps/thunderbird.xpm &&
+    install -m644 $MOZILLA_HOME/icons/default.xpm \
+		  /usr/share/pixmaps/thunderbird.xpm
+
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/mail/thunderbird/DEPENDS
===================================================================
--- moonbase/trunk/mail/thunderbird/DEPENDS	2005-06-02 13:12:13 UTC (rev 15226)
+++ moonbase/trunk/mail/thunderbird/DEPENDS	2005-06-02 13:48:10 UTC (rev 15227)
@@ -1,7 +1,18 @@
-depends libmng &&
-depends ORBit2 &&
-depends	zip &&
-depends	unzip &&
-depends gtk+-2 &&
+depends libmng	&&
+depends libIDL 	&&
+depends expat	&&
+depends	zip	&&
+depends	unzip	&&
+depends gtk+-2	&&
+depends cairo	&&
 
-optional_depends "gnupg" "" "" "for encrypted email"
+optional_depends "gnupg" "" "" "for encrypted email" &&
+
+optional_depends "gnome-vfs2" "" \
+                 "--disable-gnome --disable-gnomevfs" \
+                 "for Gnome VFS support" &&
+
+optional_depends heimdal \
+                 "--with-gssapi=/usr/include/heimdal" \
+                 "" \
+                 "Heimdal GSSAPI Support"

Modified: moonbase/trunk/mail/thunderbird/DETAILS
===================================================================
--- moonbase/trunk/mail/thunderbird/DETAILS	2005-06-02 13:12:13 UTC (rev 15226)
+++ moonbase/trunk/mail/thunderbird/DETAILS	2005-06-02 13:48:10 UTC (rev 15227)
@@ -1,18 +1,25 @@
           MODULE=thunderbird
          VERSION=1.0.2
           SOURCE=thunderbird-$VERSION-source.tar.bz2
-	 SOURCE2=thunderbird.desktop
+	 SOURCE2=enigmail-0.90.1.tar.gz
+	 SOURCE3=ipc-1.1.2.tar.gz
+	 SOURCE4=thunderbird.desktop
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/mozilla
    SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/$MODULE/releases/$VERSION/source/
    SOURCE_URL[1]=http://archive.progeny.com/mozilla.org/$MODULE/releases/$VERSION/source/
+     SOURCE2_URL=http://downloads.mozdev.org/enigmail/src/
+     SOURCE3_URL=http://downloads.mozdev.org/enigmail/src/
+     SOURCE4_URL=$PATCH_URL/
       SOURCE_VFY=sha1:25dbc24b632f7e8b4c730e94d0472020b34d88ea
-     SOURCE2_URL=$PATCH_URL/
-     SOURCE2_VFY=sha1:a76c4e25bf4e491014c5bafbb07de096248a9931
+     SOURCE2_VFY=sha1:b904677dc7d621989a6f2f831bde832bab3b86ba
+     SOURCE3_VFY=sha1:e937e12cd7167172aefc51898c7d89cab5707a4b
+     SOURCE4_VFY=sha1:a76c4e25bf4e491014c5bafbb07de096248a9931
 	WEB_SITE=http://www.mozilla.org/projects/thunderbird
          ENTERED=20031021
          UPDATED=20050322
-           SHORT="Mozilla Thunderbird is a full-featured mail client"
-PSAFE=no
+           SHORT="A full-featured mail client"
+	   PSAFE=no
+
 cat << EOF
 Thunderbird includes:
 

Modified: moonbase/trunk/mail/thunderbird/POST_INSTALL
===================================================================
--- moonbase/trunk/mail/thunderbird/POST_INSTALL	2005-06-02 13:12:13 UTC (rev 15226)
+++ moonbase/trunk/mail/thunderbird/POST_INSTALL	2005-06-02 13:48:10 UTC (rev 15227)
@@ -1,6 +1,11 @@
+OLD_VER="$(get_module_config OLD_VER)"
 TBIRD_HOME=/usr
 TBIRD_LIBDIR=thunderbird-$VERSION
 
+if [ ! -z $OLD_VER ]; then
+  rm -rf /usr/lib/firefox-$OLD_VER
+fi
+
 # No more linking workarounds
 export LD_LIBRARY_PATH="$TBIRD_HOME/lib/$TBIRD_LIBDIR:$TBIRD_HOME/lib/$TBIRD_LIBDIR/plugins:$TBIRD_HOME/lib/$TBIRD_LIBDIR/components"
 export MOZILLA_FIVE_HOME="$TBIRD_HOME/lib/$TBIRD_LIBDIR"
@@ -12,8 +17,3 @@
 cd $TBIRD_HOME/lib/$TBIRD_LIBDIR
 ./regxpcom
 ./regchrome
-
-# Put the .desktop file in place
-
-cp -f $SOURCE_CACHE/$SOURCE2 /usr/share/applications
-cp -f $TBIRD_HOME/lib/$MODULE-$VERSION/icons/mozicon50.xpm /usr/share/pixmaps 

Modified: moonbase/trunk/mail/thunderbird/POST_REMOVE
===================================================================
--- moonbase/trunk/mail/thunderbird/POST_REMOVE	2005-06-02 13:12:13 UTC (rev 15226)
+++ moonbase/trunk/mail/thunderbird/POST_REMOVE	2005-06-02 13:48:10 UTC (rev 15227)
@@ -1,2 +1 @@
-rm -f /usr/share/applications/thunderbird.desktop
 rm -rf /usr/lib/thunderbird-$VERSION

Added: moonbase/trunk/mail/thunderbird/PRE_BUILD
===================================================================
--- moonbase/trunk/mail/thunderbird/PRE_BUILD	2005-06-02 13:12:13 UTC (rev 15226)
+++ moonbase/trunk/mail/thunderbird/PRE_BUILD	2005-06-02 13:48:10 UTC (rev 15227)
@@ -0,0 +1,8 @@
+default_pre_build &&
+
+cd $SOURCE_DIRECTORY/extensions &&
+unpack $SOURCE2 &&
+unpack $SOURCE3 &&
+
+cd $SOURCE_DIRECTORY
+



More information about the Lunar-commits mailing list