[git] Pinentry - branch, master, updated. pinentry-0.9.0-4-gbb42362
by Andre Heinecke
cvs at cvs.gnupg.org
Mon Dec 15 18:12:17 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".
The branch, master has been updated
via bb423620fca82159e60ab25de3c608a0243088b0 (commit)
via c911657710893643558f91ec497fac2831d91040 (commit)
from 484465338ea6f5f12eb1341ca0ef84aa79224ed4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bb423620fca82159e60ab25de3c608a0243088b0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Dec 15 18:07:32 2014 +0100
qt4: Improve moc handling
* configure.ac: Disable pinentry-qt4 or exit if moc not found.
* m4/qt.m4: Look for and prefer moc-qt4.
* qt4/Makefile.am: Add moc files to nodist and clean them.
--
Files generated by MOC vary over the used Qt versions
(even inside a Major release). Distributing them leads to
errors if a different qt version is installed.
GnuPG-bug-id: 1784
diff --git a/configure.ac b/configure.ac
index c2644c9..1cbd8b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,7 +335,19 @@ fi)
fi
if test "$pinentry_qt4" != "no"; then
+
QT_PATH_MOC
+if test "$have_moc" != "yes"; then
+ if test "$pinentry_qt4" = "yes"; then
+ AC_MSG_ERROR([[
+ ***
+ *** Qt moc is required.
+ ***]])
+ else
+ pinentry_qt4=no
+ fi
+fi
+
PKG_CHECK_MODULES(QT4_GUI, QtGui,,
if test "$pinentry_qt4" = "yes"; then
AC_MSG_ERROR([[
diff --git a/m4/qt.m4 b/m4/qt.m4
index 42f33e1..a6b849b 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -59,7 +59,7 @@ AC_DEFUN([QT_PATH_MOC],
qt_bindirs="$ac_qt_bindir:$qt_bindirs"
fi
- AC_PATH_PROG(MOC, moc, no, [$qt_bindirs])
+ AC_PATH_PROGS(MOC, [moc-qt4 moc], no, [$qt_bindirs])
if test "$MOC" = no; then
#AC_MSG_ERROR([No Qt meta object compiler (moc) found!
#Please check whether you installed Qt correctly.
diff --git a/qt4/Makefile.am b/qt4/Makefile.am
index 6dd5f25..e52169c 100644
--- a/qt4/Makefile.am
+++ b/qt4/Makefile.am
@@ -44,16 +44,15 @@ pinentry_qt4_LDADD = $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
BUILT_SOURCES = \
pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
-MAINTAINERCLEANFILES = \
+CLEANFILES = \
pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
-EXTRA_DIST += \
- pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
-
pinentry_qt4_SOURCES = pinentrydialog.h pinentrydialog.cpp \
main.cpp secstring.h secstring.cpp qsecurelineedit.h \
qsecurelineedit.cpp qrc_pinentry.cpp \
- qsecurelineedit_p.h pinentryconfirm.cpp pinentryconfirm.h \
+ qsecurelineedit_p.h pinentryconfirm.cpp pinentryconfirm.h
+
+nodist_pinentry_qt4_SOURCES = \
pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
.h.moc:
commit c911657710893643558f91ec497fac2831d91040
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Mon Dec 15 17:38:05 2014 +0100
doc: Update gpl.texi to match version from gcrypt
* doc/gpl.texi: Use version from gcrypt.
--
This fixes build errors with texinfo 5.2
diff --git a/doc/gpl.texi b/doc/gpl.texi
index ca0508f..6eb301e 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -1,5 +1,5 @@
@node Copying
- at appendix GNU GENERAL PUBLIC LICENSE
+ at unnumbered GNU General Public License
@cindex GPL, GNU General Public License
@center Version 2, June 1991
@@ -12,7 +12,7 @@ Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@end display
- at appendixsubsec Preamble
+ at heading Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -63,7 +63,7 @@ patent must be licensed for everyone's free use or not licensed at all.
modification follow.
@iftex
- at appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ at heading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@end iftex
@ifinfo
@center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -287,12 +287,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- at iftex
- at heading NO WARRANTY
- at end iftex
- at ifinfo
@center NO WARRANTY
- at end ifinfo
@item
BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
@@ -325,7 +320,7 @@ POSSIBILITY OF SUCH DAMAGES.
@end ifinfo
@page
- at unnumberedsec How to Apply These Terms to Your New Programs
+ at heading How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
@@ -364,7 +359,7 @@ when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19 at var{yy} @var{name of author}
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
type `show w'. This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c'
+to redistribute it under certain conditions; type `show c'
for details.
@end smallexample
@@ -382,7 +377,7 @@ necessary. Here is a sample; alter the names:
@group
Yoyodyne, Inc., hereby disclaims all copyright
interest in the program `Gnomovision'
-(which makes passes at compilers) written
+(which makes passes at compilers) written
by James Hacker.
@var{signature of Ty Coon}, 1 April 1989
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 12 ++++++++++++
doc/gpl.texi | 17 ++++++-----------
m4/qt.m4 | 2 +-
qt4/Makefile.am | 9 ++++-----
4 files changed, 23 insertions(+), 17 deletions(-)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list