From patchwork Mon Mar 20 22:17:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 48473 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1060916F2D; Mon, 20 Mar 2023 22:18:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0EE0E16F1F for ; Mon, 20 Mar 2023 22:18:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peNpN-0007dB-KY; Mon, 20 Mar 2023 18:18: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 1peNpK-0007cz-VI for guix-patches@gnu.org; Mon, 20 Mar 2023 18:18:03 -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 1peNpK-0005T9-KK for guix-patches@gnu.org; Mon, 20 Mar 2023 18:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peNpK-0007YJ-4I for guix-patches@gnu.org; Mon, 20 Mar 2023 18:18:02 -0400 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 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-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: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: 3893758dac76fc30b23d4715e849e262306f268d 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 +