From ce230a75e6f10336a021d27e00011e2540e83002 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 4 Jun 2016 01:49:26 -0500 Subject: [PATCH] use upstream libsystemd fix instead --- qt5-qtbase.spec | 6 ++--- qtbase-opensource-src-5.6.0-libsystemd.patch | 23 -------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 qtbase-opensource-src-5.6.0-libsystemd.patch diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 496c220..5d6668b 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -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 diff --git a/qtbase-opensource-src-5.6.0-libsystemd.patch b/qtbase-opensource-src-5.6.0-libsystemd.patch deleted file mode 100644 index b2ab040..0000000 --- a/qtbase-opensource-src-5.6.0-libsystemd.patch +++ /dev/null @@ -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 - } -