andreas pushed a commit to branch qt-team
in repository guix.
commit d859abc75f291a2546329cbd261187e13e4f5d66
Author: 宋文武 <iyzs...@member.fsf.org>
AuthorDate: Mon Feb 10 11:42:55 2025 +0800
gnu: converseen: Update to 0.12.2.5.
* gnu/packages/patches/converseen-hide-updates-checks.patch: Remove file.
* gnu/packages/patches/converseen-hide-non-free-pointers.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/image.scm (converseen): Update to 0.12.2.5.
[source]: Remove patches.
[arguments]: Add patch-source phase to disable auto update and website
links.
Change-Id: I9cbdad581803d4b1910afb1115e3b8404b1faa7e
---
gnu/local.mk | 2 -
gnu/packages/image.scm | 20 +-
.../converseen-hide-non-free-pointers.patch | 277 ---------------------
.../patches/converseen-hide-updates-checks.patch | 110 --------
4 files changed, 10 insertions(+), 399 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9e92c7b5bc..dd830e129a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1137,8 +1137,6 @@ dist_patch_DATA =
\
%D%/packages/patches/combinatorial-blas-awpm.patch \
%D%/packages/patches/combinatorial-blas-io-fix.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/coq-autosubst-1.8-remove-deprecated-files.patch
\
%D%/packages/patches/corectrl-polkit-install-dir.patch \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 0270346f47..1b617ed0c2 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -123,7 +123,7 @@
(define-public converseen
(package
(name "converseen")
- (version "0.12.0.2")
+ (version "0.12.2.5")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -132,12 +132,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0gjg2ma8v8pwldny4j2ag92g5zrv5cz511mq44qr7akjsddq6q6p"))
- (patches
- (search-patches "converseen-hide-updates-checks.patch"
- ;; Remove links to sites relying on non-free
- ;; Javascript.
- "converseen-hide-non-free-pointers.patch"))))
+ "03jsf5418kk1j8mk0gjzxb79lv44yy1wsycn6g6fmvg4zhl2cls3"))))
(build-system cmake-build-system)
(arguments
(list
@@ -145,10 +140,15 @@
#:configure-flags #~(list "-DUSE_QT6=yes")
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'set-translations-location
- ;; Fix translations location. Without this, only English is
- ;; offered.
+ (add-after 'unpack 'patch-source
(lambda _
+ ;; Disable auto update and website links, for privacy concerns.
+ (substitute* "src/mainwindowimpl.cpp"
+ (("up->checkForUpdates[(][)];") ""))
+ (substitute* '("src/dialoginfo.cpp" "src/mainwindowimpl.cpp")
+ (("QDesktopServices::openUrl.*;") ""))
+ ;; Fix translations location. Without this, only English is
+ ;; offered.
(substitute* "src/translator.cpp"
(("QString\\(\"%1/share/converseen/loc\"\\).arg\\(rootPath\\)")
(string-append "QString(\""
diff --git a/gnu/packages/patches/converseen-hide-non-free-pointers.patch
b/gnu/packages/patches/converseen-hide-non-free-pointers.patch
deleted file mode 100644
index 9c27cdafe3..0000000000
--- a/gnu/packages/patches/converseen-hide-non-free-pointers.patch
+++ /dev/null
@@ -1,277 +0,0 @@
-Remove pointers to PayPal and Facebook.
-Upstream status: Guix-specific, not forwarded upstream.
-
-diff --git a/src/dialoginfo.cpp b/src/dialoginfo.cpp
-index 52dd628..b37c413 100755
---- a/src/dialoginfo.cpp
-+++ b/src/dialoginfo.cpp
-@@ -33,7 +33,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;
-@@ -66,62 +65,4 @@ DialogInfo::DialogInfo(QWidget *parent) :
- .arg(qtVersionStrTr)
- .arg(QT_VERSION_STR);
- labelQtVersion->setText(qt_versionString);
--
-- // This section generates a Text + Png pixmap icon for the donazion
button!
--
-- QString donateText = tr("Make a Donation!");
-- QString donateDescriptionText = tr("Donate using PayPal, Ko-Fi or
Cryptocurrencies.");
--
-- QString htmlDonationText = QString(R"(
-- <style>
-- table {
-- border-collapse: collapse;
-- }
-- td {
-- text-align: center;
-- vertical-align: middle;
-- padding: 5px;
-- }
-- </style>
--
-- <table>
-- <tr>
-- <td><img src=':/Images/res/heart.png' width='52'
height='52'></td>
-- <td>
-- <span style='font-weight: bold; font-size:18pt;
text-align: center;'>%1</span><br />
-- <span style='font-style: italic; font-size:8pt;
text-align: center;'>%2</span>
-- </td>
-- </tr>
-- </table>
-- )")
-- .arg(donateText, donateDescriptionText);
--
-- QTextDocument donateHtmlText;
-- donateHtmlText.setHtml(htmlDonationText);
--
-- QPixmap pixmapDonationText(donateHtmlText.size().width(),
donateHtmlText.size().height());
-- pixmapDonationText.fill( Qt::transparent );
--
-- QPainter painter( &pixmapDonationText );
-- painter.setRenderHint(QPainter::Antialiasing, true);
--
-- donateHtmlText.drawContents(&painter, pixmapDonationText.rect());
--
-- QIcon donateButtonIcon(pixmapDonationText);
-- pushDonatePayPal->setIcon(donateButtonIcon);
-- pushDonatePayPal->setIconSize(pixmapDonationText.rect().size());
--
-- adjustSize();
-- this->resize(512, 800);
--}
--
--void DialogInfo::openFacebookPage()
--{
-- QDesktopServices::openUrl(QUrl("https://www.facebook.com/converseen";,
QUrl::TolerantMode));
- }
--
--void DialogInfo::on_pushDonatePayPal_clicked()
--{
--
QDesktopServices::openUrl(QUrl("https://converseen.fasterland.net/donate/";,
QUrl::TolerantMode));
--}
--
-diff --git a/src/dialoginfo.h b/src/dialoginfo.h
-index 4d8ba15..ef6afa9 100755
---- a/src/dialoginfo.h
-+++ b/src/dialoginfo.h
-@@ -32,8 +32,6 @@ public:
- DialogInfo(QWidget *parent = 0);
-
- private slots:
-- void openFacebookPage();
-- void on_pushDonatePayPal_clicked();
- };
-
- #endif // DIALOGINFO_H
-diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp
-index 71ddc2c..bd4294b 100755
---- a/src/mainwindowimpl.cpp
-+++ b/src/mainwindowimpl.cpp
-@@ -163,7 +163,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()));
- connect(actionCheckForUpdates, SIGNAL(triggered()), this,
SLOT(checkForUpdates()));
- connect(actionHelp, SIGNAL(triggered()), this, SLOT(onlineHelp()));
-diff --git a/ui/dialoginfo.ui b/ui/dialoginfo.ui
-index 2878670..0535a85 100755
---- a/ui/dialoginfo.ui
-+++ b/ui/dialoginfo.ui
-@@ -273,146 +273,6 @@ p, li { white-space: pre-wrap; }
- </layout>
- </widget>
- </item>
-- <item>
-- <layout class="QVBoxLayout" name="verticalLayout">
-- <item>
-- <widget class="QLabel" name="label_18">
-- <property name="text">
-- <string><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></string>
-- </property>
-- <property name="wordWrap">
-- <bool>true</bool>
-- </property>
-- </widget>
-- </item>
-- <item>
-- <layout class="QHBoxLayout" name="horizontalLayout_4">
-- <item>
-- <spacer name="horizontalSpacer_4">
-- <property name="orientation">
-- <enum>Qt::Horizontal</enum>
-- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>40</width>
-- <height>20</height>
-- </size>
-- </property>
-- </spacer>
-- </item>
-- <item>
-- <widget class="QPushButton" name="pushDonatePayPal">
-- <property name="cursor">
-- <cursorShape>PointingHandCursor</cursorShape>
-- </property>
-- <property name="text">
-- <string/>
-- </property>
-- <property name="iconSize">
-- <size>
-- <width>150</width>
-- <height>50</height>
-- </size>
-- </property>
-- <property name="autoDefault">
-- <bool>false</bool>
-- </property>
-- <property name="flat">
-- <bool>true</bool>
-- </property>
-- </widget>
-- </item>
-- <item>
-- <spacer name="horizontalSpacer_5">
-- <property name="orientation">
-- <enum>Qt::Horizontal</enum>
-- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>40</width>
-- <height>20</height>
-- </size>
-- </property>
-- </spacer>
-- </item>
-- </layout>
-- </item>
-- </layout>
-- </item>
-- <item>
-- <widget class="Line" name="line_2">
-- <property name="orientation">
-- <enum>Qt::Horizontal</enum>
-- </property>
-- </widget>
-- </item>
-- <item>
-- <layout class="QHBoxLayout" name="horizontalLayout_5">
-- <item>
-- <spacer name="horizontalSpacer_2">
-- <property name="orientation">
-- <enum>Qt::Horizontal</enum>
-- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>40</width>
-- <height>20</height>
-- </size>
-- </property>
-- </spacer>
-- </item>
-- <item>
-- <layout class="QHBoxLayout" name="horizontalLayout_3">
-- <item>
-- <widget class="QLabel" name="label_7">
-- <property name="text">
-- <string><html><head/><body><p><span
style=" font-size:11pt; font-weight:600;">Follow
Converseen:</span></p></body></html></string>
-- </property>
-- </widget>
-- </item>
-- <item>
-- <widget class="QPushButton" name="pushFacebook">
-- <property name="cursor">
-- <cursorShape>PointingHandCursor</cursorShape>
-- </property>
-- <property name="text">
-- <string/>
-- </property>
-- <property name="icon">
-- <iconset resource="../resources.qrc">
--
<normaloff>:/Images/res/facebook-icon.png</normaloff>:/Images/res/facebook-icon.png</iconset>
-- </property>
-- <property name="iconSize">
-- <size>
-- <width>32</width>
-- <height>32</height>
-- </size>
-- </property>
-- <property name="autoDefault">
-- <bool>false</bool>
-- </property>
-- <property name="flat">
-- <bool>true</bool>
-- </property>
-- </widget>
-- </item>
-- </layout>
-- </item>
-- <item>
-- <spacer name="horizontalSpacer_3">
-- <property name="orientation">
-- <enum>Qt::Horizontal</enum>
-- </property>
-- <property name="sizeHint" stdset="0">
-- <size>
-- <width>40</width>
-- <height>20</height>
-- </size>
-- </property>
-- </spacer>
-- </item>
-- </layout>
-- </item>
- <item>
- <widget class="Line" name="line">
- <property name="orientation">
-diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
-index 24bda6f..e8a072d 100755
---- a/ui/mainwindow.ui
-+++ b/ui/mainwindow.ui
-@@ -1408,18 +1408,6 @@ p, li { white-space: pre-wrap; }
- <string>&About</string>
- </property>
- </action>
-- <action name="actionDonatePaypal">
-- <property name="icon">
-- <iconset resource="../resources.qrc">
--
<normaloff>:/Images/res/heart.png</normaloff>:/Images/res/heart.png</iconset>
-- </property>
-- <property name="text">
-- <string>&Donate!</string>
-- </property>
-- <property name="toolTip">
-- <string>Donate via Paypal, Ko-Fi, Cryptocurrencies</string>
-- </property>
-- </action>
- <action name="actionReportBug">
- <property name="text">
- <string>&Report bug...</string>
diff --git a/gnu/packages/patches/converseen-hide-updates-checks.patch
b/gnu/packages/patches/converseen-hide-updates-checks.patch
deleted file mode 100644
index 6d3aabdb1a..0000000000
--- a/gnu/packages/patches/converseen-hide-updates-checks.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Remove Check updates button and Auto check updates 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 6562e35..d19bc28 100755
---- a/src/mainwindowimpl.cpp
-+++ b/src/mainwindowimpl.cpp
-@@ -163,7 +163,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()));
- connect(actionHelp, SIGNAL(triggered()), this, SLOT(onlineHelp()));
-
- // Create first toolbar button
-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 @@
- </layout>
- </widget>
- </item>
-- <item>
-- <widget class="QGroupBox" name="groupBox_3">
-- <property name="title">
-- <string>Updates</string>
-- </property>
-- <layout class="QVBoxLayout" name="verticalLayout_3">
-- <item>
-- <widget class="QCheckBox" name="checkCheckUpdates">
-- <property name="text">
-- <string>Checks for updates automatically</string>
-- </property>
-- </widget>
-- </item>
-- </layout>
-- </widget>
-- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
-diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui
-index 569565f..b86fc2e 100755
---- a/ui/mainwindow.ui
-+++ b/ui/mainwindow.ui
-@@ -356,7 +356,6 @@
- <addaction name="separator"/>
- <addaction name="actionDonatePaypal"/>
- <addaction name="separator"/>
-- <addaction name="actionCheckForUpdates"/>
- <addaction name="actionReportBug"/>
- <addaction name="separator"/>
- <addaction name="actionInfo"/>
-@@ -1412,14 +1411,6 @@ p, li { white-space: pre-wrap; }
- <string>Import windows icon (*.ico *.icon)</string>
- </property>
- </action>
-- <action name="actionCheckForUpdates">
-- <property name="text">
-- <string>&Check for updates</string>
-- </property>
-- <property name="toolTip">
-- <string>Check if a new version of Converseen is available</string>
-- </property>
-- </action>
- <action name="actionAddDirectory">
- <property name="icon">
- <iconset resource="../resources.qrc">
