This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pinentry-x2go. from 21fc52e configure.ac: Fix for above change. We want to express "0" by false, not true (BUILD_LIBPINENTRY_CURSES, we don't want that). new da3d162 pinentry-x2go.spec: remove old distro support. new 1eb2de8 pinentry-x2go.spec: use more curly braces, delete superfluous semicolons and unused code. new 8af7a9a pinentry-x2go/main.cpp: use PlastiqueStyle with Qt4, Fusion with Qt5. new daf633e pinentry-x2go.spec: use Qt5 across all platforms. Will fail on SLE 12.0, but work after upgrading to SLE 12.1+. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 +++++ pinentry-x2go.spec | 37 ++++++++++++++----------------------- pinentry-x2go/main.cpp | 12 +++++++++++- 3 files changed, 30 insertions(+), 24 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit da3d162a89bf36a9087dc9cd57d1bc982f1beb00 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Nov 11 23:57:51 2018 +0100 pinentry-x2go.spec: remove old distro support. --- debian/changelog | 1 + pinentry-x2go.spec | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8630d4b..54214a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low * pinentry-x2go.spec: - Pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. + - Remove old distro support. [ Mike Gabriel ] * New upstream version (0.7.5.10): diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index b2f780d..2b8a377 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -7,18 +7,10 @@ License: GPL-2.0 URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz -%if 0%{?el5} -# For compatibility with EPEL5 -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%else BuildRoot: %{_tmppath}/%{name}-%{version}-build -%endif BuildRequires: autoconf >= 2.57, automake >= 1.7.6 -%if 0%{!?fe19} || 0%{!?fe20} -BuildRequires: gcc-c++ -%endif BuildRequires: ncurses-devel -%if 0%{?el5} || 0%{?el6} +%if 0%{?el6} BuildRequires: qt4-devel %else BuildRequires: qt-devel @@ -41,9 +33,6 @@ x2goclient. %setup -q %build -%if 0%{?el5} -export PATH=%{_libdir}/qt4/bin:$PATH -%endif if [ ! -e configure ]; then autoreconf -fi; fi; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit 1eb2de8f910440947cd132fa2aff4872a6f7348f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 12 00:02:22 2018 +0100 pinentry-x2go.spec: use more curly braces, delete superfluous semicolons and unused code. --- debian/changelog | 1 + pinentry-x2go.spec | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54214a5..99e22f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low - Pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. - Remove old distro support. + - Use more curly braces, delete superfluous semicolons and unused code. [ Mike Gabriel ] * New upstream version (0.7.5.10): diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index 2b8a377..af31d54 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -34,21 +34,20 @@ x2goclient. %build if [ ! -e configure ]; then - autoreconf -fi; -fi; + autoreconf -fi +fi %configure -make %{?_smp_mflags}; +make %{?_smp_mflags} %install -b="%buildroot"; -pushd pinentry-x2go/; +pushd pinentry-x2go/ # Why on earth does every goddamn build system have to use different names # for DESTDIR, and force strip on us? -make install DESTDIR="%buildroot" INSTALL_ROOT="%buildroot" STRIP="true"; -popd; +make install DESTDIR="%{buildroot}" INSTALL_ROOT="%{buildroot}" STRIP="true" +popd %files %defattr(-,root,root) -%_bindir/pinentry-x2go +%{_bindir}/pinentry-x2go %changelog -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit 8af7a9ae4d4579f5ac5472b42f6092cc31054ebd Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 23 04:03:50 2018 +0100 pinentry-x2go/main.cpp: use PlastiqueStyle with Qt4, Fusion with Qt5. --- debian/changelog | 1 + pinentry-x2go/main.cpp | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 99e22f0..b5e5212 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low [ Mihai Moldovan ] * New upstream version (0.7.5.10): - configure.ac: change mailing list address. + - pinentry-x2go/main.cpp: use PlastiqueStyle with Qt4, Fusion with Qt5. * debian/control: - Maintainer change in package: X2Go Developers <x2go-dev@lists.x2go.org>. - Uploaders: add myself. Also, force a rebuild due to the changed diff --git a/pinentry-x2go/main.cpp b/pinentry-x2go/main.cpp index 4ac754e..1088d14 100644 --- a/pinentry-x2go/main.cpp +++ b/pinentry-x2go/main.cpp @@ -40,6 +40,12 @@ #include <QTranslator> #include <QLocale> +#if QT_VERSION < 0x050000 +#include <QPlastiqueStyle> +#else +#include <QStyleFactory> +#endif + #include "pinentrydialog.h" #include "pinentry.h" @@ -216,7 +222,11 @@ main (int argc, char *argv[]) else app->installTranslator(&qtTranslator); - app->setStyle("fusion"); +#if QT_VERSION < 0x050000 + app->setStyle(new QPlastiqueStyle()); +#else + app->setStyle(QStyleFactory::create("fusion")); +#endif /* Consumes all arguments. */ if (pinentry_parse_opts (argc, argv)) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pinentry-x2go. commit daf633e2c9388919c79b3f5c92b89f1ef8658775 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 23 04:12:16 2018 +0100 pinentry-x2go.spec: use Qt5 across all platforms. Will fail on SLE 12.0, but work after upgrading to SLE 12.1+. --- debian/changelog | 2 ++ pinentry-x2go.spec | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5e5212..0ab4f09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ pinentry-x2go (0.7.5.10-0x2go1) UNRELEASED; urgency=low something else, like... gcc or qmake or qt(4)-dev, but it isn't. - Remove old distro support. - Use more curly braces, delete superfluous semicolons and unused code. + - Use Qt5 across all platforms. Will fail on SLE 12.0, but work after + upgrading to SLE 12.1+. [ Mike Gabriel ] * New upstream version (0.7.5.10): diff --git a/pinentry-x2go.spec b/pinentry-x2go.spec index af31d54..7a55185 100644 --- a/pinentry-x2go.spec +++ b/pinentry-x2go.spec @@ -2,7 +2,7 @@ Name: pinentry-x2go Version: 0.7.5.10 Release: 0.0x2go1%{?dist} Group: Applications/Communications -Summary: Qt4-based PIN or pass-phrase entry dialog for x2goclient +Summary: Qt5-based PIN or pass-phrase entry dialog for x2goclient License: GPL-2.0 URL: http://www.x2go.org/ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz @@ -10,10 +10,13 @@ Source0: http://code.x2go.org/releases/source/%name/%name-%version.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.57, automake >= 1.7.6 BuildRequires: ncurses-devel -%if 0%{?el6} -BuildRequires: qt4-devel +%if 0%{?suse_version} +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-linguist %else -BuildRequires: qt-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-linguist +BuildRequires: qt5-rpm-macros %endif %if 0%{?fedora} || 0%{?rhel} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pinentry-x2go.git
-
git-admin＠x2go.org