Start removing pre-3.0 gmime support?

classic Classic list List threaded Threaded
3 messages Options
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

Start removing pre-3.0 gmime support?

I'm not sure if we want to do this yet (3.0.3 was released in October
2017), but if we do, we could start like this.

d

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

[RFC 1/2] doc: update INSTALL to require GMime 3.0

This is the first step of removing support for pre 3.0 GMime.

This will allow us to spend less developement time ifdefing for
missing features in old GMime. It will also reduce the likelyhood of
bitrot in unused code paths.
---
 INSTALL | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index 6e6f4799..55c22167 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ configure stage.
 
 Dependencies
 ------------
-Notmuch depends on four libraries: Xapian, GMime 2.6,
+Notmuch depends on four libraries: Xapian, GMime,
 Talloc, and zlib which are each described below:
 
  Xapian
@@ -46,6 +46,9 @@ Talloc, and zlib which are each described below:
  Without GMime, Notmuch would not be able to extract and index
  the actual text from email message encoded as BASE64, etc.
 
+        This version of Notmuch needs GMime no older than 3.0.0 (April
+        2017).
+
  GMime is available from https://github.com/jstedfast/gmime
 
  Talloc
@@ -95,7 +98,7 @@ dependencies with a single simple command line. For example:
 
   For Fedora and similar:
 
- sudo yum install xapian-core-devel gmime-devel libtalloc-devel zlib-devel python3-sphinx texinfo info
+ sudo yum install xapian-core-devel gmime30-devel libtalloc-devel zlib-devel python3-sphinx texinfo info
 
 On other systems, a similar command can be used, but the details of
 the package names may be different.
--
2.17.0

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

[RFC 2/2] configure: Drop GMime 2.6 support

In reply to this post by David Bremner-2
There is still plenty of potential simplification here.
---
 configure | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/configure b/configure
index 3cefdcc6..154a4a60 100755
--- a/configure
+++ b/configure
@@ -478,30 +478,16 @@ EOF
     rm -rf test.db _default_backend _default_backend.cc
 fi
 
-# we need to have a version >= 2.6.5 to avoid a crypto bug. We need
-# 2.6.7 for permissive "From " header handling.
-GMIME_MINVER=2.6.7
-GMIME3_MINVER=3.0.3
+GMIME_MINVER=3.0.3
 
 printf "Checking for GMime development files... "
-if pkg-config --exists "gmime-3.0 > $GMIME3_MINVER"; then
-    printf "Yes (3.0).\n"
+if pkg-config --exists "gmime-3.0 > $GMIME_MINVER"; then
+    printf "Yes.\n"
     have_gmime=1
     gmime_cflags=$(pkg-config --cflags gmime-3.0)
     gmime_ldflags=$(pkg-config --libs gmime-3.0)
     gmime_major=3
     have_gmime_session_keys=1
-elif pkg-config --exists "gmime-2.6 >= $GMIME_MINVER"; then
-    printf "Yes (2.6).\n"
-    have_gmime=1
-    gmime_cflags=$(pkg-config --cflags gmime-2.6)
-    gmime_ldflags=$(pkg-config --libs gmime-2.6)
-    gmime_major=2
-    if pkg-config --exists "gmime-2.6 >= 2.6.21"; then
-        have_gmime_session_keys=1
-    else
-        have_gmime_session_keys=0
-    fi
 else
     have_gmime=0
     have_gmime_session_keys=0
@@ -757,7 +743,7 @@ EOF
  echo
     fi
     if [ $have_gmime -eq 0 ]; then
- echo " GMime 2.6 library >= $GMIME_MINVER"
+ echo " GMime library >= $GMIME_MINVER"
  echo " (including development files such as headers)"
  echo " https://github.com/jstedfast/gmime/"
  echo
@@ -779,7 +765,7 @@ case a simple command will install everything you need. For example:
 
 On Debian and similar systems:
 
- sudo apt-get install libxapian-dev libgmime-2.6-dev libtalloc-dev zlib1g-dev
+ sudo apt-get install libxapian-dev libgmime-3.0-dev libtalloc-dev zlib1g-dev
 
 Or on Fedora and similar systems:
 
--
2.17.0

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch