From 8b7af08bc5957bd37772efcb8349401f751407ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 4 Jan 2018 08:49:05 +0100 Subject: [PATCH] kde-workspace: fix build --- srcpkgs/kde-workspace/patches/fix-inline.patch | 11 +++++++++++ srcpkgs/kde-workspace/template | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/kde-workspace/patches/fix-inline.patch diff --git a/srcpkgs/kde-workspace/patches/fix-inline.patch b/srcpkgs/kde-workspace/patches/fix-inline.patch new file mode 100644 index 00000000000..486479cb1eb --- /dev/null +++ b/srcpkgs/kde-workspace/patches/fix-inline.patch @@ -0,0 +1,11 @@ +--- kdm/backend/client.c 2015-08-12 09:03:15.000000000 +0200 ++++ kdm/backend/client.c 2018-01-04 08:42:56.428031407 +0100 +@@ -34,6 +34,8 @@ + * + * user verification and session initiation. + */ ++#undef inline ++#define inline __inline /* fixes build with -std=iso9899:1990 */ + #include "dm.h" + #include "dm_auth.h" + #include "dm_error.h" diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index b1ae06266a9..2a699a7ed75 100644 --- a/srcpkgs/kde-workspace/template +++ b/srcpkgs/kde-workspace/template @@ -44,9 +44,6 @@ make_dirs=" CXXFLAGS="-std=gnu++98" -# dbus 1.20+ headers use 'inline', but something adds -std=iso9899:1990 -broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/6207/steps/shell_3/logs/stdio" - pre_configure() { sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp }