summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2023-03-21 22:19:28 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2023-04-17 23:36:55 +0200
commit63500cbbee8b91d9789e550fd3f027ae2e18059c (patch)
treed76682c7c342995a0b5993539c4037624f8c0190
parent50dd91bc30634c75c0001cfd38bbcc2fbbeb894e (diff)
gnu: Add converseen.
* 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.
Diffstat
-rw-r--r--gnu/local.mk2
-rw-r--r--gnu/packages/image.scm46
-rw-r--r--gnu/packages/patches/converseen-hide-non-free-pointers.patch198
-rw-r--r--gnu/packages/patches/converseen-hide-updates-checks.patch110
4 files changed, 356 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 1241ab09c05..01ffe3fdb60 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1013,6 +1013,8 @@ dist_patch_DATA = \
1013 %D%/packages/patches/connman-CVE-2022-32293-pt1.patch \ 1013 %D%/packages/patches/connman-CVE-2022-32293-pt1.patch \
1014 %D%/packages/patches/connman-CVE-2022-32293-pt2.patch \ 1014 %D%/packages/patches/connman-CVE-2022-32293-pt2.patch \
1015 %D%/packages/patches/containerd-create-pid-file.patch \ 1015 %D%/packages/patches/containerd-create-pid-file.patch \
1016 %D%/packages/patches/converseen-hide-updates-checks.patch \
1017 %D%/packages/patches/converseen-hide-non-free-pointers.patch \
1016 %D%/packages/patches/cool-retro-term-wctype.patch \ 1018 %D%/packages/patches/cool-retro-term-wctype.patch \
1017 %D%/packages/patches/coreutils-gnulib-tests.patch \ 1019 %D%/packages/patches/coreutils-gnulib-tests.patch \
1018 %D%/packages/patches/coq-fix-envvars.patch \ 1020 %D%/packages/patches/coq-fix-envvars.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index ceb33dfcd79..765db31ccac 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -36,6 +36,7 @@
36;;; Copyright © 2022 ( <paren@disroot.org> 36;;; Copyright © 2022 ( <paren@disroot.org>
37;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu> 37;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu>
38;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> 38;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
39;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
39;;; 40;;;
40;;; This file is part of GNU Guix. 41;;; This file is part of GNU Guix.
41;;; 42;;;
@@ -77,6 +78,7 @@
77 #:use-module (gnu packages gnome) 78 #:use-module (gnu packages gnome)
78 #:use-module (gnu packages graphics) 79 #:use-module (gnu packages graphics)
79 #:use-module (gnu packages gtk) 80 #:use-module (gnu packages gtk)
81 #:use-module (gnu packages imagemagick)
80 #:use-module (gnu packages lua) 82 #:use-module (gnu packages lua)
81 #:use-module (gnu packages man) 83 #:use-module (gnu packages man)
82 #:use-module (gnu packages maths) 84 #:use-module (gnu packages maths)
@@ -116,6 +118,50 @@
116 #:use-module (guix deprecation) 118 #:use-module (guix deprecation)
117 #:use-module (srfi srfi-1)) 119 #:use-module (srfi srfi-1))
118 120
121(define-public converseen
122 (package
123 (name "converseen")
124 (version "0.9.11.1")
125 (source (origin
126 (method git-fetch)
127 (uri (git-reference
128 (url "https://github.com/Faster3ck/Converseen")
129 (commit (string-append "v" version))))
130 (file-name (git-file-name name version))
131 (sha256
132 (base32
133 "0nxvac8df47gxg1klqlz0s3rxl0ykrikmciniwkb938bgilmaijm"))
134 (patches
135 (search-patches "converseen-hide-updates-checks.patch"
136 ;; Remove links to sites relying on non-free
137 ;; Javascript.
138 "converseen-hide-non-free-pointers.patch"))))
139 (build-system cmake-build-system)
140 (arguments
141 (list
142 #:tests? #false ;no tests
143 #:phases
144 #~(modify-phases %standard-phases
145 (add-after 'unpack 'set-translations-location
146 ;; Fix translations location. Without this, only English is
147 ;; offered.
148 (lambda _
149 (substitute* "src/translator.cpp"
150 (("QString\\(\"%1/share/converseen/loc\"\\).arg\\(rootPath\\)")
151 (string-append "QString(\""
152 #$output
153 "/share/converseen/loc\")"))))))))
154 (native-inputs
155 (list pkg-config qttools-5))
156 (inputs
157 (list imagemagick qtbase-5))
158 (home-page "https://converseen.fasterland.net/")
159 (synopsis "Batch image converter and resizer")
160 (description
161 "Converseen is an image batch conversion tool. You can resize and
162convert images in more than 100 different formats.")
163 (license license:gpl3+)))
164
119(define-public iqa 165(define-public iqa
120 (package 166 (package
121 (name "iqa") 167 (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 00000000000..b4994733cda
--- /dev/null
+++ b/gnu/packages/patches/converseen-hide-non-free-pointers.patch
@@ -0,0 +1,198 @@
1Remove pointers to PayPal and Facebook.
2Upstream status: Guix-specific, not forwarded upstream.
3
4diff --git a/src/dialoginfo.cpp b/src/dialoginfo.cpp
5index 3302f55..b64f414 100755
6--- a/src/dialoginfo.cpp
7+++ b/src/dialoginfo.cpp
8@@ -31,7 +31,6 @@ DialogInfo::DialogInfo(QWidget *parent) :
9 setupUi(this);
10
11 connect(pushClose, SIGNAL(clicked()), this, SLOT(close()));
12- connect(pushFacebook, SIGNAL(clicked()), this, SLOT(openFacebookPage()));
13
14 QString appVersion;
15 QString magickVersion;
16@@ -63,8 +62,3 @@ void DialogInfo::openFacebookPage()
17 QDesktopServices::openUrl(QUrl("https://www.facebook.com/converseen", QUrl::TolerantMode));
18 }
19
20-void DialogInfo::on_pushDonatePayPal_clicked()
21-{
22- QDesktopServices::openUrl(QUrl("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HQA6TBT5354FC", QUrl::TolerantMode));
23-}
24-
25diff --git a/src/dialoginfo.h b/src/dialoginfo.h
26index 4c13776..f1b7ea3 100755
27--- a/src/dialoginfo.h
28+++ b/src/dialoginfo.h
29@@ -33,7 +33,6 @@ public:
30
31 private slots:
32 void openFacebookPage();
33- void on_pushDonatePayPal_clicked();
34 };
35
36 #endif // DIALOGINFO_H
37diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp
38index 83a365f..9a44492 100755
39--- a/src/mainwindowimpl.cpp
40+++ b/src/mainwindowimpl.cpp
41@@ -162,7 +162,6 @@ void MainWindowImpl::createActions()
42 connect(actionConvert, SIGNAL(triggered()), this, SLOT(elabora()));
43
44 connect(actionInfo, SIGNAL(triggered()), this, SLOT(about()));
45- connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink()));
46 connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport()));
47 }
48
49diff --git a/ui/dialoginfo.ui b/ui/dialoginfo.ui
50index b2c7788..20b9d9d 100755
51--- a/ui/dialoginfo.ui
52+++ b/ui/dialoginfo.ui
53@@ -254,122 +254,6 @@ p, li { white-space: pre-wrap; }
54 </layout>
55 </widget>
56 </item>
57- <item>
58- <layout class="QVBoxLayout" name="verticalLayout">
59- <item>
60- <widget class="QLabel" name="label_18">
61- <property name="text">
62- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;If you appreciate this work and would like to support the project, you are welcome to donate via PayPal&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
63- </property>
64- <property name="wordWrap">
65- <bool>true</bool>
66- </property>
67- </widget>
68- </item>
69- <item>
70- <layout class="QHBoxLayout" name="horizontalLayout_4">
71- <item>
72- <widget class="QPushButton" name="pushDonatePayPal">
73- <property name="text">
74- <string/>
75- </property>
76- <property name="icon">
77- <iconset resource="../resources.qrc">
78- <normaloff>:/Images/res/btn_donateCC_LG.png</normaloff>:/Images/res/btn_donateCC_LG.png</iconset>
79- </property>
80- <property name="iconSize">
81- <size>
82- <width>150</width>
83- <height>50</height>
84- </size>
85- </property>
86- <property name="flat">
87- <bool>true</bool>
88- </property>
89- </widget>
90- </item>
91- </layout>
92- </item>
93- </layout>
94- </item>
95- <item>
96- <widget class="Line" name="line_2">
97- <property name="orientation">
98- <enum>Qt::Horizontal</enum>
99- </property>
100- </widget>
101- </item>
102- <item>
103- <layout class="QHBoxLayout" name="horizontalLayout_5">
104- <item>
105- <spacer name="horizontalSpacer_2">
106- <property name="orientation">
107- <enum>Qt::Horizontal</enum>
108- </property>
109- <property name="sizeHint" stdset="0">
110- <size>
111- <width>40</width>
112- <height>20</height>
113- </size>
114- </property>
115- </spacer>
116- </item>
117- <item>
118- <layout class="QHBoxLayout" name="horizontalLayout_3">
119- <item>
120- <widget class="QLabel" name="label_7">
121- <property name="text">
122- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:11pt; font-weight:600;&quot;&gt;Follow Converseen:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
123- </property>
124- </widget>
125- </item>
126- <item>
127- <widget class="QPushButton" name="pushFacebook">
128- <property name="cursor">
129- <cursorShape>PointingHandCursor</cursorShape>
130- </property>
131- <property name="text">
132- <string/>
133- </property>
134- <property name="icon">
135- <iconset resource="../resources.qrc">
136- <normaloff>:/Images/res/facebook-icon.png</normaloff>:/Images/res/facebook-icon.png</iconset>
137- </property>
138- <property name="iconSize">
139- <size>
140- <width>32</width>
141- <height>32</height>
142- </size>
143- </property>
144- <property name="flat">
145- <bool>true</bool>
146- </property>
147- </widget>
148- </item>
149- </layout>
150- </item>
151- <item>
152- <spacer name="horizontalSpacer_3">
153- <property name="orientation">
154- <enum>Qt::Horizontal</enum>
155- </property>
156- <property name="sizeHint" stdset="0">
157- <size>
158- <width>40</width>
159- <height>20</height>
160- </size>
161- </property>
162- </spacer>
163- </item>
164- </layout>
165- </item>
166- <item>
167- <widget class="Line" name="line">
168- <property name="orientation">
169- <enum>Qt::Horizontal</enum>
170- </property>
171- </widget>
172- </item>
173 <item>
174 <widget class="QLabel" name="label_2">
175 <property name="text">
176diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
177index 28df8cc..0ee7f37 100755
178--- a/ui/mainwindow.ui
179+++ b/ui/mainwindow.ui
180@@ -1334,18 +1334,6 @@ p, li { white-space: pre-wrap; }
181 <string>F1</string>
182 </property>
183 </action>
184- <action name="actionDonatePaypal">
185- <property name="icon">
186- <iconset resource="../resources.qrc">
187- <normaloff>:/Images/res/paypal_mini.png</normaloff>:/Images/res/paypal_mini.png</iconset>
188- </property>
189- <property name="text">
190- <string>&amp;Donate via Paypal</string>
191- </property>
192- <property name="toolTip">
193- <string>Donate via Paypal</string>
194- </property>
195- </action>
196 <action name="actionReportBug">
197 <property name="text">
198 <string>&amp;Report bug...</string>
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 00000000000..c4c80b5bec0
--- /dev/null
+++ b/gnu/packages/patches/converseen-hide-updates-checks.patch
@@ -0,0 +1,110 @@
1Remove Check updates button and Auto check updates option.
2Upstream status: Guix-specific, not forwarded upstream.
3
4diff --git a/src/dialogoptions.cpp b/src/dialogoptions.cpp
5index 704e75c..bb3f9b0 100755
6--- a/src/dialogoptions.cpp
7+++ b/src/dialogoptions.cpp
8@@ -71,23 +71,10 @@ void DialogOptions::setOverwriteMode()
9 IniSettings::setOverwriteMode(true);
10 }
11
12-void DialogOptions::setAutoUpdates()
13-{
14- bool enabled;
15-
16- if (checkCheckUpdates->isChecked())
17- enabled = true;
18- else
19- enabled = false;
20-
21- IniSettings::setAutoChechUpdates(enabled);
22-}
23-
24 void DialogOptions::saveOptions()
25 {
26 setLanguage();
27 setOverwriteMode();
28- setAutoUpdates();
29
30 IniSettings::settings->sync();
31 accept();
32@@ -102,12 +89,6 @@ void DialogOptions::loadSettings()
33 else
34 radioAskFirst->setChecked(true);
35
36- bool autoUpdates = IniSettings::isAutoChechUpdates();
37- if (autoUpdates)
38- checkCheckUpdates->setCheckState(Qt::Checked);
39- else
40- checkCheckUpdates->setCheckState(Qt::Unchecked);
41-
42 Translator t;
43
44 int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly);
45diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp
46index 2b6d68d..83a365f 100755
47--- a/src/mainwindowimpl.cpp
48+++ b/src/mainwindowimpl.cpp
49@@ -164,7 +164,6 @@ void MainWindowImpl::createActions()
50 connect(actionInfo, SIGNAL(triggered()), this, SLOT(about()));
51 connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink()));
52 connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport()));
53- connect(actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(checkForUpdates()));
54 }
55
56 void MainWindowImpl::setupMenu()
57diff --git a/ui/dialogoptions.ui b/ui/dialogoptions.ui
58index e59148d..6cb23f5 100755
59--- a/ui/dialogoptions.ui
60+++ b/ui/dialogoptions.ui
61@@ -66,22 +66,6 @@
62 </layout>
63 </widget>
64 </item>
65- <item>
66- <widget class="QGroupBox" name="groupBox_3">
67- <property name="title">
68- <string>Updates</string>
69- </property>
70- <layout class="QVBoxLayout" name="verticalLayout_3">
71- <item>
72- <widget class="QCheckBox" name="checkCheckUpdates">
73- <property name="text">
74- <string>Checks for updates automatically</string>
75- </property>
76- </widget>
77- </item>
78- </layout>
79- </widget>
80- </item>
81 <item>
82 <layout class="QHBoxLayout" name="horizontalLayout_2">
83 <item>
84diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
85index a5f55f0..28df8cc 100755
86--- a/ui/mainwindow.ui
87+++ b/ui/mainwindow.ui
88@@ -190,7 +190,6 @@
89 </property>
90 <addaction name="actionDonatePaypal"/>
91 <addaction name="separator"/>
92- <addaction name="actionCheckForUpdates"/>
93 <addaction name="actionReportBug"/>
94 <addaction name="separator"/>
95 </widget>
96@@ -1365,14 +1364,6 @@ p, li { white-space: pre-wrap; }
97 <string>Import windows icon (*.ico *.icon)</string>
98 </property>
99 </action>
100- <action name="actionCheckForUpdates">
101- <property name="text">
102- <string>&amp;Check for updates</string>
103- </property>
104- <property name="toolTip">
105- <string>Check if a new version of Converseen is available</string>
106- </property>
107- </action>
108 </widget>
109 <customwidgets>
110 <customwidget>
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 09:09:10 +0000