sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (74f37501a9248f40e3c9af50f0a46a06ffa90fd9)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (74f37501a9248f40e3c9af50f0a46a06ffa90fd9)
Date: Sun, 15 Nov 2015 04:47:23 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

mail/claws-mail/BUILD | 2 +-
mail/claws-mail/CONFIGURE | 9 ++++-----
mail/claws-mail/HISTORY | 4 ++++
mail/claws-mail/PRE_BUILD | 1 +
mail/claws-mail/compose-umpc.patch | 11 +++++++++++
5 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 74f37501a9248f40e3c9af50f0a46a06ffa90fd9
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

mail/claws-mail: removed trayicon plugin option, added patch to build
with UMPC
plus some minor fixes

diff --git a/mail/claws-mail/BUILD b/mail/claws-mail/BUILD
index 4faea95..76f1b4c 100755
--- a/mail/claws-mail/BUILD
+++ b/mail/claws-mail/BUILD
@@ -1,2 +1,2 @@
-OPTS="${SYLPHEED_OPTS} ${OPTS}" &&
+OPTS="${CLAWSMAIL_OPTS} ${SYLPHEED_OPTS} ${OPTS}" &&
default_build
diff --git a/mail/claws-mail/CONFIGURE b/mail/claws-mail/CONFIGURE
index ac74765..773fa75 100755
--- a/mail/claws-mail/CONFIGURE
+++ b/mail/claws-mail/CONFIGURE
@@ -4,10 +4,6 @@ config_query_option CLAWSMAIL_OPTS "Compile the ManageSieve
plugin?" y \
"--enable-managesieve-plugin" \
"--disable-managesieve-plugin" &&

-config_query_option CLAWSMAIL_OPTS "Compile tray-icon plugin?" y \
- "--enable-trayicon-plugin" \
- "--disable-trayicon-plugin" &&
-
config_query_option CLAWSMAIL_OPTS "Compile crash dialog?" n \
"--enable-crash-dialog" \
"--disable-crash-dialog" &&
@@ -74,5 +70,8 @@ config_query_option CLAWSMAIL_OPTS "Enable spam report
plugin?" y \

config_query_option CLAWSMAIL_OPTS "Enable vcalendar plugin?" y \
"--enable-vcalendar-plugin" \
- "--disable-vcalendar-plugin"
+ "--disable-vcalendar-plugin" &&
+

+list_remove CLAWSMAIL_OPTS "--enable-trayicon-plugin" &&
+list_remove CLAWSMAIL_OPTS "--disable-trayicon-plugin"
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index 4d3918c..290dbd4 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -2,6 +2,10 @@
* DETAILS: version 3.13.0
* DEPENDS: removed libchamplain, no more geolocation plugin,
PYTHON -> python, if python is selected we need pygtk2 as well
+ * BUILD: readded CLAWSMAIL_OPTS to OPTS
+ * CONFIGURE: removed trayicon plugin
+ * PRE_BUILD, compose-umpc.patch: added patch to fix building with
+ enabled UMPC

2015-09-23 Ismael Luceno <ismael AT sourcemage.org>
* CONFIGURE: Added knob for ManageSieve plugin
diff --git a/mail/claws-mail/PRE_BUILD b/mail/claws-mail/PRE_BUILD
index 8ad3898..589b4bb 100755
--- a/mail/claws-mail/PRE_BUILD
+++ b/mail/claws-mail/PRE_BUILD
@@ -1,6 +1,7 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

+patch -p0 < ${SPELL_DIRECTORY}/compose-umpc.patch &&
if is_depends_enabled ${SPELL} "gnutls" && [[ $(installed_version "gnutls")
== 3.0.* ]]
then
sed -i "s:gnutls_transport_set_lowat:// gnutls_transport_set_lowat:g"
src/common/ssl.c
diff --git a/mail/claws-mail/compose-umpc.patch
b/mail/claws-mail/compose-umpc.patch
new file mode 100644
index 0000000..e964cdd
--- /dev/null
+++ b/mail/claws-mail/compose-umpc.patch
@@ -0,0 +1,11 @@
+--- src/compose.c.orig 2015-11-14 23:18:49.731512570 -0500
++++ src/compose.c 2015-11-14 23:10:45.863665956 -0500
+@@ -10557,6 +10557,8 @@
+ if (compose->focused_editable &&
+ #ifndef GENERIC_UMPC
+ gtk_widget_has_focus(compose->focused_editable)
++#else
++ TRUE
+ #endif
+ )
+ entry_paste_clipboard(compose, compose->focused_editable,

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (74f37501a9248f40e3c9af50f0a46a06ffa90fd9), Pavel Vinogradov, 11/14/2015