gentoo resync : 25.08.2020

2 files changed, 77 insertions, 0 deletions

diff --git a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch
new file mode 100644
index 000000000000..bb46f5e37b93
--- /dev/null
+++ b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch
@@ -0,0 +1,51 @@
+From 7ddb3b8dec442fd1bd502dc7b97841bb07526cae Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 26 Jul 2020 16:47:22 +0200
+Subject: [PATCH] Add cmake buildsystem
+
+---
+ CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++
+ 1 file changed, 32 insertions(+)
+ create mode 100644 CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..42dca7d
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,32 @@
++cmake_minimum_required(VERSION 3.15)
++
++project(xsettingsd VERSION 1.0.0)
++
++include(GNUInstallDirs)
++
++find_package(X11 REQUIRED)
++
++set(libxsettingsd_SRCS
++    common.cc
++    config_parser.cc
++    data_reader.cc
++    data_writer.cc
++    setting.cc
++    settings_manager.cc
++)
++
++add_library(libxsettingsd STATIC ${libxsettingsd_SRCS})
++
++add_executable(xsettingsd xsettingsd.cc)
++add_executable(dump_xsettings dump_xsettings.cc)
++
++target_include_directories(xsettingsd PUBLIC "${PROJECT_BINARY_DIR}")
++target_include_directories(dump_xsettings PUBLIC "${PROJECT_BINARY_DIR}")
++
++target_link_libraries(xsettingsd PUBLIC libxsettingsd X11::X11)
++target_link_libraries(dump_xsettings PUBLIC libxsettingsd X11::X11)
++
++install(TARGETS xsettingsd DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS dump_xsettings DESTINATION ${CMAKE_INSTALL_BINDIR})
++
++install(FILES xsettingsd.1 dump_xsettings.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+-- 
+2.27.0
+
diff --git a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch
new file mode 100644
index 000000000000..795e82ce002f
--- /dev/null
+++ b/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch
@@ -0,0 +1,26 @@
+From 3ec9deebd8e3496feacab83e41846dc4fffc3404 Mon Sep 17 00:00:00 2001
+From: Phil Miller <unmobile+gh@gmail.com>
+Date: Mon, 25 Jun 2018 10:58:59 -0500
+Subject: [PATCH] Return 1 to indicate error from main()
+
+The statement 'return false;' was most likely to end up indicating successful exit
+by returning a 0 value, when failure seems to be intended.
+
+This was flagged as a warning in the Debian Clang Archive Rebuild.
+---
+ dump_xsettings.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dump_xsettings.cc b/dump_xsettings.cc
+index f94a0c0..e9330b4 100644
+--- a/dump_xsettings.cc
++++ b/dump_xsettings.cc
+@@ -270,7 +270,7 @@ int main(int argc, char** argv) {
+ 
+   xsettingsd::DataReader reader(buffer, data_size);
+   if (!xsettingsd::DumpSettings(&reader))
+-    return false;
++    return 1;
+ 
+   return 0;
+ }