[packages/pinentry] - updated to 1.3.1
qboosh
qboosh at pld-linux.org
Tue Aug 27 21:07:27 CEST 2024
commit c9431a4d8c151a1196d300228b5aa9757ce31de4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Aug 27 20:58:37 2024 +0200
- updated to 1.3.1
pinentry.spec | 11 ++---
qt-defines.patch | 140 -------------------------------------------------------
2 files changed, 5 insertions(+), 146 deletions(-)
---
diff --git a/pinentry.spec b/pinentry.spec
index fd37aa7..30cdda1 100644
--- a/pinentry.spec
+++ b/pinentry.spec
@@ -13,14 +13,13 @@
Summary: Simple PIN or passphrase entry dialogs
Summary(pl.UTF-8): Proste kontrolki dialogowe do wpisywania PIN-ów lub haseł
Name: pinentry
-Version: 1.3.0
-Release: 2
+Version: 1.3.1
+Release: 1
License: GPL v2+
Group: Applications
-Source0: ftp://ftp.gnupg.org/gcrypt/pinentry/%{name}-%{version}.tar.bz2
-# Source0-md5: ccae9619032fda53b234849c7c2253ac
+Source0: https://www.gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2
+# Source0-md5: 89a6844fcf76d3c022ce6c6e930c17ee
Patch0: %{name}-info.patch
-Patch1: qt-defines.patch
URL: https://www.gnupg.org/
%{?with_qt5:BuildRequires: Qt5Core-devel >= 5.0.0}
%{?with_qt5:BuildRequires: Qt5Gui-devel >= 5.0.0}
@@ -187,7 +186,6 @@ Prosta kontrolka dialogowa do wpisywania PIN-ów lub haseł dla Qt6.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%{__sed} -i -e 's@^\(Exec=.*/pinentry-qt\)$@\16@' qt/org.gnupg.pinentry-qt.desktop.in
@@ -279,6 +277,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/pinentry
%attr(755,root,root) %{_bindir}/pinentry-curses
%attr(755,root,root) %{_bindir}/pinentry-tty
+%{_pixmapsdir}/pinentry.png
%{_infodir}/pinentry.info*
%if %{with efl}
diff --git a/qt-defines.patch b/qt-defines.patch
deleted file mode 100644
index b4f8975..0000000
--- a/qt-defines.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 844360c9c99d2f11dc4236c0ab6bdb9b56758898 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker at kde.org>
-Date: Mon, 18 Mar 2024 20:38:09 +0100
-Subject: [PATCH] qt5: Add a '5' to adjust defines
-
-* qt5/capslock.cpp, qt5/capslock_p.h, qt5/capslock_unix.cpp: Check for
-correct defines.
---
-
-They were changed from PINENTRY_QT_FOO to PINENTRY_QT5_FOO in
-1e79123c389584b8240387914b193be41b823e92.
----
- qt5/capslock.cpp | 4 ++--
- qt5/capslock_p.h | 8 ++++----
- qt5/capslock_unix.cpp | 14 +++++++-------
- 3 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/qt5/capslock.cpp b/qt5/capslock.cpp
-index 2d20864..48cca4e 100644
---- a/qt5/capslock.cpp
-+++ b/qt5/capslock.cpp
-@@ -32,7 +32,7 @@
- CapsLockWatcher::Private::Private(CapsLockWatcher *q)
- : q{q}
- {
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- if (qApp->platformName() == QLatin1String("wayland")) {
- watchWayland();
- }
-@@ -44,7 +44,7 @@ CapsLockWatcher::CapsLockWatcher(QObject *parent)
- , d{new Private{this}}
- {
- if (qApp->platformName() == QLatin1String("wayland")) {
--#ifndef PINENTRY_QT_WAYLAND
-+#ifndef PINENTRY_QT5_WAYLAND
- qWarning() << "CapsLockWatcher was compiled without support for Wayland";
- #endif
- }
-diff --git a/qt5/capslock_p.h b/qt5/capslock_p.h
-index 8c6fc49..65f0ad2 100644
---- a/qt5/capslock_p.h
-+++ b/qt5/capslock_p.h
-@@ -23,7 +23,7 @@
-
- #include "capslock.h"
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- namespace KWayland
- {
- namespace Client
-@@ -38,12 +38,12 @@ class CapsLockWatcher::Private
- {
- public:
- explicit Private(CapsLockWatcher *);
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- void watchWayland();
- #endif
-
- private:
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- void registry_seatAnnounced(quint32, quint32);
- void seat_hasKeyboardChanged(bool);
- void keyboard_modifiersChanged(quint32);
-@@ -52,7 +52,7 @@ private:
- private:
- CapsLockWatcher *const q;
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- KWayland::Client::Registry *registry = nullptr;
- KWayland::Client::Seat *seat = nullptr;
- #endif
-diff --git a/qt5/capslock_unix.cpp b/qt5/capslock_unix.cpp
-index 320f738..d1959cb 100644
---- a/qt5/capslock_unix.cpp
-+++ b/qt5/capslock_unix.cpp
-@@ -25,7 +25,7 @@
- #include "capslock.h"
- #include "capslock_p.h"
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- # include <KWayland/Client/connection_thread.h>
- # include <KWayland/Client/keyboard.h>
- # include <KWayland/Client/registry.h>
-@@ -34,7 +34,7 @@
-
- #include <QGuiApplication>
-
--#ifdef PINENTRY_QT_X11
-+#ifdef PINENTRY_QT5_X11
- # include <QX11Info>
- # include <X11/XKBlib.h>
- # undef Status
-@@ -42,25 +42,25 @@
-
- #include <QDebug>
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- using namespace KWayland::Client;
- #endif
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- static bool watchingWayland = false;
- #endif
-
- LockState capsLockState()
- {
- static bool reportUnsupportedPlatform = true;
--#ifdef PINENTRY_QT_X11
-+#ifdef PINENTRY_QT5_X11
- if (qApp->platformName() == QLatin1String("xcb")) {
- unsigned int state;
- XkbGetIndicatorState(QX11Info::display(), XkbUseCoreKbd, &state);
- return (state & 0x01) == 1 ? LockState::On : LockState::Off;
- }
- #endif
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- if (qApp->platformName() == QLatin1String("wayland")) {
- if (!watchingWayland && reportUnsupportedPlatform) {
- qDebug() << "Use CapsLockWatcher for checking for Caps Lock on Wayland";
-@@ -74,7 +74,7 @@ LockState capsLockState()
- return LockState::Unknown;
- }
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- void CapsLockWatcher::Private::watchWayland()
- {
- watchingWayland = true;
---
-2.30.2
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pinentry.git/commitdiff/c9431a4d8c151a1196d300228b5aa9757ce31de4
More information about the pld-cvs-commit
mailing list