diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9a7d888560..1f434667f8 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2022 ( ;;; Copyright © 2022-2023 Bruno Victal ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2023 Nicolas Goaziou +;;; Copyright © 2023-2024 Nicolas Goaziou ;;; Copyright © 2023 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. @@ -122,7 +122,7 @@ (define-public converseen (package (name "converseen") - (version "0.11.0.0") + (version "0.12.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -131,7 +131,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1imc0dbbrs96yv3mp6bs7whd14zvgdw7hmv87bz8lp7d739s74z4")) + "0gjg2ma8v8pwldny4j2ag92g5zrv5cz511mq44qr7akjsddq6q6p")) (patches (search-patches "converseen-hide-updates-checks.patch" ;; Remove links to sites relying on non-free @@ -141,6 +141,7 @@ (arguments (list #:tests? #false ;no tests + #:configure-flags #~(list "-DUSE_QT6=yes") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'set-translations-location @@ -153,9 +154,9 @@ #$output "/share/converseen/loc\")")))))))) (native-inputs - (list pkg-config qttools-5)) + (list pkg-config qttools)) (inputs - (list imagemagick qtbase-5)) + (list imagemagick qtbase)) (home-page "https://converseen.fasterland.net/") (synopsis "Batch image converter and resizer") (description diff --git a/gnu/packages/patches/converseen-hide-non-free-pointers.patch b/gnu/packages/patches/converseen-hide-non-free-pointers.patch index b4994733cd..9c27cdafe3 100644 --- a/gnu/packages/patches/converseen-hide-non-free-pointers.patch +++ b/gnu/packages/patches/converseen-hide-non-free-pointers.patch @@ -2,10 +2,10 @@ 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 +index 52dd628..b37c413 100755 --- a/src/dialoginfo.cpp +++ b/src/dialoginfo.cpp -@@ -31,7 +31,6 @@ DialogInfo::DialogInfo(QWidget *parent) : +@@ -33,7 +33,6 @@ DialogInfo::DialogInfo(QWidget *parent) : setupUi(this); connect(pushClose, SIGNAL(clicked()), this, SLOT(close())); @@ -13,44 +13,99 @@ index 3302f55..b64f414 100755 QString appVersion; QString magickVersion; -@@ -63,8 +62,3 @@ void DialogInfo::openFacebookPage() - QDesktopServices::openUrl(QUrl("https://www.facebook.com/converseen", QUrl::TolerantMode)); +@@ -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"( +- +- +- +- +- +- +- +-
+- %1
+- %2 +-
+- )") +- .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://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HQA6TBT5354FC", QUrl::TolerantMode)); +- QDesktopServices::openUrl(QUrl("https://converseen.fasterland.net/donate/", QUrl::TolerantMode)); -} - diff --git a/src/dialoginfo.h b/src/dialoginfo.h -index 4c13776..f1b7ea3 100755 +index 4d8ba15..ef6afa9 100755 --- a/src/dialoginfo.h +++ b/src/dialoginfo.h -@@ -33,7 +33,6 @@ public: +@@ -32,8 +32,6 @@ public: + DialogInfo(QWidget *parent = 0); private slots: - void openFacebookPage(); +- void openFacebookPage(); - void on_pushDonatePayPal_clicked(); }; #endif // DIALOGINFO_H diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp -index 83a365f..9a44492 100755 +index 71ddc2c..bd4294b 100755 --- a/src/mainwindowimpl.cpp +++ b/src/mainwindowimpl.cpp -@@ -162,7 +162,6 @@ void MainWindowImpl::createActions() +@@ -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 b2c7788..20b9d9d 100755 +index 2878670..0535a85 100755 --- a/ui/dialoginfo.ui +++ b/ui/dialoginfo.ui -@@ -254,122 +254,6 @@ p, li { white-space: pre-wrap; } +@@ -273,146 +273,6 @@ p, li { white-space: pre-wrap; } @@ -69,25 +124,53 @@ index b2c7788..20b9d9d 100755 - - - +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- +- - +- +- PointingHandCursor +- - - - -- -- -- :/Images/res/btn_donateCC_LG.png:/Images/res/btn_donateCC_LG.png -- - - - 150 - 50 - - +- +- false +- - - true - - - +- +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- - - - @@ -141,6 +224,9 @@ index b2c7788..20b9d9d 100755 - 32 - - +- +- false +- - - true - @@ -162,35 +248,28 @@ index b2c7788..20b9d9d 100755 - - - -- -- -- -- -- Qt::Horizontal -- -- - - - + + diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui -index 28df8cc..0ee7f37 100755 +index 24bda6f..e8a072d 100755 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui -@@ -1334,18 +1334,6 @@ p, li { white-space: pre-wrap; } - F1 +@@ -1408,18 +1408,6 @@ p, li { white-space: pre-wrap; } + &About - - - -- :/Images/res/paypal_mini.png:/Images/res/paypal_mini.png +- :/Images/res/heart.png:/Images/res/heart.png - - -- &Donate via Paypal +- &Donate! - - -- Donate via Paypal +- Donate via Paypal, Ko-Fi, Cryptocurrencies - -