From 7c6d1f08b6778e011e15e01c4f72105b52c0019e Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 14 Dec 2016 16:54:40 +0100 Subject: [PATCH] Debian pkg: updates from branch develop. --- debian/changelog | 7 +- debian/gbp.conf | 2 +- debian/patches/0001-Glib-old-version.patch | 6 +- debian/patches/0002-Camel-old-version.patch | 22 ++-- debian/patches/0003-No-gio-camel-proxy.patch | 131 +++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 153 insertions(+), 16 deletions(-) create mode 100644 debian/patches/0003-No-gio-camel-proxy.patch diff --git a/debian/changelog b/debian/changelog index a98a0b6..a5f5a04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ -libsolipa (0.5.0-2) UNRELEASED; urgency=medium +libsolipa (0.5.0-2~1.gbp4098b9) UNRELEASED; urgency=medium + ** SNAPSHOT build @4098b98a8c995f57a2b7cef2e79fdfda314af451 ** + + [ Andrea Zagli ] * Initial release * Added evolution-data-server dependency + [ tux ] + -- Andrea Zagli Sun, 29 May 2016 09:28:14 +0200 diff --git a/debian/gbp.conf b/debian/gbp.conf index 17be412..c411531 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [buildpackage] -export-dir=../build_area +export-dir=../build_area/wheezy debian-branch=debian/wheezy ignore-new=True upstream-tree=BRANCH diff --git a/debian/patches/0001-Glib-old-version.patch b/debian/patches/0001-Glib-old-version.patch index 8c1289e..2aff06e 100644 --- a/debian/patches/0001-Glib-old-version.patch +++ b/debian/patches/0001-Glib-old-version.patch @@ -8,7 +8,7 @@ Subject: Glib old version. 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 60ce102..cab6619 100644 +index c686253..61e834d 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AM_GLIB_GNU_GETTEXT @@ -18,8 +18,8 @@ index 60ce102..cab6619 100644 - gio-2.0 >= 2.36 + gio-2.0 >= 2.32 gtk+-3.0 >= 3.0 - libzakutils - libzakformgtk]) + libzakutils + libzakformgtk]) diff --git a/libsolipa.pc.in b/libsolipa.pc.in index a62e65f..183a0cf 100644 --- a/libsolipa.pc.in diff --git a/debian/patches/0002-Camel-old-version.patch b/debian/patches/0002-Camel-old-version.patch index 8b51123..80c64d9 100644 --- a/debian/patches/0002-Camel-old-version.patch +++ b/debian/patches/0002-Camel-old-version.patch @@ -10,7 +10,7 @@ Subject: Camel old version. 4 files changed, 7 insertions(+), 76 deletions(-) diff --git a/configure.ac b/configure.ac -index cab6619..65f87a2 100644 +index 61e834d..181a175 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_PROG_RANLIB @@ -25,10 +25,10 @@ index cab6619..65f87a2 100644 @@ -44,45 +44,13 @@ PKG_CHECK_MODULES(SOLIPA, [libgdaex >= 0.5.0 gio-2.0 >= 2.32 gtk+-3.0 >= 3.0 - libzakutils -- libzakformgtk]) -+ libzakformgtk -+ camel-1.2]) + libzakutils +- libzakformgtk]) ++ libzakformgtk ++ camel-1.2]) AC_SUBST(SOLIPA_CFLAGS) AC_SUBST(SOLIPA_LIBS) @@ -116,10 +116,10 @@ index 820c22e..3f741dd 100644 \ No newline at end of file +} diff --git a/src/mail.c b/src/mail.c -index 72f56c0..1bcfcc5 100644 +index 435046b..522e06f 100644 --- a/src/mail.c +++ b/src/mail.c -@@ -400,20 +400,10 @@ static CamelMimeMessage +@@ -403,20 +403,10 @@ static CamelMimeMessage camel_data_wrapper_set_mime_type (dw, g_content_type_get_mime_type (g_file_info_get_content_type (file_info))); error = NULL; @@ -140,7 +140,7 @@ index 72f56c0..1bcfcc5 100644 part = camel_mime_part_new (); #if defined CAMEL38 || defined CAMEL3 -@@ -676,7 +666,7 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) +@@ -705,7 +695,7 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) error != NULL && error->message != NULL ? error->message : "no details"); return; } @@ -149,8 +149,8 @@ index 72f56c0..1bcfcc5 100644 camel_network_settings_set_host (CAMEL_NETWORK_SETTINGS (settings), camel_url->host); camel_network_settings_set_user (CAMEL_NETWORK_SETTINGS (settings), ""); if (camel_url->port == 0) -@@ -713,15 +703,7 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) - } +@@ -761,15 +751,7 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) + camel_service_set_proxy_resolver (trans, proxy_resolver); error = NULL; -#ifdef CAMEL318 @@ -165,7 +165,7 @@ index 72f56c0..1bcfcc5 100644 if (!ret || error != NULL) { g_warning ("Not connected: %s", -@@ -793,13 +775,7 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) +@@ -841,13 +823,7 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) g_object_unref (to); error = NULL; diff --git a/debian/patches/0003-No-gio-camel-proxy.patch b/debian/patches/0003-No-gio-camel-proxy.patch new file mode 100644 index 0000000..bc5122b --- /dev/null +++ b/debian/patches/0003-No-gio-camel-proxy.patch @@ -0,0 +1,131 @@ +From: Andrea Zagli +Date: Wed, 14 Dec 2016 16:41:24 +0100 +Subject: No gio/camel proxy. + +--- + src/mail.c | 50 -------------------------------------------------- + src/mail.h | 2 -- + src/mailui.c | 1 - + tests/mail.c | 2 -- + 4 files changed, 55 deletions(-) + +diff --git a/src/mail.c b/src/mail.c +index 522e06f..e90bfa7 100644 +--- a/src/mail.c ++++ b/src/mail.c +@@ -61,9 +61,6 @@ struct _SolipaMailPrivate + gchar *username; + gchar *password; + +- GProxyResolver *proxy_resolver; +- gchar *proxy_uri; +- + gchar *body_plain; + gchar *body_html; + +@@ -571,32 +568,6 @@ solipa_mail_set_username_password (SolipaMail *mail, const gchar *username, cons + } + + void +-solipa_mail_set_proxy (SolipaMail *mail, GProxyResolver *resolver, const gchar *uri) +-{ +- SolipaMailPrivate *priv; +- +- g_return_if_fail (IS_SOLIPA_MAIL (mail)); +- +- priv = SOLIPA_MAIL_GET_PRIVATE (mail); +- +- priv->proxy_resolver = NULL; +- if (priv->proxy_uri != NULL) +- { +- g_free (priv->proxy_uri); +- } +- priv->proxy_uri = NULL; +- +- if (uri != NULL) +- { +- priv->proxy_uri = g_strdup (uri); +- } +- else if (G_IS_PROXY_RESOLVER (resolver)) +- { +- priv->proxy_resolver = resolver; +- } +-} +- +-void + solipa_mail_send (SolipaMail *mail, const gchar *url) + { + SolipaMailPrivate *priv; +@@ -606,8 +577,6 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) + + CamelMimeMessage *msg; + +- GProxyResolver *proxy_resolver; +- + CamelInternetAddress *from; + CamelInternetAddress *addr; + CamelInternetAddress *to; +@@ -731,25 +700,6 @@ solipa_mail_send (SolipaMail *mail, const gchar *url) + return; + } + +- /* proxy */ +- if (priv->proxy_resolver != NULL +- || priv->proxy_uri != NULL) +- { +- if (priv->proxy_resolver != NULL) +- { +- proxy_resolver = priv->proxy_resolver; +- } +- else +- { +- proxy_resolver = g_simple_proxy_resolver_new (priv->proxy_uri, NULL); +- } +- } +- else +- { +- proxy_resolver = g_simple_proxy_resolver_new (NULL, NULL); +- } +- camel_service_set_proxy_resolver (trans, proxy_resolver); +- + error = NULL; + ret = camel_service_connect_sync (trans, &error); + if (!ret || error != NULL) +diff --git a/src/mail.h b/src/mail.h +index 8a195da..592ade5 100644 +--- a/src/mail.h ++++ b/src/mail.h +@@ -80,8 +80,6 @@ void solipa_mail_set_security_method (SolipaMail *mail, CamelNetworkSecurityMeth + + void solipa_mail_set_username_password (SolipaMail *mail, const gchar *username, const gchar *password); + +-void solipa_mail_set_proxy (SolipaMail *mail, GProxyResolver *resolver, const gchar *uri); +- + void solipa_mail_send (SolipaMail *mail, const gchar *url); + + gboolean solipa_mail_check_email_address (const gchar *address); +diff --git a/src/mailui.c b/src/mailui.c +index 81f707f..925b0c9 100644 +--- a/src/mailui.c ++++ b/src/mailui.c +@@ -790,7 +790,6 @@ solipa_mail_ui_send (SolipaMailUI *mailui) + { + if (g_strcmp0 (proxy, "") != 0) + { +- solipa_mail_set_proxy (smail, NULL, proxy); + } + solipa_mail_send (smail, smtpuri); + } +diff --git a/tests/mail.c b/tests/mail.c +index f61ae1f..af30f81 100644 +--- a/tests/mail.c ++++ b/tests/mail.c +@@ -160,8 +160,6 @@ main (int argc, char **argv) + solipa_mail_set_username_password (smail, username, password); + } + +- solipa_mail_set_proxy (smail, NULL, proxy); +- + solipa_mail_send (smail, url); + + return 0; diff --git a/debian/patches/series b/debian/patches/series index 2602d91..8370a98 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 0001-Glib-old-version.patch 0002-Camel-old-version.patch +0003-No-gio-camel-proxy.patch -- 2.49.0