[gentoo-commits] repo/gentoo:master commit in: x11-misc/slop/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/slop/files/

[Matthias Maier]

commit:     6618768ee2b477120e5bbb07640fa770f4766aba
Author:     Ingolf Wagner <contact <AT> ingolf-wagner <DOT> de>
AuthorDate: Tue Jun  6 10:19:10 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 10:27:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6618768e

x11-misc/slop: fixed no-opengl patch

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 x11-misc/slop/files/slop-4.3.21-no-opengl.patch | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

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
index 7dbd45dd7d0..2f596b65e99 100644
--- a/x11-misc/slop/files/slop-4.3.21-no-opengl.patch
+++ b/x11-misc/slop/files/slop-4.3.21-no-opengl.patch
@@ -1,7 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62cc1a6..f5d66e5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -67,14 +67,8 @@ endif()
+@@ -71,14 +71,8 @@ endif()
  
  # Obtain library paths and make sure they exist.
  set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmakemodules" )
@@ -16,3 +17,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  
  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;

[gentoo-commits] repo/gentoo:master commit in: x11-misc/slop/files/

[Michał Górny]

commit:     c8961e22fe493142ae43924b2485a00c0f5066fa
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 28 07:58:01 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 06:52:34 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8961e22

x11-misc/slop: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/8188

 .../slop/files/slop-6.3.46-fix-build-system.patch  | 56 ----------------------
 1 file changed, 56 deletions(-)

diff --git a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch b/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
deleted file mode 100644
index 2ca92f9d2ac..00000000000
--- a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,16 +1,13 @@
- cmake_minimum_required(VERSION 3.1.3)
- 
-+include(GNUInstallDirs)
-+
- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)")
--if ( NOT CMAKE_INSTALL_PREFIX )
--    set(CMAKE_INSTALL_PREFIX "/usr")
--endif()
- 
--project(slop)
-+project(slop VERSION 6.3.46 LANGUAGES CXX)
- 
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/")
- 
--set( CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where man pages reside. (/usr/share/man, /usr/local/share/man, etc.)" )
--
- set( CMAKE_COMPRESS_MAN TRUE CACHE BOOL "Whether or not to compress the man pages for install." )
- 
- if ( CMAKE_COMPRESS_MAN )
-@@ -21,7 +18,7 @@
- 
- include_directories("${PROJECT_BINARY_DIR}")
- 
--add_definitions(-DSLOP_VERSION="v6.3.46")
-+add_definitions(-DSLOP_VERSION="v${PROJECT_VERSION}")
- 
- # The names have to be unique unfortunately.
- set(EXECUTABLE_NAME "slop")
-@@ -43,11 +40,13 @@
- 
- 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_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_EXTENSIONS OFF)
- 
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" )
- 
-@@ -83,7 +82,7 @@
-     target_link_libraries(${EXECUTABLE_NAME} ${ICU_UC_LIBRARIES} )
- endif()
- 
--install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
--install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
--install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" COMPONENT development )
-+install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" )
-+install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}" )
-+install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT development )
- install( FILES "${CMAKE_SOURCE_DIR}/${MANTARGET}" DESTINATION  "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc )