From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 COfpF5QfGmTNKQEASxT56A (envelope-from ) for ; Tue, 21 Mar 2023 22:20:20 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aL4IF5QfGmQbgwAAG6o9tA (envelope-from ) for ; Tue, 21 Mar 2023 22:20:20 +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 E35F937BDF for ; Tue, 21 Mar 2023 22:20:19 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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=1679433620; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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; bh=5jIcogFwivXNGf1AebIgZRdprHHL99IySZjjmvN1oRU=; b=dZt+FB/NEPIYIThHbdpqMVzdS9031VEZQ/NBUvwTSAk94jfMSGXDaaoG7HhPBris0Go1K+ U9Z25qhQxGbgsNvMF7iWxwP8LNyZr1sfE1HDlTYOdCe1YAz/3hqVecwMJToOpz8XNFF728 8ux7olUC3YT8d7ryaYQlBwDv2h2VbhxMJn4PZoX697MxvNwvVmWwrY72ZY4mzGgZ/3cFTl rLm1d2ihNkgM2ApcROfGMA2+I+CB23D4XThJEdruymsSQhxVQRMceD96HJJQDTsc95YTbM WxE1f3pnYj+7BPCjLUMxOPN+46GbrfYqCMVnA1YV60FXdwnfYaNURDShGY5xmA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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=1679433620; a=rsa-sha256; cv=none; b=mZHjqFdocjsWXOHr6N9judQzzD4tShVQBUxXZn10Q4R+AhJxILllP3GI0yWrP0dtsDGW6n n9LVarQzMd87pDGDCLTClyxRsfwWC50hV2EOVxJ8X+kjECVwKaExjKxj3yXJGQfxF6gNy0 meaMhpImQ7ggQ/PzLHYTYhPMJ3C4owPLxG/1V/tkyjKWvK/h8uN/xKyXHHfTxVmPaHI6MM +Aojq85mCxax+DKNt5n9qUNCbbqD2wLxwOSG1I8WUjYhYW10R/+0Tulx6ycermzfGf4bEm S/BfOvMxdeokPJW2yih6py/RK7rRkcXj2En7c9VgTE5YW81pubgNWxGkfdE+pQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pejOr-0008HS-Dh; Tue, 21 Mar 2023 17:20:09 -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 1pejOn-0008H4-M7 for guix-patches@gnu.org; Tue, 21 Mar 2023 17:20:07 -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 1pejOk-0005kG-PM for guix-patches@gnu.org; Tue, 21 Mar 2023 17:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pejOk-0002jv-DB for guix-patches@gnu.org; Tue, 21 Mar 2023 17:20:02 -0400 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-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: E35F937BDF X-Spam-Score: -3.05 X-Migadu-Spam-Score: -3.05 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: LaMQr1xAoOYW * 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