From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- x11-misc/slop/Manifest | 9 ++++ x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch | 20 +++++++++ x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch | 33 +++++++++++++++ x11-misc/slop/files/slop-4.3.21-no-librt.patch | 37 ++++++++++++++++ x11-misc/slop/files/slop-4.3.21-no-opengl.patch | 39 +++++++++++++++++ x11-misc/slop/metadata.xml | 22 ++++++++++ x11-misc/slop/slop-4.3.21.ebuild | 49 ++++++++++++++++++++++ x11-misc/slop/slop-6.3.46.ebuild | 27 ++++++++++++ 8 files changed, 236 insertions(+) create mode 100644 x11-misc/slop/Manifest create mode 100644 x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch create mode 100644 x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch create mode 100644 x11-misc/slop/files/slop-4.3.21-no-librt.patch create mode 100644 x11-misc/slop/files/slop-4.3.21-no-opengl.patch create mode 100644 x11-misc/slop/metadata.xml create mode 100644 x11-misc/slop/slop-4.3.21.ebuild create mode 100644 x11-misc/slop/slop-6.3.46.ebuild (limited to 'x11-misc/slop') diff --git a/x11-misc/slop/Manifest b/x11-misc/slop/Manifest new file mode 100644 index 000000000000..450a70f99afc --- /dev/null +++ b/x11-misc/slop/Manifest @@ -0,0 +1,9 @@ +AUX slop-4.3.21-no-cppcheck.patch 790 SHA256 501353afd4a5268ddfd2595ee23faaab797328beb6ce01c2e641d0f063c8087f SHA512 0cfef93fdad5c9b739032388698e2a2fb997774f95590573f7a1807a219435282b9d0e4daddf6ea79547c54cdfcd76b7545eb5009d1dc4b06ab81636beed29a5 WHIRLPOOL c628d63db9ab5dbff9868a70aef6b91bd5792e92451316aad2656dee19e93ece9fcc6c39801859584b3f32ac0892058bc670c3e93e9df3e01a1fb1080ac0300c +AUX slop-4.3.21-no-gengetopt.patch 2109 SHA256 2247410ffc167f82bfd7bf5cf585ccddb8cb2766033c5d42b8e9400c69f47bc4 SHA512 f345eaa42463dce37da6368b6f2e0d343c0af8a639e59a031f95f66cf3d4c99b6af3c4ed09b38408268b327334bf835e2e6207e8fdd12dbf106ca67552a545f7 WHIRLPOOL a6a63d8d51785dbc16dd63ecc42eef85120e7a06e3d9a2a46fa503497bd7f47c8bfe6afa54195a9ee383f34b60092d98a8d4d72b5cec07dc2061c4e725d6b215 +AUX slop-4.3.21-no-librt.patch 1099 SHA256 1eb06b618b33261aa2d93a099067b50d129d08d42a7290247ce8a5c5954cf75f SHA512 aca2ee7b8ceab74e7add153692884ee29ec787f3b0df5627a825a1c090be59406df7f9ed2fed1301a2ef28d15d0f9cbdf4fa221f5a4734e7582868f02fe65c2b WHIRLPOOL 033a7415a3906123180878b8c80051fad365972cac20dfdf6382d0bef6c282b7e87e5978ee4cd6deff50379f7c4302fc0f1c9f9f5ff3f711114355e35faceefe +AUX slop-4.3.21-no-opengl.patch 1201 SHA256 a2438b2a5bfed26f7faa32db2dd41784df0df9fe71cd4d23c770176a80222a70 SHA512 df03f77d1a812e02070c4a44ad74c373ce0cf739a847a2ddd2dbab591488bd31da21544db0d6818f456a0b0c2cc0f092a055b1d1f869868b6f12418c02cfdcb5 WHIRLPOOL b656382441b1e86833b23d8c2a5765f9622b7a88ef7b36b54e8f53ba1752a5abf1fc2da9866e3f126c42b44825ebbf653e1e0132979ba72620c765a027cd2712 +DIST slop-4.3.21.tar.gz 488238 SHA256 352eb367a8d11686adb182c7dbddf65d55b0ee4d5a2257a07486d5728722177c SHA512 4489a108883b785eb5dda368a06ea0b7c61e3afeefdeb421f211e01e3cb7eb20836200197abc755be653f086fcd3b8647a460dacf15062fe2cd44438b4f54b68 WHIRLPOOL 651d5c736fd4a8431fd9967280181c8512a4948c9534d73cc8c035cf9a925dffc22e966ffed79421ec2e1fae1c6008af4e6cac7413a8efe45a8f5f2e8f6113e2 +DIST slop-6.3.46.tar.gz 89391 SHA256 228ef2bf5d4824af5c22c87ce040080f0ce7385d0538bf2641dcd6ce70486e1a SHA512 9f44bbb8e14e71a17858711d8da902cb9cf5dc65ed47284be15122f2d1793544deab7f0700517bd07e44613662bfbc7f0991f3d36dcf74af6f90de5fbbd79558 WHIRLPOOL 72bdefd6657df687ea5af038f9635c3a1033fcf67d316b1983a55ce86e067f21733a8c2a752281ce59e15ada562ce001eded09dcb87e8ec989cc2325fdb904c4 +EBUILD slop-4.3.21.ebuild 998 SHA256 34b5c2d41a1cc86cf1eca64d39af06a5f33435499f1143d3ded15795a3ec0f3f SHA512 6885b852092d53097338ecb21e5c15c022afa203513f0699de9bfae3268a5414773f3511435ea7d410115792ec080d17fecf4d4df889f334abaee67414030ad4 WHIRLPOOL d29f735570117d849b03256101e5e299e6538137c5acd537f0fbb2d6526f1d30303c0da7d582f7e3f8acf64bfb591a853addf2a480b0e0a89c0a3905a6dc288b +EBUILD slop-6.3.46.ebuild 538 SHA256 8eb49c964918b6ebc6bad83cdd06c0afe72f6b6a17205f3223b115bc0d239cf5 SHA512 d912f801f8d79024246bcb564171aeb268bd82ddeff2039ba215693690a731a872c73c5b7737fa9954f2f0be25f993c22b81e8eaa5a757438706d5c25ecf0d44 WHIRLPOOL ea20e8955eff3e3d808b62cbbfb67ccf1d7691e84ceb6fcce7db9195b66f32e5fe976de7d6c1d7648d674f07ebadfc954f0b5ec15fecc17f8fa6379a4c4bead7 +MISC metadata.xml 834 SHA256 daf540caa5dfd445230e74f3f3a161d8662e0acf3733be4794e06b29ad35f5ff SHA512 d3048ec19bdb9d9cc6a0c6f47d751ae29718a754b3c2ea90cb015787c491d536857b50eaa8b98c17fce83738e15200a96909d7fee48186a9cfd7267e1f6b5277 WHIRLPOOL fc6b8c5ac9d612c540bb93800e9be82c51a314556f0b4304b72e00b1e99330b2456bce6bdd8d777fa16ad1115a9dd47f0de97e1e27f012ac1f8c145e012f293b 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 new file mode 100644 index 000000000000..f92c57f977df --- /dev/null +++ b/x11-misc/slop/files/slop-4.3.21-no-cppcheck.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..13f79eef2110 --- /dev/null +++ b/x11-misc/slop/files/slop-4.3.21-no-gengetopt.patch @@ -0,0 +1,33 @@ +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 new file mode 100644 index 000000000000..0b95b833ffda --- /dev/null +++ b/x11-misc/slop/files/slop-4.3.21-no-librt.patch @@ -0,0 +1,37 @@ +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 new file mode 100644 index 000000000000..2f596b65e992 --- /dev/null +++ b/x11-misc/slop/files/slop-4.3.21-no-opengl.patch @@ -0,0 +1,39 @@ +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 + #include + #include +-#include + + #include + #include +@@ -97,7 +96,6 @@ public: + std::vector 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/metadata.xml b/x11-misc/slop/metadata.xml new file mode 100644 index 000000000000..d1c681a60ce8 --- /dev/null +++ b/x11-misc/slop/metadata.xml @@ -0,0 +1,22 @@ + + + + + palipalo9@googlemail.com + Ingolf Wagner + + + proxy-maint@gentoo.org + Proxy Maintainers + + + slop (Select Operation) is an application that queries for a selection + from the user and prints the region to stdout. It grabs the mouse and + turns it into a crosshair, lets the user click and drag to make a + selection (or click on a window) while drawing a pretty box around it, + then finally prints the selection's dimensions to stdout. + + + naelstrof/slop + + diff --git a/x11-misc/slop/slop-4.3.21.ebuild b/x11-misc/slop/slop-4.3.21.ebuild new file mode 100644 index 000000000000..20411872e466 --- /dev/null +++ b/x11-misc/slop/slop-4.3.21.ebuild @@ -0,0 +1,49 @@ +# 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 +} diff --git a/x11-misc/slop/slop-6.3.46.ebuild b/x11-misc/slop/slop-6.3.46.ebuild new file mode 100644 index 000000000000..d8334f019a4a --- /dev/null +++ b/x11-misc/slop/slop-6.3.46.ebuild @@ -0,0 +1,27 @@ +# 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="" + +RDEPEND=" + dev-libs/icu + virtual/opengl + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender +" +DEPEND=" + ${RDEPEND} + media-libs/glm +" -- cgit v1.2.3