Hello community, here is the log from the commit of package touchegg for openSUSE:Factory checked in at 2018-03-20 21:59:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/touchegg (Old) and /work/SRC/openSUSE:Factory/.touchegg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "touchegg" Tue Mar 20 21:59:48 2018 rev:2 rq:588366 version:1.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/touchegg/touchegg.changes 2015-11-08 11:26:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.touchegg.new/touchegg.changes 2018-03-20 22:00:18.325800008 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 12:43:56 UTC 2018 - [email protected] + +- Add touchegg-qt5.patch: Build with Qt5. +- Add some missing dependencies. + +------------------------------------------------------------------- New: ---- touchegg-qt5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ touchegg.spec ++++++ --- /var/tmp/diff_new_pack.gvx2u6/_old 2018-03-20 22:00:19.197768613 +0100 +++ /var/tmp/diff_new_pack.gvx2u6/_new 2018-03-20 22:00:19.197768613 +0100 @@ -1,7 +1,7 @@ # # spec file for package touchegg # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,21 +20,28 @@ Version: 1.1.1 Release: 0 Summary: A multitouch gesture recogniser for GNU/Linux -License: GPL-2.0+ and GPL-3.0+ +License: GPL-2.0-or-later AND GPL-3.0-or-later Group: Hardware/Other Url: https://github.com/JoseExposito/touchegg Source: https://github.com/JoseExposito/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -#PATCH-FIX-OPENSUSE touchegg-1.1.1-slowdown-scroll-speed.patch -Patch0: %{name}-1.1.1-slowdown-scroll-speed.patch +# PATCH-FIX-OPENSUSE touchegg-1.1.1-slowdown-scroll-speed.patch +Patch0: touchegg-1.1.1-slowdown-scroll-speed.patch +# PATCH-FEATURE-OPENSUSE touchegg-qt5.patch [email protected] -- Build with Qt5. +Patch1: touchegg-qt5.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: pkgconfig(QtCore) -BuildRequires: pkgconfig(QtGui) -BuildRequires: pkgconfig(QtXml) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(libgeis) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xtst) Suggests: %{name}-gui >= %{version} %description @@ -54,20 +61,22 @@ %prep %setup -q %patch0 +%patch1 -p1 %build for dir in %{name} %{name}-gui; do pushd "$dir" - %{_libdir}/qt4/bin/qmake \ - QMAKE_CFLAGS="%{optflags}" \ - QMAKE_CXXFLAGS="%{optflags}" - make %{?_smp_mflags} + %qmake5 + make %{?_smp_mflags} V=1 popd done %install -make INSTALL_ROOT=%{buildroot} install -C %{name} -make INSTALL_ROOT=%{buildroot} install -C %{name}-gui +for dir in %{name} %{name}-gui; do + pushd "$dir" + %qmake5_install + popd +done mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ mv -f %{buildroot}%{_datadir}/icons/%{name}-gui.png \ @@ -75,6 +84,7 @@ %suse_update_desktop_file -r %{name}-gui Utility DesktopUtility +%if 0%{?suse_version} < 1500 %post gui %desktop_database_post %icon_theme_cache_post @@ -82,14 +92,19 @@ %postun gui %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root) +%if 0%{?suse_version} >= 1500 +%license %{name}/COPYING +%else +%doc %{name}/COPYING +%endif +%doc %{name}/{CHANGELOG,README} %{_bindir}/%{name} %{_datadir}/%{name}/ %files gui -%defattr(-,root,root) %{_bindir}/%{name}-gui %{_datadir}/applications/%{name}-gui.desktop %{_datadir}/icons/hicolor/*/apps/%{name}-gui.* ++++++ touchegg-qt5.patch ++++++ --- a/touchegg/src/touchegg/util/Include.h +++ b/touchegg/src/touchegg/util/Include.h @@ -23,8 +23,9 @@ // Qt #include <QtCore> #include <QtGui> - #include <QtGui/QX11Info> + #include <QtWidgets> #include <QtXml> + #include <QX11Info> // Xlib #include <X11/Xlib.h> --- a/touchegg/touchegg.pro +++ b/touchegg/touchegg.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = touchegg -QT += gui core xml +QT += core gui widgets xml x11extras LIBS += -lgeis -lX11 -lXtst -lXext //DEFINES = QT_NO_DEBUG_OUTPUT --- a/touchegg-gui/src/touchegg-gui/util/Include.h +++ b/touchegg-gui/src/touchegg-gui/util/Include.h @@ -16,6 +16,7 @@ #include <QtCore> #include <QtGui> + #include <QtWidgets> #include <QtXml> #endif // INCLUDE_H --- a/touchegg-gui/touchegg-gui.pro +++ b/touchegg-gui/touchegg-gui.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = touchegg-gui -QT += core gui xml +QT += core gui widgets xml OBJECTS_DIR += build MOC_DIR += build RCC_DIR += build
