From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- x11-misc/xsettingsd/Manifest | 6 +-- .../xsettingsd-1.0.0-add-cmake-buildsystem.patch | 51 ---------------------- .../files/xsettingsd-1.0.0-return-1.patch | 26 ----------- x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild | 22 ---------- x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild | 2 +- 5 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch delete mode 100644 x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch delete mode 100644 x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild (limited to 'x11-misc/xsettingsd') diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest index ae1a7a4633c6..3fa2974b5e15 100644 --- a/x11-misc/xsettingsd/Manifest +++ b/x11-misc/xsettingsd/Manifest @@ -1,7 +1,3 @@ -AUX xsettingsd-1.0.0-add-cmake-buildsystem.patch 1418 BLAKE2B 981c9b2160a9bce572d7b703e08db93d9619767e39368e5f5eeb41126a78223fed840b41f5804b1a20e76bce695028f101ca5fc28297a02f93e55fd99c225349 SHA512 a3ff870af999745f873d1ab8f2eadfff73b82048a401f6ceacf79f1d7c9834c84081f09e3021af3fb977d80042e663ff40278cef0f72307f877608ba6617f041 -AUX xsettingsd-1.0.0-return-1.patch 829 BLAKE2B 9e6024303ffa9f7977187e6f718f03f993788abb5421989e31fcd55f366810903eb9c375c5281803d22ec23b61286ff799bb4096840e55ebd5fc29e0ad592e15 SHA512 f66b5c0fa5068ab5e0232d5de025a59fe8a1bcbbf9b6cc398610773d32c05eb05ef40a8dc7432f5baf153c06671f24f36f07868acd119471665b7c0450ddf6a3 -DIST xsettingsd-1.0.0.tar.gz 23627 BLAKE2B e9f7dcb9fd017f34ed88f29e1954e0824764db66eac5fbcfa55e7edef51c4bdec1cb9383efe0b6cb18b88c04818b106b9c4f95fb25daaf09a76b4b4ef4e0b75f SHA512 39077050a2fc3206c308ba399328719303884dd668b61f7756f0a3a4388ed25a3cda0849a713126c22c6b80466ab74c1317fdd9cb3e652169c80c54ba0a45790 DIST xsettingsd-1.0.2.tar.gz 22481 BLAKE2B 1f7e8112b8910ea20492109ebc2df90d7113804653d5758bbac2b52116e737505026ddd0e17b5444951ad83606ba41495ce8e165bbe04573c740cc3faee75c1b SHA512 da2a82d0b3f5061a1fad7632d800539f4e81bd3f8631dd724705d0601556c044c62da7469a974cbe8f6d8e070247493ac5776bac966cf36f1fae825562457baa -EBUILD xsettingsd-1.0.0.ebuild 543 BLAKE2B b2d84af5b7091b0bab3b41122e2397bf7fb57d7094c7f942c9a6231d2d25d2f31023dc3adfaa1e23dc8c9e2a25ab7bc7447f2627aa304b5b52fc0e096549fb0b SHA512 355acc37e97dc3e33af015136676434cc55f8160abe1566530688093a50507faa9c7c527056f143808be81521718acbdf3cbe28e06e3c0b54f03e2611aac149d -EBUILD xsettingsd-1.0.2.ebuild 682 BLAKE2B 49180b042c9528fe4a91bfba6dd3c8685253057531b7fb7ceee5b2d04c5e9a41c77759f7f2e5dbb4f88a8400620afbc75c6e7782a7a3baa59e8844b3e4dc63ad SHA512 f27ba0676a73fb0d4381ef369ad61807eac09f36a95bb130e1eef65c2a9f8980ba050d9ee7a42d6219d0dcf2d10a626cc88ab33a4716ec91a5f772c0ddd7d7ec +EBUILD xsettingsd-1.0.2.ebuild 681 BLAKE2B cc742070d60fa4033db3cd0f708bbf97c0668fa6fe18b6bef09905fd2df193c00ec10707a69f93da8f5524396fed17fd890b88e27c19c687bdfe6b12f179dc58 SHA512 8e2dac41b20e834c14852713f1de3b768f89c46156db92afc37d0754228fa546f3218aa4cf90a2587658f6164e3f3503ea7fcd45d7238e9cbd3a5b2f4cb1578c MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959 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 deleted file mode 100644 index bb46f5e37b93..000000000000 --- a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-add-cmake-buildsystem.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7ddb3b8dec442fd1bd502dc7b97841bb07526cae Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 deleted file mode 100644 index 795e82ce002f..000000000000 --- a/x11-misc/xsettingsd/files/xsettingsd-1.0.0-return-1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3ec9deebd8e3496feacab83e41846dc4fffc3404 Mon Sep 17 00:00:00 2001 -From: Phil Miller -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/xsettingsd-1.0.0.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild deleted file mode 100644 index 494313069e74..000000000000 --- a/x11-misc/xsettingsd/xsettingsd-1.0.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# 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 ~arm arm64 ~ppc64 x86" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-return-1.patch - "${FILESDIR}"/${P}-add-cmake-buildsystem.patch -) diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild index e26053ae120b..96b34c8aa5b1 100644 --- a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild +++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="test" RESTRICT="!test? ( test )" -- cgit v1.2.3