[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (1ea3fa0e7aedbe3bf3cf11dc7b5e74619a045bb3)

Ladislav Hagara scm at sourcemage.org
Sat Oct 4 15:55:45 EDT 2008


GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 mail/claws-mail-extra-plugins/CONFIGURE |    1 
 mail/claws-mail-extra-plugins/DETAILS   |    2 
 mail/claws-mail-extra-plugins/HISTORY   |    4 +
 mail/claws-mail/DETAILS                 |    2 
 mail/claws-mail/HISTORY                 |    4 +
 mail/claws-mail/PRE_BUILD               |    3 -
 mail/claws-mail/claws-mail-gtk.patch    |   74 --------------------------------
 7 files changed, 10 insertions(+), 80 deletions(-)

New commits:
commit 1ea3fa0e7aedbe3bf3cf11dc7b5e74619a045bb3
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    claws-mail-extra-plugins 3.6.0

commit eb21abea31f8199847436b9080f9d3bbcf0f1d16
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    claws-mail 3.6.0

diff --git a/mail/claws-mail-extra-plugins/CONFIGURE b/mail/claws-mail-extra-plugins/CONFIGURE
index cce95b3..a54602b 100755
--- a/mail/claws-mail-extra-plugins/CONFIGURE
+++ b/mail/claws-mail-extra-plugins/CONFIGURE
@@ -11,7 +11,6 @@ SYLPHEED_CLAWS_EXTRA_PLUGINS="acpi_notifier        \
                               notification_plugin  \
                               perl_plugin          \
                               rssyl                \
-                              smime                \
                               spam_report          \
                               synce_plugin         \
                               tnef_parse           \
diff --git a/mail/claws-mail-extra-plugins/DETAILS b/mail/claws-mail-extra-plugins/DETAILS
index fc0d586..060e03b 100755
--- a/mail/claws-mail-extra-plugins/DETAILS
+++ b/mail/claws-mail-extra-plugins/DETAILS
@@ -1,5 +1,5 @@
            SPELL=claws-mail-extra-plugins
-         VERSION=3.5.0
+         VERSION=3.6.0
           SOURCE=$SPELL-$VERSION.tar.bz2
       SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
          SOURCE2=${SOURCE}.asc
diff --git a/mail/claws-mail-extra-plugins/HISTORY b/mail/claws-mail-extra-plugins/HISTORY
index 946fe87..2b96065 100644
--- a/mail/claws-mail-extra-plugins/HISTORY
+++ b/mail/claws-mail-extra-plugins/HISTORY
@@ -1,3 +1,7 @@
+2008-10-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.6.0
+	* CONFIGURE: -smime, part of claws-mail now
+
 2008-07-26 Eric Sandall <sandalle at sourcemage.org>
 	* INSTALL: Fails install with multiple make jobs
 
diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index b67c1cc..80afa67 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,5 +1,5 @@
            SPELL=claws-mail
-         VERSION=3.5.0
+         VERSION=3.6.0
   SECURITY_PATCH=1
           SOURCE=$SPELL-${VERSION}.tar.bz2
       SOURCE_URL=$SOURCEFORGE_URL/sylpheed-claws/$SOURCE
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 900d7cb..0fd9efd 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,7 @@
+2008-10-04 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 3.6.0
+	* PRE_BUILD, claws-mail-gtk.patch: removed
+
 2008-09-07 George Sherwood <gsherwood at sourcemage.org>
 	* PRE_BUILD: Added to apply upstream patch
 	* claws-mail-gtk.patch: Upstream patch to fix compile with gtk 2.14.1
diff --git a/mail/claws-mail/PRE_BUILD b/mail/claws-mail/PRE_BUILD
deleted file mode 100755
index 2496969..0000000
--- a/mail/claws-mail/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/claws-mail-gtk.patch
diff --git a/mail/claws-mail/claws-mail-gtk.patch b/mail/claws-mail/claws-mail-gtk.patch
deleted file mode 100644
index a9ad2dd..0000000
--- a/mail/claws-mail/claws-mail-gtk.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: src/plugins/pgpcore/passphrase.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpcore/Attic/passphrase.c,v
-retrieving revision 1.1.2.29
-retrieving revision 1.1.2.30
-diff -u -r1.1.2.29 -r1.1.2.30
---- src/plugins/pgpcore/passphrase.c	10 Jan 2008 17:45:25 -0000	1.1.2.29
-+++ src/plugins/pgpcore/passphrase.c	5 Jul 2008 10:02:55 -0000	1.1.2.30
-@@ -30,17 +30,7 @@
- #ifdef GDK_WINDOWING_X11
- #  include <gdk/gdkx.h>
- #endif /* GDK_WINDOWING_X11 */
--#include <gtk/gtkmain.h>
--#include <gtk/gtkwidget.h>
--#include <gtk/gtkwindow.h>
--#include <gtk/gtkvbox.h>
--#include <gtk/gtktable.h>
--#include <gtk/gtklabel.h>
--#include <gtk/gtkentry.h>
--#include <gtk/gtkhbbox.h>
--#include <gtk/gtkbutton.h>
--#include <gtk/gtkfilesel.h>
--#include <gtk/gtksignal.h>
-+#include <gtk/gtk.h> 
- #include <string.h>
- #include <sys/types.h>
- #ifdef G_OS_WIN32
-Index: src/plugins/pgpcore/prefs_gpg.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpcore/Attic/prefs_gpg.c,v
-retrieving revision 1.1.2.28
-retrieving revision 1.1.2.29
-diff -u -r1.1.2.28 -r1.1.2.29
---- src/plugins/pgpcore/prefs_gpg.c	4 Oct 2007 17:36:48 -0000	1.1.2.28
-+++ src/plugins/pgpcore/prefs_gpg.c	5 Jul 2008 10:02:55 -0000	1.1.2.29
-@@ -22,8 +22,7 @@
- #include <glib/gi18n.h>
- 
- #include "defs.h"
--#include "utils.h"
--#include "gtk/gtkutils.h"
-+#include "utils.h" 
- #include "prefs.h"
- #include "prefs_gtk.h"
- #include "prefs_gpg.h"
-Index: src/plugins/pgpcore/select-keys.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpcore/Attic/select-keys.c,v
-retrieving revision 1.1.2.19
-retrieving revision 1.1.2.20
-diff -u -r1.1.2.19 -r1.1.2.20
---- src/plugins/pgpcore/select-keys.c	17 Oct 2007 16:03:01 -0000	1.1.2.19
-+++ src/plugins/pgpcore/select-keys.c	5 Jul 2008 10:02:56 -0000	1.1.2.20
-@@ -27,19 +27,7 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
--#include <gtk/gtkmain.h>
--#include <gtk/gtkwidget.h>
--#include <gtk/gtkwindow.h>
--#include <gtk/gtkscrolledwindow.h>
--#include <gtk/gtkvbox.h>
--#include <gtk/gtkhbox.h>
--#include <gtk/gtkclist.h>
--#include <gtk/gtklabel.h>
--#include <gtk/gtkentry.h>
--#include <gtk/gtkhbbox.h>
--#include <gtk/gtkbutton.h>
--#include <gtk/gtkstock.h>
--
-+#include <gtk/gtk.h>
- #include "select-keys.h"
- #include "utils.h"
- #include "gtkutils.h"



More information about the SM-Commit mailing list