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

libsystemd-journal => libsystemd

This commit is contained in:
Rex Dieter 2016-06-03 21:42:12 -05:00
parent 129089515d
commit e29658923b
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt5-qtbase.spec
View File

@ -30,7 +30,7 @@
%if 0%{?fedora} > 23 || 0%{?rhel} > 6
%global journald -journald
BuildRequires: pkgconfig(libsystemd-journal)
BuildRequires: pkgconfig(libsystemd)
%endif
%if 0%{?fedora} > 23
@ -84,6 +84,8 @@ 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
@ -364,6 +366,8 @@ 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

11
qtbase-opensource-src-5.6.0-libsystemd.patch Normal file
View File

@ -0,0 +1,11 @@
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