rpms
/
qt5-qtbase
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use upstream libsystemd fix instead

This commit is contained in:
Rex Dieter 2016-06-04 01:49:26 -05:00
parent d3a97e0164
commit ce230a75e6
2 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt5-qtbase.spec
View File

@ -84,8 +84,6 @@ Patch4: qtbase-opensource-src-5.3.2-QTBUG-35459.patch
Patch12: qtbase-opensource-src-5.2.0-enable_ft_lcdfilter.patch
# upstreamable patches
# libsystemd-journal => libsystemd api change
Patch20: qtbase-opensource-src-5.6.0-libsystemd.patch
# Workaround moc/multilib issues
# https://bugzilla.redhat.com/show_bug.cgi?id=1290020
@ -106,6 +104,7 @@ Patch61: qt5-qtbase-cxxflag.patch
# Item views, https://bugreports.qt.io/browse/QTBUG-48870
Patch158: 0058-QtGui-Avoid-rgba64-rgba32-conversion-on-every-pixel-.patch
Patch167: 0067-Search-for-libsystemd-first-fall-back-to-libsystemd-.patch
Patch176: 0076-QListView-fix-skipping-indexes-in-selectedIndexes.patch
Patch187: 0087-xcb-Fix-drag-and-drop-between-xcb-screens.patch
Patch201: 0101-xcb-include-cmath.patch
@ -366,14 +365,13 @@ RPM macros for building Qt5 packages.
%patch4 -p1 -b .QTBUG-35459
%patch12 -p1 -b .enable_ft_lcdfilter
%patch20 -p1 -b .libsystemd
%patch52 -p1 -b .moc_WORDSIZE
%patch54 -p1 -b .arm
%patch60 -p1 -b .moc_system_defines
%patch61 -p1 -b .qt5-qtbase-cxxflag
%patch158 -p1 -b .0058
%patch167 -p1 -b .0067
%patch176 -p1 -b .0076
%patch187 -p1 -b .0087
%patch201 -p1 -b .0101

23
qtbase-opensource-src-5.6.0-libsystemd.patch
View File

@ -1,23 +0,0 @@
diff -up qtbase-opensource-src-5.6.0/config.tests/unix/journald/journald.pro.systemd qtbase-opensource-src-5.6.0/config.tests/unix/journald/journald.pro
--- qtbase-opensource-src-5.6.0/config.tests/unix/journald/journald.pro.systemd 2016-02-25 10:25:37.000000000 -0600
+++ qtbase-opensource-src-5.6.0/config.tests/unix/journald/journald.pro 2016-06-03 21:41:09.119559127 -0500
@@ -1,6 +1,6 @@
SOURCES = journald.c
CONFIG += link_pkgconfig
-PKGCONFIG_PRIVATE += libsystemd-journal
+PKGCONFIG_PRIVATE += libsystemd
CONFIG -= qt
diff -up qtbase-opensource-src-5.6.0/src/corelib/global/global.pri.systemd qtbase-opensource-src-5.6.0/src/corelib/global/global.pri
--- qtbase-opensource-src-5.6.0/src/corelib/global/global.pri.systemd 2016-02-25 10:25:37.000000000 -0600
+++ qtbase-opensource-src-5.6.0/src/corelib/global/global.pri 2016-06-04 01:46:06.714935329 -0500
@@ -53,7 +53,7 @@ slog2 {
journald {
CONFIG += link_pkgconfig
- PKGCONFIG_PRIVATE += libsystemd-journal
+ PKGCONFIG_PRIVATE += libsystemd
DEFINES += QT_USE_JOURNALD
}