Hello community,
here is the log from the commit of package pinentry for openSUSE:Factory
checked in at 2015-07-25 07:44:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pinentry (Old)
and /work/SRC/openSUSE:Factory/.pinentry.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pinentry"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pinentry/pinentry.changes 2015-07-16
17:18:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes 2015-07-25
07:44:09.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 10 08:54:22 UTC 2015 - wer...@suse.de
+
+- Make it build with every ncurses library ABI
+ adding pinentry-ncurses6.diff
+
+-------------------------------------------------------------------
New:
----
pinentry-ncurses6.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pinentry.spec ++++++
--- /var/tmp/diff_new_pack.0ZmWrE/_old 2015-07-25 07:44:09.000000000 +0200
+++ /var/tmp/diff_new_pack.0ZmWrE/_new 2015-07-25 07:44:09.000000000 +0200
@@ -16,7 +16,6 @@
#
-%global ncursesw_config %(set -- %{_bindir}/ncursesw*-config; echo
${1})
Name: pinentry
Version: 0.9.5
Release: 0
@@ -31,6 +30,8 @@
Patch1: pinentry-0.7.2-gtk+-2.4.diff
# PATCH-FIX-SUSE fix qt4 password entry not to allow IM (bnc#725471)
Patch6: qt4-disable-inputmethod-for-passwords.diff
+# PATCH-FIX-SUSE make it build with ncurses ABI 6
+Patch7: pinentry-ncurses6.diff
BuildRequires: libassuan-devel >= 2.1.0
BuildRequires: libgpg-error-devel >= 1.16
BuildRequires: libqt4-devel
@@ -43,6 +44,10 @@
Requires(post): %{install_info_prereq}
Provides: pinentry-dialog
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#%define nmajor %(xxx="`grep NCURSES_VERSION_MAJOR /usr/include/ncurses.h`";
test -z "$xxx" && xxx=leer; echo $xxx)
+#%define nmajor %(xxx="leer"; xxx="`grep NCURSES_VERSION_MAJOR
/usr/include/ncurses.h 2> /dev/null`"; echo $xxx)
+%define ncurses %(xxx="`readlink -f /usr/include/ncurses.h`"; echo $xxx)
+%define nmajor %(grep NCURSES_VERSION_MAJOR < /usr/include/ncurses.h)
%description
This is a collection of simple PIN or passphrase entry dialogs which
@@ -103,14 +108,18 @@
%setup -q
%patch1 -p1
%patch6 -p1
+%patch7 -p0
%build
# Regenerate moc's
moc qt4/pinentrydialog.h > qt4/pinentrydialog.moc
moc qt4/qsecurelineedit.h > qt4/qsecurelineedit.moc
moc qt4/pinentryconfirm.h > qt4/pinentryconfirm.moc
-export CFLAGS="%{optflags} $(%{ncursesw_config} --cflags)"
-export CXXFLAGS="%{optflags} -std=gnu++11 $(%{ncursesw_config} --cflags)"
+nmajor=$(sed -rn 's/^#define\s+NCURSES_VERSION_MAJOR\s+([0-9]+)/\1/p'
/usr/include/ncurses.h)
+CFLAGS="%{optflags} $(ncursesw${nmajor}-config --cflags)"
+CXXFLAGS="%{optflags} -std=gnu++11 $(ncursesw${nmajor}-config --cflags)"
+LDFLAGS="$(ncursesw${nmajor}-config --libs)"
+export CFLAGS CXXFLAGS LDFLAGS
%define _configure ../configure
# build gui version with libsecret (bnc#934214)
++++++ pinentry-ncurses6.diff ++++++
---
pinentry/pinentry.h | 1 +
1 file changed, 1 insertion(+)
--- pinentry/pinentry.h
+++ pinentry/pinentry.h 2015-07-10 08:19:18.801518702 +0000
@@ -74,6 +74,7 @@ struct pinentry
supported. (Assuan: "OPTION ttyname TTYNAME".) */
char *ttyname;
/* The type of the terminal. (Assuan: "OPTION ttytype TTYTYPE".) */
+#undef ttytype
char *ttytype;
/* The LC_CTYPE value for the terminal. (Assuan: "OPTION lc-ctype
LC_CTYPE".) */
