Accepting request 209078 from KDE:Qt5
Update to 5.2.0 rc1 OBS-URL: https://build.opensuse.org/request/show/209078 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=9
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
df75094d64
commit
28a7fd3fbc
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 29 13:42:39 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.2 rc1
|
||||
* New feature release, please see
|
||||
http://blog.qt.digia.com/blog/2013/11/29/qt-5-2-release-candidate-1-available/
|
||||
and http://qt-project.org/wiki/New-Features-in-Qt-5.2
|
||||
- Droped xcb_193.patch, included in this release
|
||||
- Drop gstreamer-0_10-plugins-base-devel BuildRequires, nothing in
|
||||
qtbase uses gstreamer, and config tests where false positive before
|
||||
- Temporary disable qt-never-strip.diff, we can use configure flags
|
||||
for no-strip
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 27 00:18:38 UTC 2013 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
||||
@ -50,14 +50,14 @@ BuildRequires: pkgconfig(gtk+-2.0)
|
||||
BuildRequires: pkgconfig(ice)
|
||||
BuildRequires: pkgconfig(sm)
|
||||
BuildRequires: pkgconfig(xkbcommon) >= 0.2.0
|
||||
Version: 5.2.0~beta1
|
||||
Version: 5.2.0~rc1
|
||||
Release: 0
|
||||
Summary: C++ Program Library, Core Components
|
||||
License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
|
||||
Group: System/Libraries
|
||||
Url: http://qt.digia.com
|
||||
%define base_name libqt5
|
||||
%define real_version 5.2.0-beta1
|
||||
%define real_version 5.2.0-rc1
|
||||
%define so_version 5.2.0
|
||||
%define tar_version qtbase-opensource-src-%{real_version}
|
||||
Source: %{tar_version}.tar.xz
|
||||
@ -75,10 +75,7 @@ Patch4: qtbase-opensource-src-5.1.1-bigendian.patch
|
||||
Patch109: libqt5-libtool-nodate.diff
|
||||
# PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path
|
||||
Patch131: qmake-add-usr-include.diff
|
||||
# PATCH-FIX-UPSTREAM xcb_193.patch -- For the 'oh, shit' xcb release (fdo#71502,fdo#71507,qtbug#34748)
|
||||
Patch132: xcb_193.patch
|
||||
BuildRequires: clucene-core-devel
|
||||
BuildRequires: gstreamer-0_10-plugins-base-devel
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: libpulse-devel
|
||||
BuildRequires: libudev-devel
|
||||
@ -109,12 +106,11 @@ handling.
|
||||
|
||||
%prep
|
||||
%setup -q -n qtbase-opensource-src-%{real_version}
|
||||
%patch2 -p1
|
||||
#patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch109 -p1
|
||||
%patch131 -p1
|
||||
%patch132 -p1
|
||||
|
||||
# be sure not to use them
|
||||
rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib}
|
||||
@ -354,6 +350,7 @@ echo yes | ./configure $platform \
|
||||
-reduce-relocations \
|
||||
-optimized-qmake \
|
||||
-accessibility \
|
||||
-no-strip \
|
||||
-opensource \
|
||||
-no-separate-debug-info \
|
||||
-shared \
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c37ae6661b2a42125c6cad1f71ab79b32877f5deab800c718b536cccb5081b91
|
||||
size 46413376
|
||||
3
qtbase-opensource-src-5.2.0-rc1.tar.xz
Normal file
3
qtbase-opensource-src-5.2.0-rc1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:183f2b115052129fa67c19ff25c4a706ba081958ae4623e94324694a009a2592
|
||||
size 46343632
|
||||
@ -1,78 +0,0 @@
|
||||
From: Gatis Paeglis <gatis.paeglis@digia.com>
|
||||
Date: Tue, 19 Nov 2013 14:07:25 +0000
|
||||
Subject: Workaround source compatibility issue introduced by xcb 1.9.3
|
||||
X-Git-Url: http://quickgit.kde.org/?p=qt%2Fqtbase.git&a=commitdiff&h=486889523c8fe15277e3148904509789a19d25fe
|
||||
---
|
||||
Workaround source compatibility issue introduced by xcb 1.9.3
|
||||
|
||||
Previous version of the struct:
|
||||
|
||||
typedef struct {
|
||||
uint8_t response_type; /**< Type of the response */
|
||||
uint8_t pad0; /**< Padding */
|
||||
uint16_t sequence; /**< Sequence number */
|
||||
uint32_t length;
|
||||
uint16_t event_type;
|
||||
uint16_t pad1;
|
||||
uint32_t pad[5]; /**< Padding */
|
||||
uint32_t full_sequence; /**< full sequence */
|
||||
} xcb_ge_event_t;
|
||||
|
||||
New version of it:
|
||||
|
||||
typedef struct xcb_ge_event_t {
|
||||
uint8_t response_type; /**< */
|
||||
uint8_t extension; /**< */
|
||||
uint16_t sequence; /**< */
|
||||
uint32_t length; /**< */
|
||||
uint16_t event_type; /**< */
|
||||
uint8_t pad0[22]; /**< */
|
||||
uint32_t full_sequence; /**< */
|
||||
} xcb_ge_event_t;
|
||||
|
||||
Changes are:
|
||||
- "pad0" became "extension"
|
||||
- "pad1" and "pad" became "pad0"
|
||||
|
||||
More details in https://bugs.freedesktop.org/show_bug.cgi?id=71502
|
||||
|
||||
Task-number: QTBUG-34748
|
||||
Change-Id: Ibd801c11510f75fa82d5c14346b95236142487ac
|
||||
Reviewed-by: Uli Schlachter <psychon@znc.in>
|
||||
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
||||
---
|
||||
|
||||
|
||||
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
|
||||
@@ -1749,10 +1749,26 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
-bool QXcbConnection::xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *event, int opCode)
|
||||
-{
|
||||
- // xGenericEvent has "extension" on the second byte, xcb_ge_event_t has "pad0".
|
||||
- if (event->pad0 == opCode) {
|
||||
+// Starting from the xcb version 1.9.3 struct xcb_ge_event_t has changed:
|
||||
+// - "pad0" became "extension"
|
||||
+// - "pad1" and "pad" became "pad0"
|
||||
+// New and old version of this struct share the following fields:
|
||||
+// NOTE: API might change again in the next release of xcb in which case this comment will
|
||||
+// need to be updated to reflect the reality.
|
||||
+typedef struct qt_xcb_ge_event_t {
|
||||
+ uint8_t response_type;
|
||||
+ uint8_t extension;
|
||||
+ uint16_t sequence;
|
||||
+ uint32_t length;
|
||||
+ uint16_t event_type;
|
||||
+} qt_xcb_ge_event_t;
|
||||
+
|
||||
+bool QXcbConnection::xi2PrepareXIGenericDeviceEvent(xcb_ge_event_t *ev, int opCode)
|
||||
+{
|
||||
+ qt_xcb_ge_event_t *event = (qt_xcb_ge_event_t *)ev;
|
||||
+ // xGenericEvent has "extension" on the second byte, the same is true for xcb_ge_event_t starting from
|
||||
+ // the xcb version 1.9.3, prior to that it was called "pad0".
|
||||
+ if (event->extension == opCode) {
|
||||
// xcb event structs contain stuff that wasn't on the wire, the full_sequence field
|
||||
// adds an extra 4 bytes and generic events cookie data is on the wire right after the standard 32 bytes.
|
||||
// Move this data back to have the same layout in memory as it was on the wire
|
||||
Loading…
Reference in New Issue
Block a user