| 1 |
commit: 8a489bfd6c39e400be5d9dd34215452bb2b3f7c3 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jul 3 17:20:08 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 7 07:18:47 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a489bfd |
| 7 |
|
| 8 |
app-crypt/pinentry: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/1826 |
| 11 |
|
| 12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 13 |
|
| 14 |
.../pinentry-0.9.6-Remove-detection-of-Qt5.patch | 60 ---------------------- |
| 15 |
1 file changed, 60 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index 0ab9160..0000000 |
| 20 |
--- a/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,60 +0,0 @@ |
| 23 |
-From eb2cd9487749be01a1ad34ce6036366208147290 Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Kristian Fiskerstrand <kristian.fiskerstrand@××××××××××××××××.com> |
| 25 |
-Date: Mon, 21 Sep 2015 19:09:04 +0200 |
| 26 |
-Subject: [PATCH] m4/qt.m4: Remove detection of Qt5 |
| 27 |
- |
| 28 |
---- |
| 29 |
- m4/qt.m4 | 36 +----------------------------------- |
| 30 |
- 1 file changed, 1 insertion(+), 35 deletions(-) |
| 31 |
- |
| 32 |
-diff --git a/m4/qt.m4 b/m4/qt.m4 |
| 33 |
-index 0a7ea99..2982bb8 100644 |
| 34 |
---- a/m4/qt.m4 |
| 35 |
-+++ b/m4/qt.m4 |
| 36 |
-@@ -28,42 +28,8 @@ dnl The moc lookup code is based on libpoppler (rev. d821207) |
| 37 |
- |
| 38 |
- AC_DEFUN([FIND_QT], |
| 39 |
- [ |
| 40 |
-- PKG_CHECK_MODULES(PINENTRY_QT, |
| 41 |
-- Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0, |
| 42 |
-- [have_qt5_libs="yes"], |
| 43 |
-- [have_qt5_libs="no"]) |
| 44 |
-+ have_qt5_libs="no" |
| 45 |
- |
| 46 |
-- if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then |
| 47 |
-- PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic" |
| 48 |
-- fi |
| 49 |
-- |
| 50 |
-- if test "$have_qt5_libs" = "yes"; then |
| 51 |
-- AC_CHECK_TOOL(MOC, moc) |
| 52 |
-- AC_MSG_CHECKING([moc version]) |
| 53 |
-- mocversion=`$MOC -v 2>&1` |
| 54 |
-- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` |
| 55 |
-- if test x"$mocversiongrep" != x"$mocversion"; then |
| 56 |
-- AC_MSG_RESULT([no]) |
| 57 |
-- # moc was not the qt5 one, try with moc-qt5 |
| 58 |
-- AC_CHECK_TOOL(MOC2, moc-qt5) |
| 59 |
-- mocversion=`$MOC2 -v 2>&1` |
| 60 |
-- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` |
| 61 |
-- if test x"$mocversiongrep" != x"$mocversion"; then |
| 62 |
-- AC_CHECK_TOOL(QTCHOOSER, qtchooser) |
| 63 |
-- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` |
| 64 |
-- mocversion=`$qt5tooldir/moc -v 2>&1` |
| 65 |
-- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` |
| 66 |
-- if test x"$mocversiongrep" != x"$mocversion"; then |
| 67 |
-- # no valid moc found |
| 68 |
-- have_qt5_libs="no"; |
| 69 |
-- else |
| 70 |
-- MOC=$qt5tooldir/moc |
| 71 |
-- fi |
| 72 |
-- else |
| 73 |
-- MOC=$MOC2 |
| 74 |
-- fi |
| 75 |
-- fi |
| 76 |
-- fi |
| 77 |
- if test "$have_qt5_libs" != "yes"; then |
| 78 |
- PKG_CHECK_MODULES(PINENTRY_QT, |
| 79 |
- QtCore >= 4.4.0 QtGui >= 4.4.0, |
| 80 |
--- |
| 81 |
-2.4.6 |
| 82 |
- |
Archives