From 78b362dba9355bf08218d490e66ae4b50a24125791ce4d5d6ad47ef8bcaa0e47 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 1 Oct 2016 21:50:05 +0000 Subject: [PATCH] Accepting request 429996 from KDE:Qt5 The Time Has Come to Shoot You Down... What a Sound OBS-URL: https://build.opensuse.org/request/show/429996 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwayland?expand=0&rev=10 --- 0001-partially-revert-505c373.diff | 14 -------------- baselibs.conf | 6 +++--- libqt5-qtwayland.changes | 8 ++++++++ libqt5-qtwayland.spec | 26 ++++++++++++-------------- qtwayland-opensource-src-5.6.1.tar.xz | 3 --- qtwayland-opensource-src-5.7.0.tar.xz | 3 +++ 6 files changed, 26 insertions(+), 34 deletions(-) delete mode 100644 0001-partially-revert-505c373.diff delete mode 100644 qtwayland-opensource-src-5.6.1.tar.xz create mode 100644 qtwayland-opensource-src-5.7.0.tar.xz diff --git a/0001-partially-revert-505c373.diff b/0001-partially-revert-505c373.diff deleted file mode 100644 index 0fb84ae..0000000 --- a/0001-partially-revert-505c373.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro -index 8d7f488..9f7751a 100644 ---- a/examples/wayland/server-buffer/compositor/compositor.pro -+++ b/examples/wayland/server-buffer/compositor/compositor.pro -@@ -18,6 +18,9 @@ RESOURCES += compositor.qrc - CONFIG +=wayland-scanner - WAYLANDSERVERSOURCES += ../share-buffer.xml - -+CONFIG += link_pkgconfig -+PKGCONFIG += wayland-server -+ - DEFINES += QT_COMPOSITOR_QUICK - - target.path = $$[QT_INSTALL_EXAMPLES]/wayland/server-buffer/compositor diff --git a/baselibs.conf b/baselibs.conf index 4e31758..3e496dc 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,7 +1,7 @@ libqt5-qtwayland -libQt5Compositor5 +libQt5WaylandCompositor5 libQt5WaylandClient5 libqt5-qtwayland-devel requires "libqt5-qtwayland- = " - requires "libQt5Compositor5- = " - requires "libQt5WaylandClient5- = " \ No newline at end of file + requires "libQt5WaylandCompositor5- = " + requires "libQt5WaylandClient5- = " diff --git a/libqt5-qtwayland.changes b/libqt5-qtwayland.changes index fcfb5b3..a24eca4 100644 --- a/libqt5-qtwayland.changes +++ b/libqt5-qtwayland.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 24 18:39:09 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.0 + * For more details please see: + https://www.qt.io/qt5-7/ +- Drop dead 0001-partially-revert-505c373.diff + ------------------------------------------------------------------- Wed Jun 8 14:15:22 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtwayland.spec b/libqt5-qtwayland.spec index 0cd4f63..e6f184b 100644 --- a/libqt5-qtwayland.spec +++ b/libqt5-qtwayland.spec @@ -17,13 +17,13 @@ %define qt5_snapshot 1 -%define libname libQt5Compositor5 +%define libname libQt5WaylandCompositor5 %define base_name libqt5 -%define real_version 5.6.1 -%define so_version 5.6.1 +%define real_version 5.7.0 +%define so_version 5.7.0 %define tar_version qtwayland-opensource-src-%{real_version} Name: libqt5-qtwayland -Version: 5.6.1 +Version: 5.7.0 Release: 0 Summary: Qt 5 Wayland Addon License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 @@ -31,8 +31,6 @@ Group: Development/Libraries/X11 Url: http://qt.digia.com Source: %{tar_version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM -- 0001-partially-revert-505c373.diff -- Fix the build -Patch0: 0001-partially-revert-505c373.diff BuildRequires: fdupes BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version} @@ -57,8 +55,8 @@ Qt is a set of libraries for developing applications. Summary: Qt 5 Wayland Addon Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: libQt5Compositor5 = %{version} Requires: libQt5WaylandClient5 = %{version} +Requires: libQt5WaylandCompositor5 = %{version} Conflicts: qtwayland-devel %description devel @@ -77,12 +75,12 @@ not used by application development and that do not have any ABI or API guarantees. The packages that build against these have to require the exact Qt version. -%package -n libQt5Compositor5 +%package -n libQt5WaylandCompositor5 Summary: Qt 5 Wayland Addon Group: Development/Libraries/C and C++ Conflicts: qtwayland -%description -n libQt5Compositor5 +%description -n libQt5WaylandCompositor5 Qt is a set of libraries for developing applications. %package -n libQt5WaylandClient5 @@ -103,11 +101,10 @@ Examples for libqt5-qtwayland module. %prep %setup -q -n qtwayland-opensource-src-%{real_version} -%patch0 -p1 -%post -n libQt5Compositor5 -p /sbin/ldconfig +%post -n libQt5WaylandCompositor5 -p /sbin/ldconfig -%postun -n libQt5Compositor5 -p /sbin/ldconfig +%postun -n libQt5WaylandCompositor5 -p /sbin/ldconfig %post -n libQt5WaylandClient5 -p /sbin/ldconfig @@ -140,11 +137,12 @@ fdupes -s %{buildroot} %doc *.txt LICENSE.* %{_libqt5_bindir}/qtwaylandscanner %{_libqt5_plugindir}/ +%{_libqt5_archdatadir}/qml/QtWayland/ -%files -n libQt5Compositor5 +%files -n libQt5WaylandCompositor5 %defattr(-,root,root,-) %doc *.txt LICENSE.* -%{_libqt5_libdir}/libQt5Compositor.so.* +%{_libqt5_libdir}/libQt5WaylandCompositor.so.* %files -n libQt5WaylandClient5 %defattr(-,root,root,-) diff --git a/qtwayland-opensource-src-5.6.1.tar.xz b/qtwayland-opensource-src-5.6.1.tar.xz deleted file mode 100644 index b30cb66..0000000 --- a/qtwayland-opensource-src-5.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2134545f46145fca57a2828f4dbd1969a6dff953903feebef39c83979d84efc9 -size 263748 diff --git a/qtwayland-opensource-src-5.7.0.tar.xz b/qtwayland-opensource-src-5.7.0.tar.xz new file mode 100644 index 0000000..bff6dd6 --- /dev/null +++ b/qtwayland-opensource-src-5.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26b9c7f8f3bd0d0766eaec527d021571a9098942c8b886191cb13f9399b4be11 +size 287724