diff options
| -rw-r--r-- | x11-misc/slop/Manifest | 1 | ||||
| -rw-r--r-- | x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch | 20 | ||||
| -rw-r--r-- | x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch | 33 | ||||
| -rw-r--r-- | x11-misc/slop/files/slop-4.3.21-no-librt.patch | 37 | ||||
| -rw-r--r-- | x11-misc/slop/files/slop-4.3.21-no-opengl.patch | 39 | ||||
| -rw-r--r-- | x11-misc/slop/slop-4.3.21.ebuild | 49 |
6 files changed, 0 insertions, 179 deletions
diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest index 200192285a3f..eae40123c514 100644 --- a/x11-misc/slop/Manifest +++ b/x11-misc/slop/Manifest @@ -1,2 +1 @@ -DIST slop-4.3.21.tar.gz 488238 BLAKE2B dc99c690984b616b28f93c3dd26ebd4264dcba7d66c5929f3732c88d3a423f19a3ab94d6673091735bd0d6dc4cec1bc41fc8e3f7bc666e9a8459acb717405e4d SHA512 4489a108883b785eb5dda368a06ea0b7c61e3afeefdeb421f211e01e3cb7eb20836200197abc755be653f086fcd3b8647a460dacf15062fe2cd44438b4f54b68 DIST slop-6.3.46.tar.gz 89391 BLAKE2B 0150ca63e4a598e892abd5505e867f01204f29796dc378a7f3d0c041c1a27f000e98962c41cbf8109573575b37449c1869f29f988c5d2046b504382b2a56779d SHA512 9f44bbb8e14e71a17858711d8da902cb9cf5dc65ed47284be15122f2d1793544deab7f0700517bd07e44613662bfbc7f0991f3d36dcf74af6f90de5fbbd79558 diff --git a/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch b/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch deleted file mode 100644 index f92c57f977df..000000000000 --- a/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 361f930..0982647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,15 +33,6 @@ else() - message( FATAL_ERROR "Your operating system isn't supported yet! CMake will now exit." ) - endif() - --# Add a check target for our makefile. --find_program( CPPCHECK_EXECUTABLE cppcheck -- DOC "A tool for static C/C++ code analysis." ) --if (CPPCHECK_EXECUTABLE) -- add_custom_target( "check" -- COMMAND "${CPPCHECK_EXECUTABLE}" "--enable=all" "*" -- WORKING_DIRECTORY src VERBATIM ) --endif() -- - # Here we generate some of our code if we can. I package it pre-generated - # so nobody has to go find and install gengetopt if they don't want to. - find_program( GENGETOPT_EXECUTABLE gengetopt diff --git a/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch b/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch deleted file mode 100644 index 13f79eef2110..000000000000 --- a/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,29 +33,6 @@ else() - message( FATAL_ERROR "Your operating system isn't supported yet! CMake will now exit." ) - endif() - --# Here we generate some of our code if we can. I package it pre-generated --# so nobody has to go find and install gengetopt if they don't want to. --find_program( GENGETOPT_EXECUTABLE gengetopt -- DOC "A tool to generate code to grab command line options." ) --find_program( SED_EXECUTABLE sed ) --if ( GENGETOPT_EXECUTABLE AND SED_EXECUTABLE ) -- message( "-- Regenerating cmdline.in" ) -- # gengetopt generates cmdline.h, then we move it to cmdline.in. -- execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo" -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" ) -- file( RENAME "${CMAKE_CURRENT_SOURCE_DIR}/src/cmdline.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/cmdline.in" ) -- # Due to a bug in gengetopt, we have to manually insert some code. -- # Replace the first instance of REPLACEME with some text. -- # Eight backslashes = two in the code because of how many instances of escaping is happening. -- execute_process( COMMAND "${SED_EXECUTABLE}" "-i" "0,/REPLACEME/{s/REPLACEME/X=%x\\\\\\\\nY=%y\\\\\\\\nW=%w\\\\\\\\nH=%h\\\\\\\\nG=%g\\\\\\\\nID=%i\\\\\\\\nCancel=%c\\\\\\\\n/}" "cmdline.c" -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" ) -- # Then replace remaining instances. -- execute_process( COMMAND "${SED_EXECUTABLE}" "-i" "s/REPLACEME/X=%x\\\\nY=%y\\\\nW=%w\\\\nH=%h\\\\nG=%g\\\\nID=%i\\\\nCancel=%c\\\\n/" "cmdline.c" -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" ) --else() -- message( "Warning: Command gengetopt or sed not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" ) --endif() -- - # By default our src/options.ggo has our cmake versions variables for - # the 'version ""' line. We replace them here. - # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic. diff --git a/x11-misc/slop/files/slop-4.3.21-no-librt.patch b/x11-misc/slop/files/slop-4.3.21-no-librt.patch deleted file mode 100644 index 0b95b833ffda..000000000000 --- a/x11-misc/slop/files/slop-4.3.21-no-librt.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,10 +75,6 @@ find_package( GLX REQUIRED ) - find_package( XRender REQUIRED ) - find_package( XRandr REQUIRED ) - find_package( GLEW REQUIRED ) --# This library is needed only for Ubuntu it seems, some platforms don't even --# ship with it. I couldn't find a way to do a test compile to check if librt --# was needed, so instead I just didn't mark it as REQUIRED. --find_package( RT ) - - set( CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} ${CMAKE_IMLIB2_CXX_FLAGS}" ) -@@ -96,10 +92,6 @@ include_directories( "${IMLIB2_INCLUDE_DIR}" - ${XRENDER_INCLUDE_DIRS} ) - endif() - --if ( RT_INCLUDE_DIR ) -- include_directories( ${RT_INCLUDE_DIR} ) --endif() -- - # Executable - add_executable( "${BIN_TARGET}" ${source} ) - -@@ -119,11 +111,6 @@ if ( CMAKE_OPENGL_SUPPORT ) - endif() - - --if ( RT_LIBRARY ) -- target_link_libraries( "${BIN_TARGET}" -- "${RT_LIBRARY}" ) --endif() -- - install( TARGETS ${BIN_TARGET} - DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" ) - diff --git a/x11-misc/slop/files/slop-4.3.21-no-opengl.patch b/x11-misc/slop/files/slop-4.3.21-no-opengl.patch deleted file mode 100644 index 2f596b65e992..000000000000 --- a/x11-misc/slop/files/slop-4.3.21-no-opengl.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62cc1a6..f5d66e5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -71,14 +71,8 @@ endif() - - # Obtain library paths and make sure they exist. - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmakemodules" ) --find_package( Imlib2 REQUIRED ) - find_package( X11 REQUIRED ) - find_package( XExt REQUIRED ) --find_package( OpenGL REQUIRED ) --find_package( GLX REQUIRED ) --find_package( XRender REQUIRED ) --find_package( XRandr REQUIRED ) --find_package( GLEW REQUIRED ) - - set( CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} ${CMAKE_IMLIB2_CXX_FLAGS}" ) -diff --git a/src/x.hpp b/src/x.hpp -index 2478414..f35e722 100644 ---- a/src/x.hpp -+++ b/src/x.hpp -@@ -26,7 +26,6 @@ - #include <X11/Xlib.h> - #include <X11/cursorfont.h> - #include <X11/extensions/shape.h> --#include <X11/extensions/Xrandr.h> - - #include <stdlib.h> - #include <cstring> -@@ -97,7 +96,6 @@ public: - std::vector<bool> m_mouse; - bool mouseDown( unsigned int button ); - bool m_keypressed; -- XRRScreenResources* m_res; - private: - slop::CursorType m_currentCursor; - bool m_good; diff --git a/x11-misc/slop/slop-4.3.21.ebuild b/x11-misc/slop/slop-4.3.21.ebuild deleted file mode 100644 index 20411872e466..000000000000 --- a/x11-misc/slop/slop-4.3.21.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="An 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" -KEYWORDS="~amd64 ~x86" -IUSE="opengl" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - opengl? ( - media-libs/glew:0= - media-libs/imlib2 - virtual/opengl - x11-libs/libXrandr - x11-libs/libXrender - )" -DEPEND=" - ${RDEPEND} - opengl? ( - media-libs/glm - )" - -PATCHES=( - "${FILESDIR}/${PN}-4.3.21-no-cppcheck.patch" - "${FILESDIR}/${PN}-4.3.21-no-gengetopt.patch" - "${FILESDIR}/${PN}-4.3.21-no-librt.patch" -) - -src_prepare() { - use opengl || PATCHES+=( "${FILESDIR}/${PN}-4.3.21-no-opengl.patch" ) - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_OPENGL_SUPPORT=$(usex opengl) - ) - cmake-utils_src_configure -} |