mirror of
https://github.com/gryf/gryf-overlay.git
synced 2026-03-27 23:33:32 +01:00
Added sylpheed 3.8 beta with additional debian patches
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
From: Hideki Yamane <henrich@debian.org>
|
||||
Date: Sun, 28 Jan 2018 18:20:49 +0900
|
||||
Subject: Specify MACRO_DIRS as general
|
||||
|
||||
It breaks configure that is generated with autoreconf
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 090177d..3c12182 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -71,7 +71,7 @@ AM_PROG_LEX
|
||||
AC_PROG_YACC
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
-SYLPHEED_ACLOCAL_INCLUDE(ac)
|
||||
+AC_CONFIG_MACRO_DIRS([ac])
|
||||
|
||||
native_win32=no
|
||||
os_osx=no
|
||||
@@ -0,0 +1,31 @@
|
||||
From: Gustavo Noronha Silva <kov@debian.org>
|
||||
Date: Sun, 28 Jan 2018 18:20:19 +0900
|
||||
Subject: fix small bug in addressbook window
|
||||
Forwarded: yes
|
||||
|
||||
---
|
||||
src/addressbook.c | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/src/addressbook.c b/src/addressbook.c
|
||||
index b013507..592050d 100644
|
||||
--- a/src/addressbook.c
|
||||
+++ b/src/addressbook.c
|
||||
@@ -1326,6 +1326,17 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
|
||||
if (new_compose)
|
||||
compose_block_modified(addrbook.target_compose);
|
||||
|
||||
+ /*
|
||||
+ * nothing selected, but maybe there's something on the text entry
|
||||
+ */
|
||||
+ if (node == NULL) {
|
||||
+ gchar *addr;
|
||||
+ addr = gtk_entry_get_text(GTK_ENTRY(addrbook.entry));
|
||||
+ if (addr)
|
||||
+ compose_entry_append(addrbook.target_compose, addr,
|
||||
+ (ComposeEntryType) data);
|
||||
+ }
|
||||
+
|
||||
while( node ) {
|
||||
AddressObject *obj = node->data;
|
||||
Compose *compose = addrbook.target_compose;
|
||||
@@ -0,0 +1,29 @@
|
||||
From: Hideki Yamane <henrich@debian.org>
|
||||
Date: Fri, 9 Feb 2018 23:04:58 +0900
|
||||
Subject: detect oniguruma without onig-config
|
||||
|
||||
---
|
||||
configure.ac | 9 +++------
|
||||
1 file changed, 3 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3c12182..0bd2e35 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -346,13 +346,10 @@ AC_MSG_CHECKING([whether to use Oniguruma])
|
||||
if test "$ac_cv_enable_oniguruma" = yes; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_MSG_CHECKING([whether Oniguruma is available])
|
||||
- dnl AC_CHECK_PROG(ONIG_CONFIG, onig-config, onig-config)
|
||||
- ONIG_CONFIG=onig-config
|
||||
- ONIG_VERSION=`$ONIG_CONFIG --version 2>/dev/null`
|
||||
- if test "x$ONIG_VERSION" != "x"; then
|
||||
+ if `pkg-config --exists oniguruma`; then
|
||||
AC_MSG_RESULT(yes)
|
||||
- CFLAGS="$CFLAGS `$ONIG_CONFIG --cflags`"
|
||||
- LIBS="$LIBS `$ONIG_CONFIG --libs`"
|
||||
+ CFLAGS="$CFLAGS `pkg-config --cflags oniguruma`"
|
||||
+ LIBS="$LIBS `pkg-config --libs oniguruma`"
|
||||
AC_DEFINE(USE_ONIGURUMA, 1, Define if you want to use Oniguruma.)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
@@ -0,0 +1,28 @@
|
||||
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
|
||||
Reviewed-by: Francesco Poli <frx@firenze.linux.it>
|
||||
Date: Sun, 28 Jan 2018 18:20:19 +0900
|
||||
Subject: escape '^From ' lines for not breaking GPG MIME signatures
|
||||
Bug-Debian: http://bugs.debian.org/485855
|
||||
|
||||
---
|
||||
libsylph/quoted-printable.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/libsylph/quoted-printable.c b/libsylph/quoted-printable.c
|
||||
index adcdb05..adee4bc 100644
|
||||
--- a/libsylph/quoted-printable.c
|
||||
+++ b/libsylph/quoted-printable.c
|
||||
@@ -52,6 +52,13 @@ void qp_encode_line(gchar *out, const guchar *in)
|
||||
if (*inp == '\r')
|
||||
inp++;
|
||||
inp++;
|
||||
+ if (strncmp(inp, "From ", 5) == 0) {
|
||||
+ *outp++ = '=';
|
||||
+ *outp++ = '4';
|
||||
+ *outp++ = '6';
|
||||
+ len += 3;
|
||||
+ inp++;
|
||||
+ }
|
||||
} else if (ch == '\t' || ch == ' ') {
|
||||
if (IS_LBREAK(inp + 1)) {
|
||||
SOFT_LBREAK_IF_REQUIRED(3);
|
||||
@@ -0,0 +1,18 @@
|
||||
From: Ricardo Mones <mones@debian.org>
|
||||
Subject: fix typo in import.c file
|
||||
Last-Updated: 2022-09-14
|
||||
Forwarded: no
|
||||
|
||||
diff --git a/src/import.c b/src/import.c
|
||||
index a59f11f..b323270 100644
|
||||
--- a/src/import.c
|
||||
+++ b/src/import.c
|
||||
@@ -734,7 +734,7 @@ static void import_filesel_cb(GtkWidget *widget, gpointer data)
|
||||
|
||||
utf8_filename = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
|
||||
if (!utf8_filename) {
|
||||
- g_warning("import_filesel_cb(): failed to convert characer set.");
|
||||
+ g_warning("import_filesel_cb(): failed to convert character set.");
|
||||
utf8_filename = g_strdup(filename);
|
||||
}
|
||||
gtk_entry_set_text(GTK_ENTRY(file_entry), utf8_filename);
|
||||
@@ -0,0 +1,27 @@
|
||||
From: Antonio Ospite <ao2@ao2.it>
|
||||
Date: Fri, 24 Aug 2018 10:46:04 +0200
|
||||
Subject: [PATCH v2] libsylph/ssl.c: Support SNI, some servers (imap.gmail.com)
|
||||
seem to require it
|
||||
|
||||
---
|
||||
libsylph/ssl.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/libsylph/ssl.c b/libsylph/ssl.c
|
||||
index 61e770f8..b4f6be0c 100644
|
||||
--- a/libsylph/ssl.c
|
||||
+++ b/libsylph/ssl.c
|
||||
@@ -262,6 +262,10 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
|
||||
+ SSL_set_tlsext_host_name(sockinfo->ssl, sockinfo->hostname);
|
||||
+#endif
|
||||
+
|
||||
SSL_set_fd(sockinfo->ssl, sockinfo->sock);
|
||||
while ((ret = SSL_connect(sockinfo->ssl)) != 1) {
|
||||
err = SSL_get_error(sockinfo->ssl, ret);
|
||||
--
|
||||
2.19.0.rc2
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
Description: Switch to enchant-2
|
||||
Author: Laurent Bigonville <bigon@debian.org>
|
||||
Forwarded: not-needed
|
||||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949720
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -319,10 +319,10 @@ if test "$ac_cv_enable_gtkspell" = yes;
|
||||
LIBS="$LIBS `$PKG_CONFIG --libs gtkspell-2.0`"
|
||||
if $PKG_CONFIG --atleast-version 2.0.13 gtkspell-2.0 ; then
|
||||
AC_DEFINE(USE_ENCHANT, 1, Use Enchant with GtkSpell)
|
||||
- LIBS="$LIBS `$PKG_CONFIG --libs enchant`"
|
||||
+ LIBS="$LIBS `$PKG_CONFIG --libs enchant-2`"
|
||||
|
||||
dnl Workaroud for zemberek crash
|
||||
- if $PKG_CONFIG --atleast-version 1.4.2 enchant ; then
|
||||
+ if $PKG_CONFIG --atleast-version 1.4.2 enchant-2 ; then
|
||||
CFLAGS="$CFLAGS `$PKG_CONFIG --cflags dbus-glib-1`"
|
||||
LIBS="$LIBS `$PKG_CONFIG --libs dbus-glib-1`"
|
||||
fi
|
||||
--- a/src/compose.c
|
||||
+++ b/src/compose.c
|
||||
@@ -71,7 +71,7 @@
|
||||
# include <gtk/gtkradiomenuitem.h>
|
||||
# include <gtkspell/gtkspell.h>
|
||||
#if USE_ENCHANT
|
||||
-# include <enchant/enchant.h>
|
||||
+# include <enchant-2/enchant.h>
|
||||
#else
|
||||
# include <aspell.h>
|
||||
#endif
|
||||
Reference in New Issue
Block a user