* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/
@ 2015-09-21 17:21 Kristian Fiskerstrand
0 siblings, 0 replies; 6+ messages in thread
From: Kristian Fiskerstrand @ 2015-09-21 17:21 UTC (permalink / raw
To: gentoo-commits
commit: 2b97b37e5a9f90e05b4675025332b1854462fe19
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 17:16:26 2015 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 17:18:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b97b37e
app-crypt/pinentry: Completely remove Qt5 detection
Revision bump that removes more of the Qt5 automagic that resulted in
failed builds in 0.9.6-r1
Bug: 560786
Package-Manager: portage-2.2.20.1
.../pinentry-0.9.6-Remove-detection-of-Qt5.patch | 60 ++++++++++++++
app-crypt/pinentry/pinentry-0.9.6-r2.ebuild | 93 ++++++++++++++++++++++
2 files changed, 153 insertions(+)
diff --git a/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch b/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch
new file mode 100644
index 0000000..0ab9160
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch
@@ -0,0 +1,60 @@
+From eb2cd9487749be01a1ad34ce6036366208147290 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kristian.fiskerstrand@sumptuouscapital.com>
+Date: Mon, 21 Sep 2015 19:09:04 +0200
+Subject: [PATCH] m4/qt.m4: Remove detection of Qt5
+
+---
+ m4/qt.m4 | 36 +-----------------------------------
+ 1 file changed, 1 insertion(+), 35 deletions(-)
+
+diff --git a/m4/qt.m4 b/m4/qt.m4
+index 0a7ea99..2982bb8 100644
+--- a/m4/qt.m4
++++ b/m4/qt.m4
+@@ -28,42 +28,8 @@ dnl The moc lookup code is based on libpoppler (rev. d821207)
+
+ AC_DEFUN([FIND_QT],
+ [
+- PKG_CHECK_MODULES(PINENTRY_QT,
+- Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0,
+- [have_qt5_libs="yes"],
+- [have_qt5_libs="no"])
++ have_qt5_libs="no"
+
+- if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then
+- PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic"
+- fi
+-
+- if test "$have_qt5_libs" = "yes"; then
+- AC_CHECK_TOOL(MOC, moc)
+- AC_MSG_CHECKING([moc version])
+- mocversion=`$MOC -v 2>&1`
+- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+- if test x"$mocversiongrep" != x"$mocversion"; then
+- AC_MSG_RESULT([no])
+- # moc was not the qt5 one, try with moc-qt5
+- AC_CHECK_TOOL(MOC2, moc-qt5)
+- mocversion=`$MOC2 -v 2>&1`
+- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+- if test x"$mocversiongrep" != x"$mocversion"; then
+- AC_CHECK_TOOL(QTCHOOSER, qtchooser)
+- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
+- mocversion=`$qt5tooldir/moc -v 2>&1`
+- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+- if test x"$mocversiongrep" != x"$mocversion"; then
+- # no valid moc found
+- have_qt5_libs="no";
+- else
+- MOC=$qt5tooldir/moc
+- fi
+- else
+- MOC=$MOC2
+- fi
+- fi
+- fi
+ if test "$have_qt5_libs" != "yes"; then
+ PKG_CHECK_MODULES(PINENTRY_QT,
+ QtCore >= 4.4.0 QtGui >= 4.4.0,
+--
+2.4.6
+
diff --git a/app-crypt/pinentry/pinentry-0.9.6-r2.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r2.ebuild
new file mode 100644
index 0000000..fe19fd0
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.6-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs gtk ncurses qt4 caps gnome-keyring static"
+
+RDEPEND="
+ >=dev-libs/libgpg-error-1.17
+ >=dev-libs/libassuan-2
+ app-eselect/eselect-pinentry
+ caps? ( sys-libs/libcap )
+ gtk? ( x11-libs/gtk+:2 )
+ ncurses? ( sys-libs/ncurses:0= )
+ qt4? ( >=dev-qt/qtgui-4.4.1:4 )
+ static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ gnome-keyring? ( app-crypt/libsecret )
+"
+REQUIRED_USE="
+ || ( ncurses gtk qt4 )
+ gtk? ( !static )
+ qt4? ( !static )
+ static? ( ncurses )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+ epatch "${FILESDIR}/${P}-Remove-detection-of-Qt5.patch"
+ eautoreconf
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+ # Issues finding qt on multilib systems
+ export QTLIB="${QTDIR}/$(get_libdir)"
+
+ econf \
+ --enable-pinentry-tty \
+ $(use_enable emacs pinentry-emacs) \
+ $(use_enable gtk pinentry-gtk2) \
+ $(use_enable ncurses pinentry-curses) \
+ $(use_enable ncurses fallback-curses) \
+ $(use_enable qt4 pinentry-qt) \
+ $(use_with caps libcap) \
+ $(use_enable gnome-keyring libsecret) \
+ $(use_enable gnome-keyring pinentry-gnome3) \
+ MOC="$(qt4_get_bindir)"/moc
+}
+
+src_install() {
+ default
+ rm -f "${ED}"/usr/bin/pinentry || die
+
+ if use_enable qt4; then
+ dosym pinentry-qt /usr/bin/pinentry-qt4
+ fi
+}
+
+pkg_postinst() {
+ if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+ elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+ elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+ elog "The soft resource limit for memory locking specifies the limit an"
+ elog "unprivileged process may lock into memory. You can also use POSIX"
+ elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+ elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+ elog "your users."
+ fi
+
+ eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+ eselect pinentry update ifunset
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/
@ 2016-08-11 19:02 Kristian Fiskerstrand
0 siblings, 0 replies; 6+ messages in thread
From: Kristian Fiskerstrand @ 2016-08-11 19:02 UTC (permalink / raw
To: gentoo-commits
commit: 01ebafa57018c481d63c32e794217e5d721fa724
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 19:01:52 2016 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 19:02:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01ebafa5
app-crypt/pinentry: Use -std=c++11 if using Qt >= 5.7
Gentoo-Bug: 587764
Package-Manager: portage-2.3.0
...pinentry-0.9.7-require-CPP11-for-qt-5-7.patches | 48 ++++++++
app-crypt/pinentry/pinentry-0.9.7-r1.ebuild | 123 +++++++++++++++++++++
2 files changed, 171 insertions(+)
diff --git a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
new file mode 100644
index 0000000..406571c
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
@@ -0,0 +1,48 @@
+From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Thu, 11 Aug 2016 14:44:37 +0200
+Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7
+
+ * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7
+
+--
+Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be
+compiled with at least this standard.
+
+This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if
+building against Qt 5.7 or higher.
+---
+ m4/qt.m4 | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/m4/qt.m4 b/m4/qt.m4
+index 093f428..90c4a6e 100644
+--- a/m4/qt.m4
++++ b/m4/qt.m4
+@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT],
+ enable_pinentry_qt5="try")
+
+ have_qt5_libs="no";
++ require_qt_cpp11="no";
+
+ if test "$enable_pinentry_qt5" != "no"; then
+ PKG_CHECK_MODULES(PINENTRY_QT,
+@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT],
+ fi
+ fi
+ if test "$have_qt5_libs" = "yes"; then
++ PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11,
++ Qt5Core >= 5.7.0,
++ [require_qt_cpp11="yes"],
++ [require_qt_cpp11="no"])
++
++ if test "${require_qt_cpp11}" = "yes"; then
++ PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11"
++ fi
++
+ AC_CHECK_TOOL(MOC, moc)
+ AC_MSG_CHECKING([moc version])
+ mocversion=`$MOC -v 2>&1`
+--
+2.7.3
+
diff --git a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
new file mode 100644
index 0000000..d97fc6b
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
+
+CDEPEND="
+ >=dev-libs/libgpg-error-1.17
+ >=dev-libs/libassuan-2.1
+ >=dev-libs/libgcrypt-1.6.3
+ ncurses? ( sys-libs/ncurses:0= )
+ gtk? ( x11-libs/gtk+:2 )
+ qt4? (
+ >=dev-qt/qtgui-4.4.1:4
+ )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ caps? ( sys-libs/libcap )
+ static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+ app-eselect/eselect-pinentry
+ gnome-keyring? ( app-crypt/libsecret )
+"
+
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+RDEPEND="
+ ${CDEPEND}
+ gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+ || ( ncurses gtk qt4 qt5 )
+ gtk? ( !static )
+ qt4? ( !static )
+ qt5? ( !static )
+ static? ( ncurses )
+ ?? ( qt4 qt5 )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"\
+ "${FILESDIR}/${P}-require-CPP11-for-qt-5-7.patches"
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=()
+ use static && append-ldflags -static
+ [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+ QT_MOC=""
+ if use qt4; then
+ myconf+=( --enable-pinentry-qt
+ --disable-pinentry-qt5
+ )
+ QT_MOC="$(qt4_get_bindir)"/moc
+ # Issues finding qt on multilib systems
+ export QTLIB="$(qt4_get_libdir)"
+ elif use qt5; then
+ myconf+=( --enable-pinentry-qt )
+ QT_MOC="$(qt5_get_bindir)"/moc
+ export QTLIB="$(qt5_get_libdir)"
+ else
+ myconf+=( --disable-pinentry-qt )
+ fi
+
+ econf \
+ --enable-pinentry-tty \
+ $(use_enable emacs pinentry-emacs) \
+ $(use_enable gtk pinentry-gtk2) \
+ $(use_enable ncurses pinentry-curses) \
+ $(use_enable ncurses fallback-curses) \
+ $(use_with caps libcap) \
+ $(use_enable gnome-keyring libsecret) \
+ $(use_enable gnome-keyring pinentry-gnome3) \
+ "${myconf[@]}" \
+ MOC="${QT_MOC}"
+}
+
+src_install() {
+ default
+ rm -f "${ED}"/usr/bin/pinentry || die
+
+ if use qt4 || use qt5; then
+ dosym pinentry-qt /usr/bin/pinentry-qt4
+ fi
+}
+
+pkg_postinst() {
+ if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+ elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+ elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+ elog "The soft resource limit for memory locking specifies the limit an"
+ elog "unprivileged process may lock into memory. You can also use POSIX"
+ elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+ elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+ elog "your users."
+ fi
+
+ eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+ eselect pinentry update ifunset
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/
@ 2020-06-12 23:14 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-06-12 23:14 UTC (permalink / raw
To: gentoo-commits
commit: 2c53a9350cfb5b89c7b7fb6d4747ffc6541085c9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 23:13:55 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 23:13:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c53a935
app-crypt/pinentry: respect user's AR setting
Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/718028
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-crypt/pinentry/files/pinentry-1.0.0-AR.patch | 11 +++++++++++
app-crypt/pinentry/pinentry-1.1.0-r3.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch b/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch
new file mode 100644
index 00000000000..82af67f694a
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.0.0-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/718028
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,7 @@ AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_INSTALL
++AM_PROG_AR
+ AC_PROG_RANLIB
+ # We need to check for cplusplus here because we may not do the test
+ # for Qt and autoconf does does not allow that.
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index dc98be9984f..053f01d8ca6 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -49,6 +49,7 @@ DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
PATCHES=(
"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+ "${FILESDIR}/${PN}-1.0.0-AR.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/
@ 2022-10-01 17:16 Matt Turner
0 siblings, 0 replies; 6+ messages in thread
From: Matt Turner @ 2022-10-01 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 60eb28f5ab92091dc0f228dd84cb8c73aaf3a463
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 16:49:00 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 17:16:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60eb28f5
app-crypt/pinentry: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
app-crypt/pinentry/Manifest | 1 -
.../pinentry/files/pinentry-0.8.2-ncurses.patch | 25 ------
...1.0.0-make-icon-work-under-Plasma-Wayland.patch | 52 -------------
app-crypt/pinentry/pinentry-1.2.0-r1.ebuild | 89 ----------------------
app-crypt/pinentry/pinentry-1.2.0.ebuild | 88 ---------------------
5 files changed, 255 deletions(-)
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index e9aa99172347..303d4f9e286a 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,3 +1,2 @@
-DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
DIST pinentry-1.2.1.tar.bz2.sig 119 BLAKE2B 6a9fc12a09b5122bf531e875977f63fa7caa75d39afcb4e9a9a957df87ba0a6f6156ad9799cdde8625debe0b7c3cb9482616b0ab57c133ffd2f9120ddf47815f SHA512 b14525f6ace3d1fc3dc9e1173de8821fa2a960b870876beb10b98f41222378c1e3f4f79481f3f3854c1753e8dc9a7eb92862ffa583c7be0788ec25045a4e1176
diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
deleted file mode 100644
index 3bb92c63d00c..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sun, 5 May 2013 02:23:08 +0300
-Subject: [PATCH] ncurses: link with optional tinfo
-
----
- m4/curses.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/m4/curses.m4 b/m4/curses.m4
-index 3a01881..ffb6bd1 100644
---- a/m4/curses.m4
-+++ b/m4/curses.m4
-@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [
- have_ncursesw=no
- fi
- if test "$LIBNCURSES"; then
-+ AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow",
-+ AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo"))
- # Use ncurses header files instead of the ordinary ones, if possible;
- # is there a better way of doing this, that avoids looking in specific
- # directories?
---
-1.8.1.5
-
diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch b/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch
deleted file mode 100644
index 646df1963760..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7218becac7132c2508d4e8f42c693d69c406795a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
-Date: Wed, 7 Mar 2018 15:14:22 +0100
-Subject: [PATCH] Make pinentry-qt icon work under Plasma Wayland.
-
----
- qt/Makefile.am | 2 ++
- qt/main.cpp | 2 ++
- qt/org.gnupg.pinentry-qt.desktop | 5 +++++
- 3 files changed, 9 insertions(+)
- create mode 100644 qt/org.gnupg.pinentry-qt.desktop
-
-diff --git a/qt/Makefile.am b/qt/Makefile.am
-index 698005e..bbf39d1 100644
---- a/qt/Makefile.am
-+++ b/qt/Makefile.am
-@@ -24,6 +24,8 @@ bin_PROGRAMS = pinentry-qt
-
- EXTRA_DIST = document-encrypt.png pinentry.qrc
-
-+desktopdir = $(datadir)/applications
-+dist_desktop_DATA = org.gnupg.pinentry-qt.desktop
-
- if FALLBACK_CURSES
- ncurses_include = $(NCURSES_INCLUDE)
-diff --git a/qt/main.cpp b/qt/main.cpp
-index fe88d26..b767cb4 100644
---- a/qt/main.cpp
-+++ b/qt/main.cpp
-@@ -372,6 +372,8 @@ main(int argc, char *argv[])
- i = argc;
- app = new QApplication(i, new_argv);
- app->setWindowIcon(QIcon(QLatin1String(":/document-encrypt.png")));
-+ app->setOrganizationDomain(QStringLiteral("gnupg.org"));
-+ app->setDesktopFileName(QStringLiteral("org.gnupg.pinentry-qt"));
- }
-
- pinentry_parse_opts(argc, argv);
-diff --git a/qt/org.gnupg.pinentry-qt.desktop b/qt/org.gnupg.pinentry-qt.desktop
-new file mode 100644
-index 0000000..0ac89aa
---- /dev/null
-+++ b/qt/org.gnupg.pinentry-qt.desktop
-@@ -0,0 +1,5 @@
-+[Desktop Entry]
-+Type=Application
-+Name=Pinentry dialog
-+Icon=document-encrypt
-+NoDisplay=true
---
-2.16.1
-
diff --git a/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild
deleted file mode 100644
index f3494a8189a9..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools qmake-utils
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
-
-DEPEND="
- >=dev-libs/libassuan-2.1
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- caps? ( sys-libs/libcap )
- efl? ( dev-libs/efl[X] )
- gnome-keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- gtk? ( app-crypt/gcr[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
- "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
-)
-
-src_prepare() {
- default
- unset FLTK_CONFIG
- eautoreconf
-}
-
-src_configure() {
- export QTLIB="$(qt5_get_libdir)"
-
- econf \
- $(use_enable efl pinentry-efl) \
- $(use_enable emacs pinentry-emacs) \
- $(use_enable gnome-keyring libsecret) \
- $(use_enable gtk pinentry-gnome3) \
- $(use_enable ncurses fallback-curses) \
- $(use_enable ncurses pinentry-curses) \
- $(use_enable qt5 pinentry-qt) \
- $(use_with caps libcap) \
- --enable-pinentry-tty \
- --disable-pinentry-fltk \
- --disable-pinentry-gtk2 \
- MOC="$(qt5_get_bindir)"/moc \
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.2.0.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
deleted file mode 100644
index 22f5e9b96eff..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools qmake-utils
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
-
-DEPEND="
- >=app-eselect/eselect-pinentry-0.7.2
- >=dev-libs/libassuan-2.1
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- caps? ( sys-libs/libcap )
- efl? ( dev-libs/efl[X] )
- gnome-keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- gtk? ( app-crypt/gcr[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
- "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
-)
-
-src_prepare() {
- default
- unset FLTK_CONFIG
- eautoreconf
-}
-
-src_configure() {
- export QTLIB="$(qt5_get_libdir)"
-
- econf \
- $(use_enable efl pinentry-efl) \
- $(use_enable emacs pinentry-emacs) \
- $(use_enable gnome-keyring libsecret) \
- $(use_enable gtk pinentry-gnome3) \
- $(use_enable ncurses fallback-curses) \
- $(use_enable ncurses pinentry-curses) \
- $(use_enable qt5 pinentry-qt) \
- $(use_with caps libcap) \
- --enable-pinentry-tty \
- --disable-pinentry-fltk \
- --disable-pinentry-gtk2 \
- MOC="$(qt5_get_bindir)"/moc \
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_install() {
- default
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/
@ 2024-06-24 3:02 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-06-24 3:02 UTC (permalink / raw
To: gentoo-commits
commit: 7b07caa9d1459f9cba33cb8e7fceddf23a36583d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 03:00:35 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 03:00:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b07caa9
app-crypt/pinentry: allow <1.3 to build w/ >=libassuan-3
Delete the bundled macro so it uses the system copy which knows libassuan-3
is compatible with libassuan-2 API-wise.
Closes: https://bugs.gentoo.org/934771
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/pinentry-1.2.1-libassuan-3.patch | 46 ++++++++++++++++++++++
app-crypt/pinentry/pinentry-1.2.1-r7.ebuild | 3 ++
app-crypt/pinentry/pinentry-1.2.1-r8.ebuild | 3 ++
3 files changed, 52 insertions(+)
diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch b/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch
new file mode 100644
index 000000000000..35b71998e87a
--- /dev/null
+++ b/app-crypt/pinentry/files/pinentry-1.2.1-libassuan-3.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/934771
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=pinentry.git;a=commit;h=a39ba412ab24721d4edb6476156371f8bf1d3ff9
+
+From a39ba412ab24721d4edb6476156371f8bf1d3ff9 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Fri, 28 Jul 2023 14:09:11 +0900
+Subject: [PATCH] build: Update libassuan.m4 for libassuan version 3 in future.
+
+* m4/libassuan.m4: Update from libassuan master.
+
+--
+
+New libassuan 3 has backward compatible API.
+
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+--- a/m4/libassuan.m4
++++ b/m4/libassuan.m4
+@@ -9,7 +9,7 @@ dnl This file is distributed in the hope that it will be useful, but
+ dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ dnl SPDX-License-Identifier: FSFULLR
+-# Last-changed: 2022-11-01
++# Last-changed: 2023-07-26
+
+ dnl
+ dnl Common code used for libassuan detection [internal]
+@@ -89,6 +89,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
+
+ if test $ok = yes; then
+ AC_MSG_RESULT([yes ($libassuan_config_version)])
++ AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan)
+ else
+ AC_MSG_RESULT(no)
+ fi
+@@ -104,6 +105,8 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
+ AC_MSG_CHECKING([LIBASSUAN API version])
+ if test "$req_libassuan_api" -eq "$tmp" ; then
+ AC_MSG_RESULT(okay)
++ elif test "$req_libassuan_api" -eq 2 -a "$tmp" -eq 3; then
++ AC_MSG_RESULT(okay)
+ else
+ ok=no
+ AC_MSG_RESULT([does not match. want=$req_libassuan_api got=$tmp.])
+--
+2.30.2
+
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild
index 1d1c3ad9f119..3ddf24c5674c 100644
--- a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild
@@ -58,6 +58,9 @@ src_prepare() {
unset FLTK_CONFIG
+ # bug #934771
+ rm m4/libassuan.m4 || die
+
eautoreconf
}
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild
index b44f3638784c..7f097b060824 100644
--- a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild
@@ -59,6 +59,9 @@ src_prepare() {
unset FLTK_CONFIG
+ # bug #934771
+ rm m4/libassuan.m4 || die
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/
@ 2024-11-03 21:11 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-11-03 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 8d0c32bb4c7c67540956c7a2ce4d9751105a858e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 21:39:39 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 3 21:10:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0c32bb
app-crypt/pinentry: drop 1.3.0-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-crypt/pinentry/Manifest | 2 -
.../pinentry/files/pinentry-1.3.0-ifdef-qt.patch | 125 ------------------
app-crypt/pinentry/pinentry-1.3.0-r3.ebuild | 144 ---------------------
3 files changed, 271 deletions(-)
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 48c3c169c493..766326e43ae8 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,4 +1,2 @@
-DIST pinentry-1.3.0.tar.bz2 610363 BLAKE2B a55b80754ef37d18ebdf0bd50e134a7b1bf6362b859b7069a9e4ebd86cd7e733d51f3c21a16779a18aa0d0dfab1f7a3df070d4f7e39e0840339078c4e9cb58bc SHA512 1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732
-DIST pinentry-1.3.0.tar.bz2.sig 119 BLAKE2B 0f11126761b2a06f8b08cf971f5d610cacbde1a5ee419523a6e704ac21fef4cce26495a160a51bee5ed5f68eca7d6864dfa03efa48030ba2cf783e767b925e1c SHA512 77a61877adf241d67caeea3af4c12a2c7c13ddc423ac001fab79bcec463a5853d8806052d61504fae0c67e0a9d1edf6a12d24b560ff7b4083eea5e86f9b54a90
DIST pinentry-1.3.1.tar.bz2 611233 BLAKE2B 47a510b3746fc8cdd83b56302132f4f4d9c61324fc857ce0867387f70f79490dad375bca4dc72e5d1cdca707bf89a16e1c9a20bf1aa0e857d69e59dc59403afd SHA512 3b72034dc1792b1475acb6d605ff7c1bd7647a0f02d1b6bdcd475acdef24bc802f49e275055436c3271261c4b7a64168477a698aab812a145962146b2f67a0e2
DIST pinentry-1.3.1.tar.bz2.sig 119 BLAKE2B ca562d2903c88c4297e641ddc39f6cd99db3e3fd40cf5d69e7b4335f006c7717c874fa4b5e47920af3ec97385a96c0c96aafb849cf399d11a7f9f1a6b693f479 SHA512 22bd94f74486300eb84c1c9c371a43b05fb6179118518004fba0d42b6d3e6731f94d79b37c2a3a6b0c5886578c4575f75d2460accd36cd4874342e7239521be9
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
deleted file mode 100644
index 4fc724287515..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-https://dev.gnupg.org/D596
-
-From 762346c5d1877cde6b37b191cd3c2469e1c7ddbb Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-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 <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.44.0
diff --git a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
deleted file mode 100644
index 7801015f9ed2..000000000000
--- a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools qmake-utils verify-sig
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/related_software/pinentry/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X"
-
-DEPEND="
- >=dev-libs/libassuan-2.1:=
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- efl? ( dev-libs/efl[X] )
- keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- wayland? ( kde-plasma/kwayland:5 )
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
- qt6? (
- dev-qt/qtbase:6[gui,widgets]
- wayland? (
- kde-frameworks/kguiaddons:6
- kde-frameworks/kwindowsystem:6
- )
- )
-"
-RDEPEND="
- ${DEPEND}
- gtk? ( app-crypt/gcr:4[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-PDEPEND="emacs? ( app-emacs/pinentry )"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.4"
-
-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() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- unset FLTK_CONFIG
-
- local myeconfargs=(
- $(use_enable efl pinentry-efl)
- $(use_enable emacs pinentry-emacs)
- $(use_enable keyring libsecret)
- $(use_enable gtk pinentry-gnome3)
- $(use_enable ncurses fallback-curses)
- $(use_enable ncurses pinentry-curses)
- $(use_enable qt5 pinentry-qt5)
- $(use_enable qt6 pinentry-qt)
- # TODO: could split this up into qt5/qt6?
- $(use_enable X qtx11extras)
- $(use_with X x)
-
- --enable-pinentry-tty
- --disable-pinentry-fltk
- --disable-pinentry-gtk2
-
- ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
-
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
- )
-
- if use qt5 ; then
- export PATH="$(qt5_get_bindir):${PATH}"
- export QTLIB="$(qt5_get_libdir):${QTLIB}"
- export MOC5="$(qt5_get_bindir)"/moc
-
- myeconfargs+=(
- $(use_enable wayland kf5-wayland)
- )
- else
- myeconfargs+=(
- --disable-kf5-wayland
- )
- fi
-
- if use qt6 ; then
- export PATH="$(qt6_get_bindir):${PATH}"
- export QTLIB="$(qt6_get_libdir):${QTLIB}"
- export MOC="$(qt6_get_libdir)/qt6/libexec/moc"
-
- myeconfargs+=(
- $(use_enable wayland kf6-wayland)
- )
- else
- myeconfargs+=(
- --disable-kf6-wayland
- )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- # The preferred Qt implementation upstream gets installed as just 'qt'.
- # Make a symlink for eselect-pinentry and friends.
- if use qt6 ; then
- dosym pinentry-qt /usr/bin/pinentry-qt6
- fi
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-11-03 21:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-24 3:02 [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/files/, app-crypt/pinentry/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-11-03 21:11 Andreas Sturmlechner
2022-10-01 17:16 Matt Turner
2020-06-12 23:14 Sergei Trofimovich
2016-08-11 19:02 Kristian Fiskerstrand
2015-09-21 17:21 Kristian Fiskerstrand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox