From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id oG7CHyMBGmTVTAEASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 20:10:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KDW6HyMBGmRwUQEA9RJhRA (envelope-from ) for ; Tue, 21 Mar 2023 20:10:27 +0100 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 1026833718 for ; Tue, 21 Mar 2023 20:10:27 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=g2lXYf0a; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679425827; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=WayJ+GooqYLMI29XR58Zh3NVtdJ+3yXrAKl8OSTu4CQ=; b=B8KSdvElrPN+Rg+nxBwsYgGjrmK+XYDFCcOFwOM7ZBD5jTFGHm7l57nElwHInk9/nx/8Zy KuLGHAzV+sTYusAGwjGYdhP6I4NFrCN7wsqdPekafOBjXwozOnbmena6YGeLBL/lQSY2vf DbyPE1CqWnB+VV9N3lLhffM6cVzT6WLoJg1yvwTgvf0iXJ5+YoOQu5x9KJ2O8WXfNz0z3H 2ynOloEPC+b9l/Uk0Oo5sFb+3nL3y/SMssS5r6k5t+6cY1RqoO2phehN3ysy38q3fWoRnx tGTW1c5UnMltpRjjyxP0wcl958xIkDIgf25uyevfkQUGmPKVbm7XYECmtiNqDg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=g2lXYf0a; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679425827; a=rsa-sha256; cv=none; b=JUPuv7lhydplLUFaKTKeanOO6ULP31iLk/GQR1tiYTSWTx3YAy/MVwim+Z5ATcTyubxkR0 lYaTQOfYlAwSvTV+Vq9WkGECsoYQW5PKf6PRzXnDw0k9OQB+710NM23mbtuVLN9p0Qsimf SVD9Wj53l7t9Hz1nGR01RJAWADirBhuvK/jjTj+vu7NTOgZhQrxlQ+GcwR8eoeNJecPOY7 8xqP+LtNPXFTYl1iphQT/x7HXlh+h1ODMaF4iaNm6fHpcYatJ/rE3ZnSDX44xgIVmibEKb UD9jGr5/2NRF+RLyeIftYt1703NOyTCC4KPJkVkNN43zrGZkZ0k3JE3jtm+9Og== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pehNF-0005tV-SW; Tue, 21 Mar 2023 15:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pehN2-0005a4-0x for guix-patches@gnu.org; Tue, 21 Mar 2023 15:10:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pehMw-0003Vm-CK for guix-patches@gnu.org; Tue, 21 Mar 2023 15:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pehMw-00060p-8E for guix-patches@gnu.org; Tue, 21 Mar 2023 15:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62308] [PATCH] gnu: Add converseen. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 19:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62308 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 62308@debbugs.gnu.org Received: via spool by 62308-submit@debbugs.gnu.org id=B62308.167942575122971 (code B ref 62308); Tue, 21 Mar 2023 19:10:02 +0000 Received: (at 62308) by debbugs.gnu.org; 21 Mar 2023 19:09:11 +0000 Received: from localhost ([127.0.0.1]:60671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pehM6-0005yQ-SC for submit@debbugs.gnu.org; Tue, 21 Mar 2023 15:09:11 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:33657) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pehM5-0005y6-27 for 62308@debbugs.gnu.org; Tue, 21 Mar 2023 15:09:09 -0400 Received: by mail-qt1-f172.google.com with SMTP id n2so19266333qtp.0 for <62308@debbugs.gnu.org>; Tue, 21 Mar 2023 12:09:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679425743; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=WayJ+GooqYLMI29XR58Zh3NVtdJ+3yXrAKl8OSTu4CQ=; b=g2lXYf0a5Ow01u6fN6F6eMpHTMd0s7Bfw4nf1+bWAvD9o7hBfpTjHeb3hjLyfnwFkM 7SuQtPBGxVMLBkfGa6EQhoAOzBFgyhQjtozlLu9N/rZmENBrl+CnQgMbO/j8lGidKoLd G9wni6kEfwG8RMYGvZ1n14UZ6KlYYWgtpx3kZNvdNkZ9JmnxtK5u+ygSs4Sbutz6jV5J 1obG1FSNbrpcbDpTD37MMVDzYz9BrfQi6slc8b7NdRs7Xy5d9ueLOcr0Jx7B67XU3mMn 3wHh04FypbzGzEQVqxUkQ70JTKeBcdE2pdpLRLn7L4AW4XM2Q3zBPALiRgM7bGRm/Sc/ KB2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679425743; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=WayJ+GooqYLMI29XR58Zh3NVtdJ+3yXrAKl8OSTu4CQ=; b=QzXZ8Kr6EVdR/abFDw+VkVrbXpBIKUmN9M9Zv5FH6PHhqlGUZNvHwBRBl64ua35/3a VmjJsUXCdYebRrNc364JLBi+IQavEhMveLA8yixRekj/mBVflAxvYgXMN2S8AgcnKIFb aC+myfDWTtpUZKYyPmhoxiaJsbhftlc3mupjApirb5QiibckDnGLqmuLfN/yAjg+wbGn rpb091Mx3B8P7SaFlkOoTSgJedkVkXMtksLp9VA8/8wWirZ7YMBH4g/Vkw13LP+z8BjA chRdfzuA/7hjc6MPqpXD2trDeWWp6NyCqS1BJzn1R6eH63W5f7rC66JUYG0AvFKcey/w /Zrg== X-Gm-Message-State: AO0yUKW1W/Nj9QBalqhsTdtgzzaQytxOVa5ZiB3U87+21PO9PJNkD2Aj dCPbmrZZOnmSZgWSJOqglfZvYIkjLTcsDw== X-Google-Smtp-Source: AK7set82NaNaMyqqXZFUC9vuVeuBa/5B/jGHBWdTI+T2pJHcve6Oypd0mPdEqk1qNF9YaSm2bG1ekw== X-Received: by 2002:a05:622a:1a14:b0:3bf:c221:5871 with SMTP id f20-20020a05622a1a1400b003bfc2215871mr1684088qtb.54.1679425743220; Tue, 21 Mar 2023 12:09:03 -0700 (PDT) Received: from hurd (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id he2-20020a05622a600200b003b835e7e283sm8645019qtb.44.2023.03.21.12.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 12:09:02 -0700 (PDT) From: Maxim Cournoyer References: <20230320221723.332511-1-mail@nicolasgoaziou.fr> Date: Tue, 21 Mar 2023 15:09:01 -0400 In-Reply-To: <20230320221723.332511-1-mail@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Mon, 20 Mar 2023 23:17:23 +0100") Message-ID: <87ttydncqa.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: X-Migadu-Queue-Id: 1026833718 X-Spam-Score: -2.95 X-Migadu-Spam-Score: -2.95 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: wcTkkBgtHRgR Hi Nicolas, Nicolas Goaziou writes: > * gnu/packages/image.scm (converseen): New variable. > * gnu/packages/patches/converseen-hide-updates-checks.patch: New file. > * gnu/local.mk (converseen): Register file above. > --- > gnu/local.mk | 1 + > gnu/packages/image.scm | 42 ++++++ > .../converseen-hide-updates-checks.patch | 128 ++++++++++++++++++ > 3 files changed, 171 insertions(+) > create mode 100644 gnu/packages/patches/converseen-hide-updates-checks.p= atch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 4a662efc3c..91eeb389d1 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1009,6 +1009,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/connman-CVE-2022-32293-pt1.patch \ > %D%/packages/patches/connman-CVE-2022-32293-pt2.patch \ > %D%/packages/patches/containerd-create-pid-file.patch \ > + %D%/packages/patches/converseen-hide-updates-checks.patch \ > %D%/packages/patches/cool-retro-term-wctype.patch \ > %D%/packages/patches/coreutils-gnulib-tests.patch \ > %D%/packages/patches/coq-fix-envvars.patch \ > diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm > index 228a31c7d0..d21401bbbd 100644 > --- a/gnu/packages/image.scm > +++ b/gnu/packages/image.scm > @@ -35,6 +35,7 @@ > ;;; Copyright =C2=A9 2022 Jai Vetrivelan > ;;; Copyright =C2=A9 2022 ( > ;;; Copyright =C2=A9 2022-2023 Bruno Victal > +;;; Copyright =C2=A9 2023 Nicolas Goaziou > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -76,6 +77,7 @@ (define-module (gnu packages image) > #:use-module (gnu packages gnome) > #:use-module (gnu packages graphics) > #:use-module (gnu packages gtk) > + #:use-module (gnu packages imagemagick) > #:use-module (gnu packages lua) > #:use-module (gnu packages man) > #:use-module (gnu packages maths) > @@ -115,6 +117,46 @@ (define-module (gnu packages image) > #:use-module (guix deprecation) > #:use-module (srfi srfi-1)) >=20=20 > +(define-public converseen > + (package > + (name "converseen") > + (version "0.9.11.1") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/Faster3ck/Converseen") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0nxvac8df47gxg1klqlz0s3rxl0ykrikmciniwkb938bgilmaijm")) > + (patches > + (search-patches "converseen-hide-updates-checks.patch")))) There's also a Help -> Donate to Paypal button. With Paypal using non-free JavaScript, it seems this would go against the FSDG guideline of not inciting users to run non-free software. Could it be hidden too? > + (build-system cmake-build-system) > + (arguments > + (list > + #:tests? #false ;no tests > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'set-translations-location > + ;; Fix translations location. > + (lambda _ > + (substitute* "src/translator.cpp" > + (("QString\\(\"%1/share/converseen/loc\"\\).arg\\(rootPa= th\\)") > + (string-append "QString(\"" > + #$output > + "/share/converseen/loc\")")))))))) > + (native-inputs > + (list pkg-config qttools-5)) > + (inputs > + (list imagemagick qtbase-5)) > + (home-page "https://converseen.fasterland.net/") > + (synopsis "Batch image converter and resizer") > + (description > + "Converseen is an image batch conversion tool. You can resize and > +convert images in more than 100 different formats.") > + (license license:gpl3+))) > + > (define-public iqa > (package > (name "iqa") > diff --git a/gnu/packages/patches/converseen-hide-updates-checks.patch b/= gnu/packages/patches/converseen-hide-updates-checks.patch > new file mode 100644 > index 0000000000..d08a79c2f5 > --- /dev/null > +++ b/gnu/packages/patches/converseen-hide-updates-checks.patch > @@ -0,0 +1,128 @@ > +From 13dbaab0d3383b451f3efa225c3767c2eb376756 Mon Sep 17 00:00:00 2001 > +From: Nicolas Goaziou > +Date: Mon, 20 Mar 2023 22:38:25 +0100 > +Subject: [PATCH] Remove updates checks from UI. > + > +* ui/dialogoptions.ui: > +* ui/mainwindow.ui: > +* src/dialogoptions.cpp (DialogOptions::setAutoUpdates, DialogOptions::s= aveOptions): > +(DialogOptions::loadSettings): > +* src/mainwindowimpl.cpp (MainWindowImpl::createActions): Remove > +references to updates checks. > +--- > + src/dialogoptions.cpp | 19 ------------------- > + src/mainwindowimpl.cpp | 1 - > + ui/dialogoptions.ui | 16 ---------------- > + ui/mainwindow.ui | 9 --------- > + 4 files changed, 45 deletions(-) Nitpick: I know some people prefer simple diffs as patch, without the Git metadata. The only place I preserve the metadata myself is when using an upstream patch, in which case the commit and other metadata are useful for traceability. So my recommendation would be using a simple diff, and adding the following at the top: Summary line explaining what it does Upstream status: Guix-specific, not forwarded upstream. Would you mind sending a v2 with the above, when you get the chance? --=20 Thanks, Maxim