Revert "Revert "Bump platform plugin ABI to 5.2 for Qt 5.2 aplha""
This reverts commit 192f86861c.
gonna give 5.2.0 a shot on f20 now
This commit is contained in:
Rex Dieter
parent
192f86861c
commit
6bf31fcf5a
151
0001-Plugin-API-version-5.2.patch
Normal file
151
0001-Plugin-API-version-5.2.patch
Normal file
@ -0,0 +1,151 @@
|
|||||||
|
From 7b641c3f05c5b7cebbe5d9fbe90023dcf6eb9394 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||||
|
Date: Sun, 6 Oct 2013 13:12:36 +0200
|
||||||
|
Subject: [PATCH] Plugin API version 5.2
|
||||||
|
|
||||||
|
---
|
||||||
|
.../hardware_integration/qwaylandgraphicshardwareintegrationplugin.h | 2 +-
|
||||||
|
src/plugins/platforms/qwayland-brcm-egl/main.cpp | 2 +-
|
||||||
|
src/plugins/platforms/qwayland-egl/main.cpp | 2 +-
|
||||||
|
src/plugins/platforms/qwayland-nogl/main.cpp | 2 +-
|
||||||
|
src/plugins/platforms/qwayland-xcomposite-egl/main.cpp | 2 +-
|
||||||
|
src/plugins/platforms/qwayland-xcomposite-glx/main.cpp | 2 +-
|
||||||
|
src/plugins/waylandcompositors/brcm-egl/main.cpp | 2 +-
|
||||||
|
src/plugins/waylandcompositors/wayland-egl/main.cpp | 2 +-
|
||||||
|
src/plugins/waylandcompositors/xcomposite-egl/main.cpp | 2 +-
|
||||||
|
src/plugins/waylandcompositors/xcomposite-glx/main.cpp | 2 +-
|
||||||
|
10 files changed, 10 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h b/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
|
||||||
|
index 6d68a0c..62ed1a2 100644
|
||||||
|
--- a/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
|
||||||
|
+++ b/src/compositor/hardware_integration/qwaylandgraphicshardwareintegrationplugin.h
|
||||||
|
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
class QWaylandGraphicsHardwareIntegration;
|
||||||
|
|
||||||
|
-#define QWaylandGraphicsHardwareIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1"
|
||||||
|
+#define QWaylandGraphicsHardwareIntegrationFactoryInterface_iid "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2"
|
||||||
|
|
||||||
|
class Q_COMPOSITOR_EXPORT QWaylandGraphicsHardwareIntegrationPlugin : public QObject
|
||||||
|
{
|
||||||
|
diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
|
||||||
|
index 9862223..663d18b 100644
|
||||||
|
--- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp
|
||||||
|
+++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-brcm-egl.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-brcm-egl.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp
|
||||||
|
index 222cc1e..e5a0a2c 100644
|
||||||
|
--- a/src/plugins/platforms/qwayland-egl/main.cpp
|
||||||
|
+++ b/src/plugins/platforms/qwayland-egl/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-egl.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-egl.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/platforms/qwayland-nogl/main.cpp b/src/plugins/platforms/qwayland-nogl/main.cpp
|
||||||
|
index 6069390..d0bdf7f 100644
|
||||||
|
--- a/src/plugins/platforms/qwayland-nogl/main.cpp
|
||||||
|
+++ b/src/plugins/platforms/qwayland-nogl/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-nogl.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-nogl.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
|
||||||
|
index 414830f..0d6bcff 100644
|
||||||
|
--- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
|
||||||
|
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-xcomposite-egl.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-xcomposite-egl.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
|
||||||
|
index d442c81..98ca138 100644
|
||||||
|
--- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
|
||||||
|
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "qwayland-xcomposite-glx.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "qwayland-xcomposite-glx.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QPlatformIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/waylandcompositors/brcm-egl/main.cpp b/src/plugins/waylandcompositors/brcm-egl/main.cpp
|
||||||
|
index 0fecd2e..8815fbb 100644
|
||||||
|
--- a/src/plugins/waylandcompositors/brcm-egl/main.cpp
|
||||||
|
+++ b/src/plugins/waylandcompositors/brcm-egl/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "brcm-egl.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "brcm-egl.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/waylandcompositors/wayland-egl/main.cpp b/src/plugins/waylandcompositors/wayland-egl/main.cpp
|
||||||
|
index 75a9fba..6bb1c7b 100644
|
||||||
|
--- a/src/plugins/waylandcompositors/wayland-egl/main.cpp
|
||||||
|
+++ b/src/plugins/waylandcompositors/wayland-egl/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "wayland-egl.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "wayland-egl.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/waylandcompositors/xcomposite-egl/main.cpp b/src/plugins/waylandcompositors/xcomposite-egl/main.cpp
|
||||||
|
index 3540d35..7dacb50 100644
|
||||||
|
--- a/src/plugins/waylandcompositors/xcomposite-egl/main.cpp
|
||||||
|
+++ b/src/plugins/waylandcompositors/xcomposite-egl/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-egl.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "xcomposite-egl.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||||||
|
diff --git a/src/plugins/waylandcompositors/xcomposite-glx/main.cpp b/src/plugins/waylandcompositors/xcomposite-glx/main.cpp
|
||||||
|
index fdc7037..42d676b 100644
|
||||||
|
--- a/src/plugins/waylandcompositors/xcomposite-glx/main.cpp
|
||||||
|
+++ b/src/plugins/waylandcompositors/xcomposite-glx/main.cpp
|
||||||
|
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
|
||||||
|
class QWaylandIntegrationPlugin : public QWaylandGraphicsHardwareIntegrationPlugin
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.1" FILE "xcomposite-glx.json")
|
||||||
|
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.Compositor.QWaylandGraphicsHardwareIntegrationFactoryInterface.5.2" FILE "xcomposite-glx.json")
|
||||||
|
public:
|
||||||
|
QStringList keys() const;
|
||||||
|
QWaylandGraphicsHardwareIntegration *create(const QString&, const QStringList&);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -4,7 +4,7 @@
|
|||||||
Summary: Qt5 - Wayland platform support and QtCompositor module
|
Summary: Qt5 - Wayland platform support and QtCompositor module
|
||||||
Name: qt5-%{qt_module}
|
Name: qt5-%{qt_module}
|
||||||
Version: 5.1.0
|
Version: 5.1.0
|
||||||
Release: 0.1.20130826git3b0b90b%{?dist}
|
Release: 0.2.20130826git3b0b90b%{?dist}
|
||||||
# Full license texts are yet to be included upstream:
|
# Full license texts are yet to be included upstream:
|
||||||
# https://codereview.qt-project.org/65586
|
# https://codereview.qt-project.org/65586
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
@ -13,9 +13,10 @@ Url: http://qt-project.org/wiki/QtWayland
|
|||||||
# cd qtwayland/
|
# cd qtwayland/
|
||||||
# git archive 3b0b90b --prefix=qtwayland/ |gzip >qtwayland.tar.gz
|
# git archive 3b0b90b --prefix=qtwayland/ |gzip >qtwayland.tar.gz
|
||||||
Source0: qtwayland.tar.gz
|
Source0: qtwayland.tar.gz
|
||||||
|
Patch0: 0001-Plugin-API-version-5.2.patch
|
||||||
|
|
||||||
BuildRequires: qt5-qtbase-devel >= %{version}
|
BuildRequires: qt5-qtbase-devel >= 5.2
|
||||||
BuildRequires: qt5-qtbase-static >= %{version}
|
BuildRequires: qt5-qtbase-static >= 5.2
|
||||||
BuildRequires: pkgconfig(xkbcommon)
|
BuildRequires: pkgconfig(xkbcommon)
|
||||||
BuildRequires: pkgconfig(wayland-scanner)
|
BuildRequires: pkgconfig(wayland-scanner)
|
||||||
BuildRequires: pkgconfig(wayland-server)
|
BuildRequires: pkgconfig(wayland-server)
|
||||||
@ -46,6 +47,7 @@ Requires: qt5-qtbase-devel%{?_isa}
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{qt_module}
|
%setup -q -n %{qt_module}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -84,6 +86,9 @@ install -pm644 src/compositor/{wayland-wayland-server-protocol.h,qwayland-server
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Oct 06 2013 Lubomir Rintel <lkundrak@v3.sk> - 5.1.0-0.2.20130826git3b0b90b
|
||||||
|
- Bump platform plugin ABI to 5.2 for Qt 5.2 aplha
|
||||||
|
|
||||||
* Wed Sep 11 2013 Lubomir Rintel <lkundrak@v3.sk> - 5.1.0-0.1.20130826git3b0b90b
|
* Wed Sep 11 2013 Lubomir Rintel <lkundrak@v3.sk> - 5.1.0-0.1.20130826git3b0b90b
|
||||||
- Initial packaging
|
- Initial packaging
|
||||||
- Adjustments from review (Rex Dieter, #1008529)
|
- Adjustments from review (Rex Dieter, #1008529)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user