From unknown Sat Aug 16 21:21:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62308] [PATCH] gnu: Add converseen. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62308 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62308@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167935066229004 (code B ref -1); Mon, 20 Mar 2023 22:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Mar 2023 22:17:42 +0000 Received: from localhost ([127.0.0.1]:57064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNp0-0007Xj-64 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:17:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:40438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNoy-0007Xb-9Z for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:17:40 -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 1peNoy-0007bX-1H for guix-patches@gnu.org; Mon, 20 Mar 2023 18:17:40 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNov-0005IY-Bc for guix-patches@gnu.org; Mon, 20 Mar 2023 18:17:39 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 4BD1DE0002 for ; Mon, 20 Mar 2023 22:17:30 +0000 (UTC) From: Nicolas Goaziou Date: Mon, 20 Mar 2023 23:17:23 +0100 Message-Id: <20230320221723.332511-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.196; envelope-from=mail@nicolasgoaziou.fr; helo=relay4-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * 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.patch 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 = \ %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 © 2022 Jai Vetrivelan ;;; Copyright © 2022 ( ;;; Copyright © 2022-2023 Bruno Victal +;;; Copyright © 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)) +(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")))) + (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\\(rootPath\\)") + (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::saveOptions): +(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(-) + +diff --git a/src/dialogoptions.cpp b/src/dialogoptions.cpp +index 704e75c..bb3f9b0 100755 +--- a/src/dialogoptions.cpp ++++ b/src/dialogoptions.cpp +@@ -71,23 +71,10 @@ void DialogOptions::setOverwriteMode() + IniSettings::setOverwriteMode(true); + } + +-void DialogOptions::setAutoUpdates() +-{ +- bool enabled; +- +- if (checkCheckUpdates->isChecked()) +- enabled = true; +- else +- enabled = false; +- +- IniSettings::setAutoChechUpdates(enabled); +-} +- + void DialogOptions::saveOptions() + { + setLanguage(); + setOverwriteMode(); +- setAutoUpdates(); + + IniSettings::settings->sync(); + accept(); +@@ -102,12 +89,6 @@ void DialogOptions::loadSettings() + else + radioAskFirst->setChecked(true); + +- bool autoUpdates = IniSettings::isAutoChechUpdates(); +- if (autoUpdates) +- checkCheckUpdates->setCheckState(Qt::Checked); +- else +- checkCheckUpdates->setCheckState(Qt::Unchecked); +- + Translator t; + + int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly); +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 2b6d68d..83a365f 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -164,7 +164,6 @@ void MainWindowImpl::createActions() + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); + connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); +- connect(actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(checkForUpdates())); + } + + void MainWindowImpl::setupMenu() +diff --git a/ui/dialogoptions.ui b/ui/dialogoptions.ui +index e59148d..6cb23f5 100755 +--- a/ui/dialogoptions.ui ++++ b/ui/dialogoptions.ui +@@ -66,22 +66,6 @@ + + + +- +- +- +- Updates +- +- +- +- +- +- Checks for updates automatically +- +- +- +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index a5f55f0..28df8cc 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -190,7 +190,6 @@ + + + +- + + + +@@ -1365,14 +1364,6 @@ p, li { white-space: pre-wrap; } + Import windows icon (*.ico *.icon) + + +- +- +- &Check for updates +- +- +- Check if a new version of Converseen is available +- +- + + + +-- +2.39.2 + base-commit: 3893758dac76fc30b23d4715e849e262306f268d -- 2.39.2 From unknown Sat Aug 16 21:21:03 2025 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-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sat Aug 16 21:21:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62308] [PATCH] gnu: Add converseen. References: <20230320221723.332511-1-mail@nicolasgoaziou.fr> In-Reply-To: <20230320221723.332511-1-mail@nicolasgoaziou.fr> Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 21:15: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: 62308@debbugs.gnu.org Received: via spool by 62308-submit@debbugs.gnu.org id=B62308.16794332849965 (code B ref 62308); Tue, 21 Mar 2023 21:15:02 +0000 Received: (at 62308) by debbugs.gnu.org; 21 Mar 2023 21:14:44 +0000 Received: from localhost ([127.0.0.1]:60999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pejJb-0002ae-MB for submit@debbugs.gnu.org; Tue, 21 Mar 2023 17:14:44 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:60003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pejJZ-0002aM-BT for 62308@debbugs.gnu.org; Tue, 21 Mar 2023 17:14:42 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 8557B40004 for <62308@debbugs.gnu.org>; Tue, 21 Mar 2023 21:14:33 +0000 (UTC) From: Nicolas Goaziou Date: Tue, 21 Mar 2023 22:14:32 +0100 Message-Id: <20230321211432.371577-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/image.scm (converseen): New variable. * gnu/packages/patches/converseen-hide-non-free-pointers.patch: * gnu/packages/patches/converseen-hide-updates-checks.patch: New files. * gnu/local.mk: Register files above. --- gnu/local.mk | 2 + gnu/packages/image.scm | 46 ++++ .../converseen-hide-non-free-pointers.patch | 198 ++++++++++++++++++ .../converseen-hide-updates-checks.patch | 110 ++++++++++ 4 files changed, 356 insertions(+) create mode 100644 gnu/packages/patches/converseen-hide-non-free-pointers.patch create mode 100644 gnu/packages/patches/converseen-hide-updates-checks.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4a662efc3c..4b82dcd91b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1009,6 +1009,8 @@ dist_patch_DATA = \ %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/converseen-hide-non-free-pointers.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..e1eafae446 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 ( ;;; Copyright © 2022-2023 Bruno Victal +;;; Copyright © 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,50 @@ (define-module (gnu packages image) #:use-module (guix deprecation) #:use-module (srfi srfi-1)) +(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" + ;; Remove links to sites relying on non-free + ;; Javascript. + "converseen-hide-non-free-pointers.patch")))) + (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. Without this, only English is + ;; offered. + (lambda _ + (substitute* "src/translator.cpp" + (("QString\\(\"%1/share/converseen/loc\"\\).arg\\(rootPath\\)") + (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-non-free-pointers.patch b/gnu/packages/patches/converseen-hide-non-free-pointers.patch new file mode 100644 index 0000000000..b4994733cd --- /dev/null +++ b/gnu/packages/patches/converseen-hide-non-free-pointers.patch @@ -0,0 +1,198 @@ +Remove pointers to PayPal and Facebook. +Upstream status: Guix-specific, not forwarded upstream. + +diff --git a/src/dialoginfo.cpp b/src/dialoginfo.cpp +index 3302f55..b64f414 100755 +--- a/src/dialoginfo.cpp ++++ b/src/dialoginfo.cpp +@@ -31,7 +31,6 @@ DialogInfo::DialogInfo(QWidget *parent) : + setupUi(this); + + connect(pushClose, SIGNAL(clicked()), this, SLOT(close())); +- connect(pushFacebook, SIGNAL(clicked()), this, SLOT(openFacebookPage())); + + QString appVersion; + QString magickVersion; +@@ -63,8 +62,3 @@ void DialogInfo::openFacebookPage() + QDesktopServices::openUrl(QUrl("https://www.facebook.com/converseen", QUrl::TolerantMode)); + } + +-void DialogInfo::on_pushDonatePayPal_clicked() +-{ +- QDesktopServices::openUrl(QUrl("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HQA6TBT5354FC", QUrl::TolerantMode)); +-} +- +diff --git a/src/dialoginfo.h b/src/dialoginfo.h +index 4c13776..f1b7ea3 100755 +--- a/src/dialoginfo.h ++++ b/src/dialoginfo.h +@@ -33,7 +33,6 @@ public: + + private slots: + void openFacebookPage(); +- void on_pushDonatePayPal_clicked(); + }; + + #endif // DIALOGINFO_H +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 83a365f..9a44492 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -162,7 +162,6 @@ void MainWindowImpl::createActions() + connect(actionConvert, SIGNAL(triggered()), this, SLOT(elabora())); + + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); +- connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); + } + +diff --git a/ui/dialoginfo.ui b/ui/dialoginfo.ui +index b2c7788..20b9d9d 100755 +--- a/ui/dialoginfo.ui ++++ b/ui/dialoginfo.ui +@@ -254,122 +254,6 @@ p, li { white-space: pre-wrap; } + + + +- +- +- +- +- +- <html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal</span></p></body></html> +- +- +- true +- +- +- +- +- +- +- +- +- +- +- +- +- :/Images/res/btn_donateCC_LG.png:/Images/res/btn_donateCC_LG.png +- +- +- +- 150 +- 50 +- +- +- +- true +- +- +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- +- +- +- +- +- +- <html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Follow Converseen:</span></p></body></html> +- +- +- +- +- +- +- PointingHandCursor +- +- +- +- +- +- +- :/Images/res/facebook-icon.png:/Images/res/facebook-icon.png +- +- +- +- 32 +- 32 +- +- +- +- true +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index 28df8cc..0ee7f37 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -1334,18 +1334,6 @@ p, li { white-space: pre-wrap; } + F1 + + +- +- +- +- :/Images/res/paypal_mini.png:/Images/res/paypal_mini.png +- +- +- &Donate via Paypal +- +- +- Donate via Paypal +- +- + + + &Report bug... 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..044836b36f --- /dev/null +++ b/gnu/packages/patches/converseen-hide-updates-checks.patch @@ -0,0 +1,110 @@ +Remove Check updates button and Auto check uptades option. +Upstream status: Guix-specific, not forwarded upstream. + +diff --git a/src/dialogoptions.cpp b/src/dialogoptions.cpp +index 704e75c..bb3f9b0 100755 +--- a/src/dialogoptions.cpp ++++ b/src/dialogoptions.cpp +@@ -71,23 +71,10 @@ void DialogOptions::setOverwriteMode() + IniSettings::setOverwriteMode(true); + } + +-void DialogOptions::setAutoUpdates() +-{ +- bool enabled; +- +- if (checkCheckUpdates->isChecked()) +- enabled = true; +- else +- enabled = false; +- +- IniSettings::setAutoChechUpdates(enabled); +-} +- + void DialogOptions::saveOptions() + { + setLanguage(); + setOverwriteMode(); +- setAutoUpdates(); + + IniSettings::settings->sync(); + accept(); +@@ -102,12 +89,6 @@ void DialogOptions::loadSettings() + else + radioAskFirst->setChecked(true); + +- bool autoUpdates = IniSettings::isAutoChechUpdates(); +- if (autoUpdates) +- checkCheckUpdates->setCheckState(Qt::Checked); +- else +- checkCheckUpdates->setCheckState(Qt::Unchecked); +- + Translator t; + + int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly); +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 2b6d68d..83a365f 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -164,7 +164,6 @@ void MainWindowImpl::createActions() + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); + connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); +- connect(actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(checkForUpdates())); + } + + void MainWindowImpl::setupMenu() +diff --git a/ui/dialogoptions.ui b/ui/dialogoptions.ui +index e59148d..6cb23f5 100755 +--- a/ui/dialogoptions.ui ++++ b/ui/dialogoptions.ui +@@ -66,22 +66,6 @@ + + + +- +- +- +- Updates +- +- +- +- +- +- Checks for updates automatically +- +- +- +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index a5f55f0..28df8cc 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -190,7 +190,6 @@ + + + +- + + + +@@ -1365,14 +1364,6 @@ p, li { white-space: pre-wrap; } + Import windows icon (*.ico *.icon) + + +- +- +- &Check for updates +- +- +- Check if a new version of Converseen is available +- +- + + + base-commit: 3893758dac76fc30b23d4715e849e262306f268d -- 2.39.2 From unknown Sat Aug 16 21:21:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62308] [PATCH v2] gnu: Add converseen. References: <20230320221723.332511-1-mail@nicolasgoaziou.fr> In-Reply-To: <20230320221723.332511-1-mail@nicolasgoaziou.fr> Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 21:20: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: 62308@debbugs.gnu.org Received: via spool by 62308-submit@debbugs.gnu.org id=B62308.167943358510504 (code B ref 62308); Tue, 21 Mar 2023 21:20:02 +0000 Received: (at 62308) by debbugs.gnu.org; 21 Mar 2023 21:19:45 +0000 Received: from localhost ([127.0.0.1]:32772 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pejOS-0002jM-Vr for submit@debbugs.gnu.org; Tue, 21 Mar 2023 17:19:45 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:53351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pejOQ-0002j7-Lc for 62308@debbugs.gnu.org; Tue, 21 Mar 2023 17:19:43 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id DE916240006 for <62308@debbugs.gnu.org>; Tue, 21 Mar 2023 21:19:33 +0000 (UTC) From: Nicolas Goaziou Date: Tue, 21 Mar 2023 22:19:28 +0100 Message-Id: <20230321211928.371786-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/image.scm (converseen): New variable. * gnu/packages/patches/converseen-hide-non-free-pointers.patch: * gnu/packages/patches/converseen-hide-updates-checks.patch: New files. * gnu/local.mk: Register files above. --- gnu/local.mk | 2 + gnu/packages/image.scm | 46 ++++ .../converseen-hide-non-free-pointers.patch | 198 ++++++++++++++++++ .../converseen-hide-updates-checks.patch | 110 ++++++++++ 4 files changed, 356 insertions(+) create mode 100644 gnu/packages/patches/converseen-hide-non-free-pointers.patch create mode 100644 gnu/packages/patches/converseen-hide-updates-checks.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4a662efc3c..4b82dcd91b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1009,6 +1009,8 @@ dist_patch_DATA = \ %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/converseen-hide-non-free-pointers.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..e1eafae446 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 ( ;;; Copyright © 2022-2023 Bruno Victal +;;; Copyright © 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,50 @@ (define-module (gnu packages image) #:use-module (guix deprecation) #:use-module (srfi srfi-1)) +(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" + ;; Remove links to sites relying on non-free + ;; Javascript. + "converseen-hide-non-free-pointers.patch")))) + (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. Without this, only English is + ;; offered. + (lambda _ + (substitute* "src/translator.cpp" + (("QString\\(\"%1/share/converseen/loc\"\\).arg\\(rootPath\\)") + (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-non-free-pointers.patch b/gnu/packages/patches/converseen-hide-non-free-pointers.patch new file mode 100644 index 0000000000..b4994733cd --- /dev/null +++ b/gnu/packages/patches/converseen-hide-non-free-pointers.patch @@ -0,0 +1,198 @@ +Remove pointers to PayPal and Facebook. +Upstream status: Guix-specific, not forwarded upstream. + +diff --git a/src/dialoginfo.cpp b/src/dialoginfo.cpp +index 3302f55..b64f414 100755 +--- a/src/dialoginfo.cpp ++++ b/src/dialoginfo.cpp +@@ -31,7 +31,6 @@ DialogInfo::DialogInfo(QWidget *parent) : + setupUi(this); + + connect(pushClose, SIGNAL(clicked()), this, SLOT(close())); +- connect(pushFacebook, SIGNAL(clicked()), this, SLOT(openFacebookPage())); + + QString appVersion; + QString magickVersion; +@@ -63,8 +62,3 @@ void DialogInfo::openFacebookPage() + QDesktopServices::openUrl(QUrl("https://www.facebook.com/converseen", QUrl::TolerantMode)); + } + +-void DialogInfo::on_pushDonatePayPal_clicked() +-{ +- QDesktopServices::openUrl(QUrl("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HQA6TBT5354FC", QUrl::TolerantMode)); +-} +- +diff --git a/src/dialoginfo.h b/src/dialoginfo.h +index 4c13776..f1b7ea3 100755 +--- a/src/dialoginfo.h ++++ b/src/dialoginfo.h +@@ -33,7 +33,6 @@ public: + + private slots: + void openFacebookPage(); +- void on_pushDonatePayPal_clicked(); + }; + + #endif // DIALOGINFO_H +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 83a365f..9a44492 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -162,7 +162,6 @@ void MainWindowImpl::createActions() + connect(actionConvert, SIGNAL(triggered()), this, SLOT(elabora())); + + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); +- connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); + } + +diff --git a/ui/dialoginfo.ui b/ui/dialoginfo.ui +index b2c7788..20b9d9d 100755 +--- a/ui/dialoginfo.ui ++++ b/ui/dialoginfo.ui +@@ -254,122 +254,6 @@ p, li { white-space: pre-wrap; } + + + +- +- +- +- +- +- <html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal</span></p></body></html> +- +- +- true +- +- +- +- +- +- +- +- +- +- +- +- +- :/Images/res/btn_donateCC_LG.png:/Images/res/btn_donateCC_LG.png +- +- +- +- 150 +- 50 +- +- +- +- true +- +- +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- +- +- +- +- +- +- <html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Follow Converseen:</span></p></body></html> +- +- +- +- +- +- +- PointingHandCursor +- +- +- +- +- +- +- :/Images/res/facebook-icon.png:/Images/res/facebook-icon.png +- +- +- +- 32 +- 32 +- +- +- +- true +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index 28df8cc..0ee7f37 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -1334,18 +1334,6 @@ p, li { white-space: pre-wrap; } + F1 + + +- +- +- +- :/Images/res/paypal_mini.png:/Images/res/paypal_mini.png +- +- +- &Donate via Paypal +- +- +- Donate via Paypal +- +- + + + &Report bug... 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..044836b36f --- /dev/null +++ b/gnu/packages/patches/converseen-hide-updates-checks.patch @@ -0,0 +1,110 @@ +Remove Check updates button and Auto check uptades option. +Upstream status: Guix-specific, not forwarded upstream. + +diff --git a/src/dialogoptions.cpp b/src/dialogoptions.cpp +index 704e75c..bb3f9b0 100755 +--- a/src/dialogoptions.cpp ++++ b/src/dialogoptions.cpp +@@ -71,23 +71,10 @@ void DialogOptions::setOverwriteMode() + IniSettings::setOverwriteMode(true); + } + +-void DialogOptions::setAutoUpdates() +-{ +- bool enabled; +- +- if (checkCheckUpdates->isChecked()) +- enabled = true; +- else +- enabled = false; +- +- IniSettings::setAutoChechUpdates(enabled); +-} +- + void DialogOptions::saveOptions() + { + setLanguage(); + setOverwriteMode(); +- setAutoUpdates(); + + IniSettings::settings->sync(); + accept(); +@@ -102,12 +89,6 @@ void DialogOptions::loadSettings() + else + radioAskFirst->setChecked(true); + +- bool autoUpdates = IniSettings::isAutoChechUpdates(); +- if (autoUpdates) +- checkCheckUpdates->setCheckState(Qt::Checked); +- else +- checkCheckUpdates->setCheckState(Qt::Unchecked); +- + Translator t; + + int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly); +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 2b6d68d..83a365f 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -164,7 +164,6 @@ void MainWindowImpl::createActions() + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); + connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); +- connect(actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(checkForUpdates())); + } + + void MainWindowImpl::setupMenu() +diff --git a/ui/dialogoptions.ui b/ui/dialogoptions.ui +index e59148d..6cb23f5 100755 +--- a/ui/dialogoptions.ui ++++ b/ui/dialogoptions.ui +@@ -66,22 +66,6 @@ + + + +- +- +- +- Updates +- +- +- +- +- +- Checks for updates automatically +- +- +- +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index a5f55f0..28df8cc 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -190,7 +190,6 @@ + + + +- + + + +@@ -1365,14 +1364,6 @@ p, li { white-space: pre-wrap; } + Import windows icon (*.ico *.icon) + + +- +- +- &Check for updates +- +- +- Check if a new version of Converseen is available +- +- + + + base-commit: 3893758dac76fc30b23d4715e849e262306f268d -- 2.39.2 From unknown Sat Aug 16 21:21:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62308] [PATCH] gnu: Add converseen. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 21:21: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: 62308@debbugs.gnu.org Received: via spool by 62308-submit@debbugs.gnu.org id=B62308.167943364010622 (code B ref 62308); Tue, 21 Mar 2023 21:21:02 +0000 Received: (at 62308) by debbugs.gnu.org; 21 Mar 2023 21:20:40 +0000 Received: from localhost ([127.0.0.1]:32776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pejPM-0002lG-34 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 17:20:40 -0400 Received: from relay7-d.mail.gandi.net ([217.70.183.200]:37267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pejPK-0002l4-Ss for 62308@debbugs.gnu.org; Tue, 21 Mar 2023 17:20:39 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id A4D3620007 for <62308@debbugs.gnu.org>; Tue, 21 Mar 2023 21:20:30 +0000 (UTC) From: Nicolas Goaziou References: <20230320221723.332511-1-mail@nicolasgoaziou.fr> <20230321211432.371577-1-mail@nicolasgoaziou.fr> Date: Tue, 21 Mar 2023 22:20:29 +0100 In-Reply-To: <20230321211432.371577-1-mail@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Tue, 21 Mar 2023 22:14:32 +0100") Message-ID: <87lejp244i.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Nicolas Goaziou writes: > * gnu/packages/image.scm (converseen): New variable. > * gnu/packages/patches/converseen-hide-non-free-pointers.patch: > * gnu/packages/patches/converseen-hide-updates-checks.patch: New files. > * gnu/local.mk: Register files above. I forgot to add the v2 tag. Re-sending it. From unknown Sat Aug 16 21:21:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62308] [PATCH] gnu: Add converseen. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 21:31:01 +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.168176703922945 (code B ref 62308); Mon, 17 Apr 2023 21:31:01 +0000 Received: (at 62308) by debbugs.gnu.org; 17 Apr 2023 21:30:39 +0000 Received: from localhost ([127.0.0.1]:57086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poWQo-0005y1-Is for submit@debbugs.gnu.org; Mon, 17 Apr 2023 17:30:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poWQn-0005xn-0M for 62308@debbugs.gnu.org; Mon, 17 Apr 2023 17:30:37 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poWQh-00063j-1W; Mon, 17 Apr 2023 17:30:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=MRqjUIDWBQ2yxCDjGhJkMDwrtWnqqRjU6K+qWBqcHQo=; b=Q4a4x1WVFTlcgkMgSk7c zrNQ1rX2rlO1DlJFaTn/Sg1PIelEkbWPsGbw3GwPfg752mpNM37LtJmULeKBS/DwZpnwQ/5ZELYk/ 078TEBhFlIoppxsbRHrpBTkd6L/1qJols+yx5IbXsTM0al01J6WuHqGW/I5ZXZi9ag25XYs5XuvJ2 NJrNcnVWIW/YKNUuG9X+wgmGxtXtruglyLH4MC4ViRdf4nouJcPj6wfQ0ZD2QwydyCijxDIRQ/lkh Icr/XLFGbF2hBxHnvjqotsNJH3DrlWlRefTDvZGbjgbAkYmDy1ZQTal4QNRRaN+Go2vO6orGueDbt xDk5foPMbQP+Hg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poWQg-0004XN-Kj; Mon, 17 Apr 2023 17:30:30 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20230320221723.332511-1-mail@nicolasgoaziou.fr> <20230321211928.371786-1-mail@nicolasgoaziou.fr> Date: Mon, 17 Apr 2023 23:30:29 +0200 In-Reply-To: <20230321211928.371786-1-mail@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Tue, 21 Mar 2023 22:19:28 +0100") Message-ID: <87sfcyb3ii.fsf_-_@gnu.org> 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-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Nicolas, Nicolas Goaziou skribis: > * gnu/packages/image.scm (converseen): New variable. > * gnu/packages/patches/converseen-hide-non-free-pointers.patch: > * gnu/packages/patches/converseen-hide-updates-checks.patch: New files. > * gnu/local.mk: Register files above. LGTM, go for it! Ludo=E2=80=99. From unknown Sat Aug 16 21:21:03 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Goaziou Subject: bug#62308: closed (Re: [bug#62308] [PATCH] gnu: Add converseen.) Message-ID: References: <87fs8ykwmq.fsf@nicolasgoaziou.fr> <20230320221723.332511-1-mail@nicolasgoaziou.fr> X-Gnu-PR-Message: they-closed 62308 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 62308@debbugs.gnu.org Date: Mon, 17 Apr 2023 21:50:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1681768202-25072-1" This is a multi-part message in MIME format... ------------=_1681768202-25072-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #62308: [PATCH] gnu: Add converseen. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 62308@debbugs.gnu.org. --=20 62308: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D62308 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1681768202-25072-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 62308-done) by debbugs.gnu.org; 17 Apr 2023 21:49:11 +0000 Received: from localhost ([127.0.0.1]:57109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poWil-0006V9-Cq for submit@debbugs.gnu.org; Mon, 17 Apr 2023 17:49:11 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:36015) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poWij-0006Ux-Pd for 62308-done@debbugs.gnu.org; Mon, 17 Apr 2023 17:49:10 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 33DB2C0004; Mon, 17 Apr 2023 21:49:02 +0000 (UTC) From: Nicolas Goaziou To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#62308] [PATCH] gnu: Add converseen. References: <20230320221723.332511-1-mail@nicolasgoaziou.fr> <20230321211928.371786-1-mail@nicolasgoaziou.fr> <87sfcyb3ii.fsf_-_@gnu.org> Date: Mon, 17 Apr 2023 23:49:01 +0200 In-Reply-To: <87sfcyb3ii.fsf_-_@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s?= =?utf-8?Q?=22's?= message of "Mon, 17 Apr 2023 23:30:29 +0200") Message-ID: <87fs8ykwmq.fsf@nicolasgoaziou.fr> 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62308-done Cc: 62308-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hello, Ludovic Court=C3=A8s writes: > LGTM, go for it! Applied. Thank you. Regards, --=20 Nicolas Goaziou ------------=_1681768202-25072-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Mar 2023 22:17:42 +0000 Received: from localhost ([127.0.0.1]:57064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNp0-0007Xj-64 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:17:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:40438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNoy-0007Xb-9Z for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:17:40 -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 1peNoy-0007bX-1H for guix-patches@gnu.org; Mon, 20 Mar 2023 18:17:40 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNov-0005IY-Bc for guix-patches@gnu.org; Mon, 20 Mar 2023 18:17:39 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 4BD1DE0002 for ; Mon, 20 Mar 2023 22:17:30 +0000 (UTC) From: Nicolas Goaziou To: guix-patches@gnu.org Subject: [PATCH] gnu: Add converseen. Date: Mon, 20 Mar 2023 23:17:23 +0100 Message-Id: <20230320221723.332511-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.196; envelope-from=mail@nicolasgoaziou.fr; helo=relay4-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * 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.patch 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 = \ %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 © 2022 Jai Vetrivelan ;;; Copyright © 2022 ( ;;; Copyright © 2022-2023 Bruno Victal +;;; Copyright © 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)) +(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")))) + (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\\(rootPath\\)") + (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::saveOptions): +(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(-) + +diff --git a/src/dialogoptions.cpp b/src/dialogoptions.cpp +index 704e75c..bb3f9b0 100755 +--- a/src/dialogoptions.cpp ++++ b/src/dialogoptions.cpp +@@ -71,23 +71,10 @@ void DialogOptions::setOverwriteMode() + IniSettings::setOverwriteMode(true); + } + +-void DialogOptions::setAutoUpdates() +-{ +- bool enabled; +- +- if (checkCheckUpdates->isChecked()) +- enabled = true; +- else +- enabled = false; +- +- IniSettings::setAutoChechUpdates(enabled); +-} +- + void DialogOptions::saveOptions() + { + setLanguage(); + setOverwriteMode(); +- setAutoUpdates(); + + IniSettings::settings->sync(); + accept(); +@@ -102,12 +89,6 @@ void DialogOptions::loadSettings() + else + radioAskFirst->setChecked(true); + +- bool autoUpdates = IniSettings::isAutoChechUpdates(); +- if (autoUpdates) +- checkCheckUpdates->setCheckState(Qt::Checked); +- else +- checkCheckUpdates->setCheckState(Qt::Unchecked); +- + Translator t; + + int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly); +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 2b6d68d..83a365f 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -164,7 +164,6 @@ void MainWindowImpl::createActions() + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); + connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); +- connect(actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(checkForUpdates())); + } + + void MainWindowImpl::setupMenu() +diff --git a/ui/dialogoptions.ui b/ui/dialogoptions.ui +index e59148d..6cb23f5 100755 +--- a/ui/dialogoptions.ui ++++ b/ui/dialogoptions.ui +@@ -66,22 +66,6 @@ + + + +- +- +- +- Updates +- +- +- +- +- +- Checks for updates automatically +- +- +- +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index a5f55f0..28df8cc 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -190,7 +190,6 @@ + + + +- + + + +@@ -1365,14 +1364,6 @@ p, li { white-space: pre-wrap; } + Import windows icon (*.ico *.icon) + + +- +- +- &Check for updates +- +- +- Check if a new version of Converseen is available +- +- + + + +-- +2.39.2 + base-commit: 3893758dac76fc30b23d4715e849e262306f268d -- 2.39.2 ------------=_1681768202-25072-1--