From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1290158041 for ; Tue, 19 Mar 2024 09:08:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14568E29A7; Tue, 19 Mar 2024 09:08:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E89FFE29A7 for ; Tue, 19 Mar 2024 09:08:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB466335DC2 for ; Tue, 19 Mar 2024 09:08:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EB5814F1 for ; Tue, 19 Mar 2024 09:08:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1710839263.d4318a72783d60913a98818f9af02b118333e7d2.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/, app-crypt/pinentry/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch app-crypt/pinentry/pinentry-1.3.0-r1.ebuild app-crypt/pinentry/pinentry-1.3.0.ebuild X-VCS-Directories: app-crypt/pinentry/files/ app-crypt/pinentry/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d4318a72783d60913a98818f9af02b118333e7d2 X-VCS-Branch: master Date: Tue, 19 Mar 2024 09:08:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 788b58eb-ff83-4a30-8ef2-e057fad9d5f9 X-Archives-Hash: 4667f9dbe5b320c87d1c78bda3b02047 commit: d4318a72783d60913a98818f9af02b118333e7d2 Author: Sam James gentoo org> AuthorDate: Tue Mar 19 08:53:28 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 19 09:07:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4318a72 app-crypt/pinentry: fix qt symlink typo, patch fixes * re symlink: Not that we're aware of anything needing it... * Pull in a patch for fixing ifdefs for Qt. Reported by asturm. * Fix our own automagic patch. Signed-off-by: Sam James gentoo.org> .../pinentry/files/pinentry-1.3.0-automagic.patch | 4 +- .../pinentry/files/pinentry-1.3.0-ifdef-qt.patch | 125 +++++++++++++++++++++ ...entry-1.3.0.ebuild => pinentry-1.3.0-r1.ebuild} | 3 +- 3 files changed, 129 insertions(+), 3 deletions(-) diff --git a/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch b/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch index 1236fb83f16d..a9f59ae66682 100644 --- a/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch +++ b/app-crypt/pinentry/files/pinentry-1.3.0-automagic.patch @@ -131,8 +131,8 @@ https://bugs.gentoo.org/837719 + ]) + + AS_IF([test "$have_qt5_x11extras" = "yes"], [ -+ PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS" -+ PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS" ++ PINENTRY_QT5_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT5_CFLAGS $PINENTRY_QT5_X11_EXTRAS_CFLAGS" ++ PINENTRY_QT5_LIBS="$LIBX11_LIBS $PINENTRY_QT5_LIBS $PINENTRY_QT5_X11_EXTRAS_LIBS" + ], [ + AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11]) + ]) diff --git a/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch b/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch new file mode 100644 index 000000000000..4fc724287515 --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch @@ -0,0 +1,125 @@ +https://dev.gnupg.org/D596 + +From 762346c5d1877cde6b37b191cd3c2469e1c7ddbb Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Mon, 18 Mar 2024 20:38:09 +0100 +Subject: [PATCH] qt5: Add a '5' to adjust defines + +They were changed from PINENTRY_QT_FOO to PINENTRY_QT5_FOO in +1e79123c389584b8240387914b193be41b823e92. +--- 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 + } +--- 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 +--- 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 + # include + # include +@@ -34,7 +34,7 @@ + + #include + +-#ifdef PINENTRY_QT_X11 ++#ifdef PINENTRY_QT5_X11 + # include + # include + # undef Status +@@ -42,25 +42,25 @@ + + #include + +-#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.44.0 diff --git a/app-crypt/pinentry/pinentry-1.3.0.ebuild b/app-crypt/pinentry/pinentry-1.3.0-r1.ebuild similarity index 98% rename from app-crypt/pinentry/pinentry-1.3.0.ebuild rename to app-crypt/pinentry/pinentry-1.3.0-r1.ebuild index 48ddc34b18c0..ec8d474a743f 100644 --- a/app-crypt/pinentry/pinentry-1.3.0.ebuild +++ b/app-crypt/pinentry/pinentry-1.3.0-r1.ebuild @@ -58,6 +58,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) PATCHES=( "${FILESDIR}/${PN}-1.0.0-AR.patch" "${FILESDIR}/${PN}-1.3.0-automagic.patch" # bug #819939, bug #837719 + "${FILESDIR}/${PN}-1.3.0-ifdef-qt.patch" ) src_prepare() { @@ -129,7 +130,7 @@ src_install() { if use qt6 ; then dosym pinentry-qt /usr/bin/pinentry-qt6 - elif use qt6 ; then + elif use qt5 ; then dosym pinentry-qt /usr/bin/pinentry-qt5 fi }