commit df3b66cf8021a5734907a125d92acc6cb792e906 Author: Thomas Penteker <tek@serverop.de> Date: Wed Jun 1 22:29:59 2016 +0200 pinentry: account for qt4/5; patches by jue diff --git a/pinentry/.md5sum b/pinentry/.md5sum index c44237d..417acc9 100644 --- a/pinentry/.md5sum +++ b/pinentry/.md5sum @@ -1,2 +1,2 @@ -422de36ebe2ea9c4102a33f7306c2ae3 pinentry +b3f2692e792f14df7d0ccfcc19399f66 pinentry 9510b2de013e818dab619e468298703a pinentry-0.9.7.tar.bz2 diff --git a/pinentry/Pkgfile b/pinentry/Pkgfile index d4d5935..7edb624 100644 --- a/pinentry/Pkgfile +++ b/pinentry/Pkgfile @@ -7,22 +7,21 @@ name=pinentry version=0.9.7 -release=1 +release=2 source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2 pinentry) build() { cd $name-$version - sed -i 's|<ncursesw/|<|g' pinentry/pinentry-curses.c - ./configure \ --prefix=/usr \ - --disable-pinentry-{gtk2,qt4} \ + --disable-pinentry-{gtk2,qt,qt5} \ --enable-pinentry-curses + make make DESTDIR=$PKG install rm -rf $PKG/usr/share rm $PKG/usr/bin/pinentry - install -m 755 ../pinentry $PKG/usr/bin/pinentry + install -m 755 $SRC/pinentry $PKG/usr/bin/pinentry } diff --git a/pinentry/pinentry b/pinentry/pinentry index 94f2423..443bd7c 100755 --- a/pinentry/pinentry +++ b/pinentry/pinentry @@ -1,8 +1,12 @@ #!/bin/sh # pinentry wrapper -if [ -x /usr/bin/pinentry-qt4 ];then - exec /usr/bin/pinentry-qt4 "$@" +if [ -x /usr/bin/pinentry-qt5 ];then + exec /usr/bin/pinentry-qt5 "$@" +fi + +if [ -x /usr/bin/pinentry-qt ];then + exec /usr/bin/pinentry-qt "$@" fi if [ -x /usr/bin/pinentry-gtk-2 ];then