From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MB0rHmhfdF9GAwAA0tVLHw (envelope-from ) for ; Wed, 30 Sep 2020 10:35:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OLT5GWhfdF84RAAAbx9fmQ (envelope-from ) for ; Wed, 30 Sep 2020 10:35:20 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 88806940430 for ; Wed, 30 Sep 2020 10:35:19 +0000 (UTC) Received: from localhost ([::1]:46700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNZS8-0006Bh-Rk for larch@yhetil.org; Wed, 30 Sep 2020 06:35:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNZCR-0002UO-6B for guix-patches@gnu.org; Wed, 30 Sep 2020 06:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNZCP-0006Re-Uc for guix-patches@gnu.org; Wed, 30 Sep 2020 06:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNZCP-0001Jw-Ov for guix-patches@gnu.org; Wed, 30 Sep 2020 06:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41111] Claws-Mail References: <20200506090638.36eb28eb.raghavgururajan@disroot.org> In-Reply-To: <20200506090638.36eb28eb.raghavgururajan@disroot.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Sep 2020 10:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41111 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41111@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 41111-submit@debbugs.gnu.org id=B41111.16014610905011 (code B ref 41111); Wed, 30 Sep 2020 10:19:01 +0000 Received: (at 41111) by debbugs.gnu.org; 30 Sep 2020 10:18:10 +0000 Received: from localhost ([127.0.0.1]:58313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNZBZ-0001Il-Us for submit@debbugs.gnu.org; Wed, 30 Sep 2020 06:18:10 -0400 Received: from knopi.disroot.org ([178.21.23.139]:59068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNZBW-0001Ib-QN for 41111@debbugs.gnu.org; Wed, 30 Sep 2020 06:18:08 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2D9ED51B7B; Wed, 30 Sep 2020 12:18:05 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QCixW60XeI6l; Wed, 30 Sep 2020 12:18:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1601461081; bh=Jx0s2IxOaJQog07f7Xc3C6tkGZaWnDNa5CDoGpWwy3Y=; h=To:Cc:From:Subject:Date; b=SF5xhYE1dmG5YMRcRAe5Se7Q3bYhs8WBGTTWoeXLpSuppAt223GWwCz+qZQqSO0yS Ke+FUngS0YrGb4UInbDkydKPgnSaKXqqco+5kDIldmfC7hdDQZzDgTobSKvIFAA03K fP/pEuOk8VCTJ1CcabHknNDutS3vcRAZwwLuxEbvaoBzi0vsmwK5iC8+ycafmo1+et TrvM1cbD0ijKrnLk5j+7QbS+EEgodqo+F0q6tFXOYx3OZnrS9QS97KTBNum5y1oprU 3AoveiR2Z+46QGswIpKi911zWQIRIqsOlpNfug8PfkOALB63HCFpYkYrdTMcRoYM/m +2+90MWyfUUOg== From: Raghav Gururajan Message-ID: Date: Wed, 30 Sep 2020 06:17:59 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------5BFB641341413991B071B7B2" Content-Language: en-US X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=SF5xhYE1; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.59 X-TUID: nw/q6S8/rQ0X This is a multi-part message in MIME format. --------------5BFB641341413991B071B7B2 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi Danny! Based on your feedback, I have split the changes. Please find the attached patches. Regards, RG. --------------5BFB641341413991B071B7B2 Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-claws-mail-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-claws-mail-Make-some-cosmetic-changes.patch" >From d6888dfabb15f4485d13de09e58c487e22ed3038 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Sep 2020 05:31:43 -0400 Subject: [PATCH 1/5] gnu: claws-mail: Make some cosmetic changes. * gnu/packages/mail.scm (claws-mail): Make some cosmetic changes. --- gnu/packages/mail.scm | 105 ++++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 49 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 70e2fcd76b..9da842bc1d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1317,58 +1317,65 @@ compresses it.") (package (name "claws-mail") (version "3.17.6") - (source (origin - (method url-fetch) - (uri (string-append - "https://www.claws-mail.org/releases/claws-mail-" version - ".tar.xz")) - (sha256 - (base32 - "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m")))) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://www.claws-mail.org/releases/claws-mail-" + version ".tar.xz")) + (sha256 + (base32 "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m")))) (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("bogofilter" ,bogofilter) - ("curl" ,curl) - ("dbus-glib" ,dbus-glib) - ("enchant" ,enchant) - ("expat" ,expat) - ("ghostscript" ,ghostscript) - ("hicolor-icon-theme" ,hicolor-icon-theme) - ("gnupg" ,gnupg) - ("gnutls" ,gnutls) - ("gpgme" ,gpgme) - ("gtk" ,gtk+-2) - ("libarchive" ,libarchive) - ("libcanberra" ,libcanberra) - ("libetpan" ,libetpan) - ("libical" ,libical) - ("libnotify" ,libnotify) - ("libsm" ,libsm) - ("libxml2" ,libxml2) - ("perl" ,perl) - ("python-2" ,python-2) - ("mime-info" ,shared-mime-info) - ("startup-notification" ,startup-notification))) (arguments - '(#:configure-flags - '("--enable-gnutls" "--enable-pgpmime-plugin" "--enable-enchant" - "--enable-ldap") - #:make-flags - ;; Disable updating icon cache since it's done by the profile hook. - ;; Conflict with other packages in the profile would be inevitable - ;; otherwise. - '("gtk_update_icon_cache=true") - #:phases (modify-phases %standard-phases - (add-before 'build 'patch-mime - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/procmime.c" - (("/usr/share/mime/globs") - (string-append (assoc-ref inputs "mime-info") - "/share/mime/globs")))))))) + `(#:configure-flags + (list + "--enable-gnutls" + "--enable-pgpmime-plugin" + "--enable-enchant" + "--enable-ldap") + #:make-flags + ;; Disable updating icon cache since it's done by the profile hook. + ;; Conflict with other packages in the profile would be inevitable + ;; otherwise. + (list + "gtk_update_icon_cache=true") + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-mime + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/procmime.c" + (("/usr/share/mime/globs") + (string-append (assoc-ref inputs "mime-info") + "/share/mime/globs")))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("bogofilter" ,bogofilter) + ("curl" ,curl) + ("dbus-glib" ,dbus-glib) + ("enchant" ,enchant) + ("expat" ,expat) + ("ghostscript" ,ghostscript) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("gnupg" ,gnupg) + ("gnutls" ,gnutls) + ("gpgme" ,gpgme) + ("gtk" ,gtk+-2) + ("libarchive" ,libarchive) + ("libcanberra" ,libcanberra) + ("libetpan" ,libetpan) + ("libical" ,libical) + ("libnotify" ,libnotify) + ("libsm" ,libsm) + ("libxml2" ,libxml2) + ("perl" ,perl) + ("python-2" ,python-2) + ("mime-info" ,shared-mime-info) + ("startup-notification" ,startup-notification))) (synopsis "GTK-based Email client") - (description - "Claws-Mail is an email client (and news reader) based on GTK+. The -appearance and interface are designed to be familiar to new users coming from + (description "Claws-Mail is an email client (and news reader) based on GTK+. +The appearance and interface are designed to be familiar to new users coming from other popular email clients, as well as experienced users. Almost all commands are accessible with the keyboard. Plus, Claws-Mail is extensible via addons which can add many functionalities to the base client.") -- 2.28.0 --------------5BFB641341413991B071B7B2 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-claws-mail-Change-build-system.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-gnu-claws-mail-Change-build-system.patch" >From 6a4fa215f4313f020fb1c98bcb5a679ade685e79 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Sep 2020 05:34:21 -0400 Subject: [PATCH 2/5] gnu: claws-mail: Change build-system. * gnu/packages/mail.scm (claws-mail) [build-system]: Change from gnu to glib-or-gtk. --- gnu/packages/mail.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 9da842bc1d..d0ad0e41d3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -141,6 +141,7 @@ #:use-module (guix git-download) #:use-module (guix svn-download) #:use-module (guix utils) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system guile) #:use-module (guix build-system perl) @@ -1326,7 +1327,7 @@ compresses it.") version ".tar.xz")) (sha256 (base32 "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags (list -- 2.28.0 --------------5BFB641341413991B071B7B2 Content-Type: text/x-patch; charset=UTF-8; name="0003-gnu-claws-mail-Update-to-3.17.7.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-gnu-claws-mail-Update-to-3.17.7.patch" >From 5e1c842fd4b4537cd83b4abf96f45a850ead8aa7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Sep 2020 05:52:34 -0400 Subject: [PATCH 3/5] gnu: claws-mail: Update to 3.17.7. * gnu/packages/mail.scm (claws-mail) [version]: Update to 3.17.7. [source][sha256]: Modify base32. [arguments]<#:configure-flags>: Remove all configure flags. [arguments]<#:phases>['patch-mime]: Remove phase. ['patch-fhs-dirs]: New phase. [inputs]: Add bash, cairo, compface, dbus, fontconfig, gdk-pibuf, glib, gobject-introspection, gumbo-parser, libgdata, librsvg, libsoup, mailutils, nettle, openldap, poppler, python, python2-pygtk and webkitgtk. Remove hicolor-icon-theme, libsm and libxml2. --- gnu/packages/mail.scm | 64 +++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 20 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d0ad0e41d3..febf207710 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages emacs) #:use-module (gnu packages enchant) + #:use-module (gnu packages fontutils) #:use-module (gnu packages gdb) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -102,10 +103,12 @@ #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages ncurses) + #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages openldap) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pcre) + #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) @@ -1317,25 +1320,19 @@ compresses it.") (define-public claws-mail (package (name "claws-mail") - (version "3.17.6") + (version "3.17.7") (source (origin (method url-fetch) (uri (string-append "https://www.claws-mail.org/releases/claws-mail-" - version ".tar.xz")) + version ".tar.gz")) (sha256 - (base32 "1s05qw0r0gqwvvkxvrrwbjkbi61dvilixiwrpgcq21qc9csc9r0m")))) + (base32 "0zqjfjy8qj6j6a6r0xs97si7hkcsb7jvxx4k2kkdxypqmdkwrn2q")))) (build-system glib-or-gtk-build-system) (arguments - `(#:configure-flags - (list - "--enable-gnutls" - "--enable-pgpmime-plugin" - "--enable-enchant" - "--enable-ldap") - #:make-flags + `(#:make-flags ;; Disable updating icon cache since it's done by the profile hook. ;; Conflict with other packages in the profile would be inevitable ;; otherwise. @@ -1343,37 +1340,64 @@ compresses it.") "gtk_update_icon_cache=true") #:phases (modify-phases %standard-phases - (add-before 'build 'patch-mime + (add-after 'unpack 'patch-fhs-dirs (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/procmime.c" - (("/usr/share/mime/globs") - (string-append (assoc-ref inputs "mime-info") - "/share/mime/globs")))))))) + (let* + ((sh (string-append (assoc-ref inputs "bash") + "/bin/sh")) + (inc (string-append (assoc-ref inputs "mailutils") + "/bin/mu-mh/inc")) + (send (string-append (assoc-ref inputs "mailutils") + "/bin/mu-mh/send")) + (globs (string-append (assoc-ref inputs "shared-mime-info") + "/share/mime/globs"))) + (with-directory-excursion "src" + (substitute* '("action.c" "common/defs.h" "etpan/imap-thread.c") + (("/bin/sh") sh) + (("/usr/bin/mh/inc") inc) + (("/usr/sbin/sendmail") send) + (("/usr/share/mime/globs") globs))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("bogofilter" ,bogofilter) + `(("bash" ,bash) + ("bogofilter" ,bogofilter) + ("cairo" ,cairo) ("curl" ,curl) ("dbus-glib" ,dbus-glib) + ("dbus" ,dbus) ("enchant" ,enchant) ("expat" ,expat) + ("fontconfig" ,fontconfig) + ("gdk-pxbuf" ,gdk-pixbuf+svg) ("ghostscript" ,ghostscript) - ("hicolor-icon-theme" ,hicolor-icon-theme) + ("glib" ,glib) ("gnupg" ,gnupg) ("gnutls" ,gnutls) + ("gobject-introspection" ,gobject-introspection) ("gpgme" ,gpgme) ("gtk" ,gtk+-2) + ("gumbo-parser" ,gumbo-parser) ("libarchive" ,libarchive) ("libcanberra" ,libcanberra) ("libetpan" ,libetpan) + ("libgdata" ,libgdata) ("libical" ,libical) ("libnotify" ,libnotify) - ("libsm" ,libsm) - ("libxml2" ,libxml2) + ("librsvg" ,librsvg) + ("libsoup" ,libsoup) + ("mailutils" ,mailutils) + ("nettle" ,nettle) + ("openldap" ,openldap) ("perl" ,perl) + ("poppler" ,poppler) + ("python" ,python) ("python-2" ,python-2) + ("python2-pygtk" ,python2-pygtk) ("mime-info" ,shared-mime-info) - ("startup-notification" ,startup-notification))) + ("startup-notification" ,startup-notification) + ("webkitgtk" ,webkitgtk))) (synopsis "GTK-based Email client") (description "Claws-Mail is an email client (and news reader) based on GTK+. The appearance and interface are designed to be familiar to new users coming from -- 2.28.0 --------------5BFB641341413991B071B7B2 Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-claws-mail-Update-license.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0004-gnu-claws-mail-Update-license.patch" >From 13b08ee79c56eb39a044fe8492217a822053418b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Sep 2020 06:04:01 -0400 Subject: [PATCH 4/5] gnu: claws-mail: Update license. * gnu/packages/mail.scm (claws-mail) [license]: Remove comment. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index febf207710..4a185235b1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1405,7 +1405,7 @@ other popular email clients, as well as experienced users. Almost all commands are accessible with the keyboard. Plus, Claws-Mail is extensible via addons which can add many functionalities to the base client.") (home-page "https://www.claws-mail.org/") - (license license:gpl3+))) ; most files are actually public domain or x11 + (license license:gpl3+))) (define-public msmtp (package -- 2.28.0 --------------5BFB641341413991B071B7B2 Content-Type: text/x-patch; charset=UTF-8; name="0005-gnu-claws-mail-Update-synopsis-and-description.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0005-gnu-claws-mail-Update-synopsis-and-description.patch" >From 6c74dfc8d76d9ae447698c98eef4dbed7cee290e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 30 Sep 2020 06:10:56 -0400 Subject: [PATCH 5/5] gnu: claws-mail: Update synopsis and description. * gnu/packages/mail.scm (claws-mail) [synopsis]: Modify. [description]: Modify. --- gnu/packages/mail.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 4a185235b1..ca0ec9d8de 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1398,12 +1398,10 @@ compresses it.") ("mime-info" ,shared-mime-info) ("startup-notification" ,startup-notification) ("webkitgtk" ,webkitgtk))) - (synopsis "GTK-based Email client") - (description "Claws-Mail is an email client (and news reader) based on GTK+. -The appearance and interface are designed to be familiar to new users coming from -other popular email clients, as well as experienced users. Almost all commands -are accessible with the keyboard. Plus, Claws-Mail is extensible via addons -which can add many functionalities to the base client.") + (synopsis "A GTK+ lightweight and fast e-mail client") + (description "Claws-Mail is a lightweight and highly configurable email +client and news reader based on the GTK+ GUI toolkit. It runs on the X Window +System.") (home-page "https://www.claws-mail.org/") (license license:gpl3+))) -- 2.28.0 --------------5BFB641341413991B071B7B2--