commit: 335789ebbb3a977ef608acd7775715fadbfedc51 Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net> AuthorDate: Mon Oct 20 07:50:40 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Oct 20 11:06:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335789eb
x11-misc/slop: drop 7.6-r2 Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net> Part-of: https://github.com/gentoo/gentoo/pull/44257 Closes: https://github.com/gentoo/gentoo/pull/44257 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/slop/Manifest | 1 - x11-misc/slop/files/icu-75.1-cxx17.patch | 21 --------- x11-misc/slop/files/slop-7.5-missing-header.patch | 16 ------- x11-misc/slop/files/slop-7.6-cmake4.patch | 10 ----- x11-misc/slop/slop-7.6-r2.ebuild | 53 ----------------------- 5 files changed, 101 deletions(-) diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest index d8aa844fd18d..b4371c6f8834 100644 --- a/x11-misc/slop/Manifest +++ b/x11-misc/slop/Manifest @@ -1,2 +1 @@ -DIST slop-7.6.tar.gz 198605 BLAKE2B fcf8b0e1212f50044aa3e3a15d208ee3fda9e1883b9601beba6b29ad574555db83f382547bbe064570765e1ed1e7c0c92bf891edadf89f006bfdf10a5b469c66 SHA512 d1abc50cad124cfb11e9b57c38c824efb2ece3dffce8e54e451ce4adc4a7ad441c6171b7df5d1c8dfa66c875a12cf07b206ba3b87229c0e5f2ddf744d7922fc3 DIST slop-7.7.tar.gz 198570 BLAKE2B f0f157ce8f62851428c82e6740311d28128a6f5a543641598fe6ac9daf40783bd7b9599dd6514ac0d21ba6c900dbe7c6eebed33ade0b50b10b5a3e44215e5ed9 SHA512 cb3a636e7005dbe463a5c4762c2002916014e13a30d2e50cd0e5bbb5ae8e7a6b65f51ab03c3eb6d50f23861f04ae126f1c1fa5db3eb798f3229f09dfa60510f8 diff --git a/x11-misc/slop/files/icu-75.1-cxx17.patch b/x11-misc/slop/files/icu-75.1-cxx17.patch deleted file mode 100644 index 4852c83fc6e8..000000000000 --- a/x11-misc/slop/files/icu-75.1-cxx17.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/933863 -https://github.com/naelstrof/slop/issues/172 - ---- a/CMakeLists.txt -+++ a/CMakeLists.txt -@@ -53,13 +53,13 @@ if ( SLOP_OPENGL ) - endif() - - set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) --set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 11) -+set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 17) - set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_EXTENSIONS OFF) - - add_executable(${EXECUTABLE_NAME} src/main.cpp) - - set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) --set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 11) -+set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 17) - set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_EXTENSIONS OFF) - - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" ) diff --git a/x11-misc/slop/files/slop-7.5-missing-header.patch b/x11-misc/slop/files/slop-7.5-missing-header.patch deleted file mode 100644 index f77fe8f9cf88..000000000000 --- a/x11-misc/slop/files/slop-7.5-missing-header.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/810349 - -https://github.com/naelstrof/slop/commit/5cbcb9e -From: Drunkard Zhang <[email protected]> -Date: Tue, 28 Sep 2021 12:20:25 +0800 -Subject: [PATCH] bugfix: add missed header - -XDestroyImage is included in <X11/Xutil.h> which belongs to libX11. -Build fails without include this header on Gentoo. ---- a/src/framebuffer.cpp -+++ b/src/framebuffer.cpp -@@ -1,3 +1,4 @@ -+#include <X11/Xutil.h> - #include "framebuffer.hpp" - - slop::Framebuffer::Framebuffer( int w, int h ) { diff --git a/x11-misc/slop/files/slop-7.6-cmake4.patch b/x11-misc/slop/files/slop-7.6-cmake4.patch deleted file mode 100644 index b119315938ad..000000000000 --- a/x11-misc/slop/files/slop-7.6-cmake4.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 44657ec..e400508 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1.3) -+cmake_minimum_required(VERSION 3.5) - - project(slop VERSION 7.6 LANGUAGES CXX) - diff --git a/x11-misc/slop/slop-7.6-r2.ebuild b/x11-misc/slop/slop-7.6-r2.ebuild deleted file mode 100644 index c3d6739c9b8b..000000000000 --- a/x11-misc/slop/slop-7.6-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Application that queries the user for a selection for printing" -HOMEPAGE="https://github.com/naelstrof/slop"; -SRC_URI="https://github.com/naelstrof/slop/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="amd64 ~x86" -IUSE="icu opengl" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - icu? ( dev-libs/icu:= ) - opengl? ( - media-libs/glew:0= - media-libs/libglvnd - virtual/opengl - x11-libs/libXrender:= - ) -" -BDEPEND=" - ${RDEPEND} - x11-base/xorg-proto -" -DEPEND=" - ${RDEPEND} - media-libs/glm -" - -PATCHES=( - "${FILESDIR}/${PN}"-7.5-missing-header.patch - "${FILESDIR}/${P}"-cmake4.patch -) - -src_prepare() { - use icu && eapply "${FILESDIR}/"icu-75.1-cxx17.patch - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DSLOP_OPENGL=$(usex opengl) - -DSLOP_UNICODE=$(usex icu) - ) - cmake_src_configure -}
