commit: 79827cc70b8d9fffb3c12d79282140113436f805 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 26 15:24:02 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 26 15:29:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79827cc7
x11-misc/xsettingsd: New package, runtime req of kde-gtk-config Bug: https://bugs.gentoo.org/332695 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/xsettingsd/Manifest | 1 + .../xsettingsd-1.0.0-add-cmake-buildsystem.patch | 51 ++++++++++++++++++++++ .../files/xsettingsd-1.0.0-return-1.patch | 26 +++++++++++ x11-misc/xsettingsd/metadata.xml | 11 +++++ x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild | 22 ++++++++++ 5 files changed, 111 insertions(+) diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest new file mode 100644 index 00000000000..1e69a6779b6 --- /dev/null +++ b/x11-misc/xsettingsd/Manifest @@ -0,0 +1 @@ +DIST xsettingsd-1.0.0.tar.gz 23627 BLAKE2B e9f7dcb9fd017f34ed88f29e1954e0824764db66eac5fbcfa55e7edef51c4bdec1cb9383efe0b6cb18b88c04818b106b9c4f95fb25daaf09a76b4b4ef4e0b75f SHA512 39077050a2fc3206c308ba399328719303884dd668b61f7756f0a3a4388ed25a3cda0849a713126c22c6b80466ab74c1317fdd9cb3e652169c80c54ba0a45790 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 00000000000..bb46f5e37b9 --- /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 <[email protected]> +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 00000000000..795e82ce002 --- /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 <[email protected]> +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; + } diff --git a/x11-misc/xsettingsd/metadata.xml b/x11-misc/xsettingsd/metadata.xml new file mode 100644 index 00000000000..c782cfbaf57 --- /dev/null +++ b/x11-misc/xsettingsd/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <remote-id type="github">derat/xsettingsd</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild new file mode 100644 index 00000000000..2fb957de209 --- /dev/null +++ b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Provides settings to X11 applications via the XSETTINGS specification" +HOMEPAGE="https://github.com/derat/xsettingsd"; +SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-return-1.patch + "${FILESDIR}"/${P}-add-cmake-buildsystem.patch +)
