2013-02-13 [paul] 3.9.0cvs62
authorPaul Mangan <paul@claws-mail.org>
Wed, 13 Feb 2013 16:23:36 +0000 (16:23 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 13 Feb 2013 16:23:36 +0000 (16:23 +0000)
* configure.ac
* po/POTFILES.in
* src/plugins/Makefile.am
* src/plugins/fancy/Makefile.am
* src/plugins/fancy/fancy_prefs.c
* src/plugins/fancy/fancy_prefs.h
* src/plugins/fancy/fancy_viewer.c
* src/plugins/fancy/fancy_viewer.h
move the Fancy plugin into core

ChangeLog
PATCHSETS
configure.ac
po/POTFILES.in
src/plugins/Makefile.am

index 51999dda1417d2c08c3f236d8a2e4dced068e567..ef0aba675b1f6fc4d52a265d64bd2a9fde9ca90d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-02-13 [paul]      3.9.0cvs62
+
+       * configure.ac
+       * po/POTFILES.in
+       * src/plugins/Makefile.am
+       * src/plugins/fancy/Makefile.am
+       * src/plugins/fancy/fancy_prefs.c
+       * src/plugins/fancy/fancy_prefs.h
+       * src/plugins/fancy/fancy_viewer.c
+       * src/plugins/fancy/fancy_viewer.h
+               move the Fancy plugin into core
+
 2013-02-11 [paul]      3.9.0cvs61
 
        * src/mainwindow.c
index 23c3d8e468c0a6ab4b2d49d5892692fc50c37f35..036010218e1246377d1180576735527fb5a612a1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.12.2.80 -r 1.12.2.81 src/action.c;  cvs diff -u -r 1.36.2.212 -r 1.36.2.213 src/common/utils.c;  ) > 3.9.0cvs59.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 tools/vcard2xml.py;  ) > 3.9.0cvs60.patchset
 ( cvs diff -u -r 1.274.2.364 -r 1.274.2.365 src/mainwindow.c;  ) > 3.9.0cvs61.patchset
+( cvs diff -u -r 1.654.2.4638 -r 1.654.2.4639 configure.ac;  cvs diff -u -r 1.53.2.39 -r 1.53.2.40 po/POTFILES.in;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/plugins/Makefile.am;  diff -u /dev/null src/plugins/fancy/Makefile.am;  diff -u /dev/null src/plugins/fancy/fancy_prefs.c;  diff -u /dev/null src/plugins/fancy/fancy_prefs.h;  diff -u /dev/null src/plugins/fancy/fancy_viewer.c;  diff -u /dev/null src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs62.patchset
index 371b488bd79c35d741651f962b6c4f69278a6145..9dd7c9b794c7f7b37525cb8f615868f23ced937c 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -983,6 +983,51 @@ else
 fi
 AM_CONDITIONAL(BUILD_DILLO_VIEWER_PLUGIN, test x"$ac_cv_enable_dillo_viewer_plugin" = xyes)
 
+
+dnl --- Fancy ---
+AC_MSG_CHECKING([whether to build Fancy plugin])
+AC_ARG_ENABLE(fancy-plugin,
+       [  --disable-fancy-plugin     do not build Fancy plugin for html mail rendering],
+       [ac_cv_enable_fancy_plugin=$enableval], [ac_cv_enable_fancy_plugin=yes])
+if test x"$ac_cv_enable_fancy_plugin" = xyes; then
+       AC_MSG_RESULT(yes)
+       dnl Check for WebKit
+       PKG_CHECK_MODULES(WEBKIT, webkit-1.0,
+               [ 
+                       PLUGINS="fancy $PLUGINS"
+               ],
+               [
+                       echo "webkit-1.0 not found."
+                       ac_cv_enable_fancy_plugin=no
+               ])
+               AC_SUBST(WEBKIT_LIBS)
+               AC_SUBST(WEBKIT_CFLAGS)
+fi
+if test x"$ac_cv_enable_fancy_plugin" = xyes; then
+       dnl Check for libsoup-gnome
+       PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, ac_cv_enable_soup_gnome=yes, ac_cv_enable_soup_gnome=no)        
+       if test x$ac_cv_enable_soup_gnome = xyes; then
+                       AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, Define if you want soup gnome proxy support)
+       fi
+       AC_SUBST(LIBSOUP_GNOME_CFLAGS)
+       AC_SUBST(LIBSOUP_GNOME_LIBS)
+       
+       dnl Find curl-config
+       PKG_CHECK_MODULES(CURL, libcurl)
+       AC_SUBST(CURL_LIBS)
+       AC_SUBST(CURL_CFLAGS)
+       
+       PKG_CHECK_MODULES(GTKPRINTUNIX, gtk+-unix-print-2.0, ac_cv_enable_gtkprint=yes, ac_cv_enable_gtkprint=no)        
+       if test x$ac_cv_enable_gtkprint = xyes; then
+               AC_DEFINE(USE_PRINTUNIX, 1, Define if you want gtk+-unix-print support)
+       else
+               AC_MSG_RESULT(not found)
+       fi
+       AC_SUBST(GTKPRINTUNIX_CFLAGS)
+       AC_SUBST(GTKPRINTUNIX_LIBS)
+fi
+AM_CONDITIONAL(BUILD_FANCY_PLUGIN, test x"$ac_cv_enable_fancy_plugin" = xyes)
+
 dnl --- Demo ---
 AC_ARG_ENABLE(demo-plugin,
        [  --enable-demo-plugin              build demo plugin],
@@ -991,7 +1036,7 @@ if test x"$ac_cv_enable_demo_plugin" = xyes; then
        PLUGINS="demo $PLUGINS"
 fi
 AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
-
+       
 dnl Libetpan
 AC_MSG_CHECKING([whether to use libetpan])
 AC_ARG_ENABLE(libetpan,
@@ -1074,6 +1119,7 @@ src/plugins/demo/Makefile
 src/plugins/bogofilter/Makefile
 src/plugins/spamassassin/Makefile
 src/plugins/dillo_viewer/Makefile
+src/plugins/fancy/Makefile
 src/plugins/trayicon/Makefile
 src/plugins/pgpcore/Makefile
 src/plugins/pgpmime/Makefile
index 7970a5d7369cf185eeeb19f399bebf3db3cb0982..9b8de47c72b178d9cc5a0ced9460a6b44e9c7b32 100644 (file)
@@ -80,6 +80,8 @@ src/plugins/bogofilter/bogofilter_gtk.c
 src/plugins/demo/demo.c
 src/plugins/dillo_viewer/dillo_prefs.c
 src/plugins/dillo_viewer/dillo_viewer.c
+src/plugins/fancy/fancy_viewer.c
+src/plugins/fancy/fancy_prefs.c
 src/plugins/pgpcore/passphrase.c
 src/plugins/pgpcore/pgp_viewer.c
 src/plugins/pgpcore/plugin.c
index 91c4365f6bd6c0f7ea921539b4641ba64e0b6a35..696176fa273abbed12130864e20261c12d66d617 100644 (file)
@@ -14,6 +14,10 @@ if BUILD_DILLO_VIEWER_PLUGIN
 dillo_viewer_dir = dillo_viewer
 endif
 
+if BUILD_FANCY_PLUGIN
+fancy_dir = fancy
+endif
+
 if BUILD_TRAYICON_PLUGIN
 trayicon_dir = trayicon
 endif
@@ -35,6 +39,7 @@ SUBDIRS = $(demo_dir) \
        $(spamassasssin_dir) \
        $(bogofilter_dir) \
        $(dillo_viewer_dir) \
+       $(fancy_dir) \
        $(trayicon_dir) \
        $(pgpcore_dir) \
        $(pgpmime_dir) \