From d070bdaf18f2062b8d04dd9a706c5ff081ea7583 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 7 Feb 2018 08:00:51 +0100 Subject: [PATCH] Fix missing libcommon.so library Turn libcommon into a static library, similar to how it was with the autotools build. This makes gnome-settings-daemon installable again, and makes it possible for other programs that BR gnome-settings-daemon-devel to build again. --- gnome-settings-daemon.spec | 7 ++++++- libcommon-static-library.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 libcommon-static-library.patch diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index e9aa264..6742e49 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -8,7 +8,7 @@ Name: gnome-settings-daemon Version: 3.27.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -16,6 +16,8 @@ URL: https://download.gnome.org/sources/%{name} Source0: https://download.gnome.org/sources/%{name}/3.27/%{name}-%{version}.tar.xz # Backported from upstream Patch0: 0001-build-Fix-error-when-doing-non-debug-builds.patch +# Fix missing libcommon.so library +Patch1: libcommon-static-library.patch BuildRequires: cups-devel BuildRequires: gettext @@ -191,6 +193,9 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules %{_libexecdir}/gsd-test-input-helper %changelog +* Wed Feb 07 2018 Kalev Lember - 3.27.90-2 +- Fix missing libcommon.so library + * Tue Feb 06 2018 Kalev Lember - 3.27.90-1 - Update to 3.27.90 - Switch to meson build system diff --git a/libcommon-static-library.patch b/libcommon-static-library.patch new file mode 100644 index 0000000..f16288b --- /dev/null +++ b/libcommon-static-library.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/common/meson.build b/plugins/common/meson.build +index ec54cc1a3d65..f62d5a94a028 100644 +--- a/plugins/common/meson.build ++++ b/plugins/common/meson.build +@@ -52,7 +52,7 @@ if enable_wacom + deps += libwacom_dep + endif + +-libcommon = shared_module( ++libcommon = static_library( + plugin_name, + sources: sources, + include_directories: [top_inc, data_inc],