| 1 |
commit: c8961e22fe493142ae43924b2485a00c0f5066fa |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 28 07:58:01 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 29 06:52:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8961e22 |
| 7 |
|
| 8 |
x11-misc/slop: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/8188 |
| 11 |
|
| 12 |
.../slop/files/slop-6.3.46-fix-build-system.patch | 56 ---------------------- |
| 13 |
1 file changed, 56 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
deleted file mode 100644 |
| 17 |
index 2ca92f9d2ac..00000000000 |
| 18 |
--- a/x11-misc/slop/files/slop-6.3.46-fix-build-system.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,56 +0,0 @@ |
| 21 |
---- a/CMakeLists.txt |
| 22 |
-+++ b/CMakeLists.txt |
| 23 |
-@@ -1,16 +1,13 @@ |
| 24 |
- cmake_minimum_required(VERSION 3.1.3) |
| 25 |
- |
| 26 |
-+include(GNUInstallDirs) |
| 27 |
-+ |
| 28 |
- set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build (Debug or Release)") |
| 29 |
--if ( NOT CMAKE_INSTALL_PREFIX ) |
| 30 |
-- set(CMAKE_INSTALL_PREFIX "/usr") |
| 31 |
--endif() |
| 32 |
- |
| 33 |
--project(slop) |
| 34 |
-+project(slop VERSION 6.3.46 LANGUAGES CXX) |
| 35 |
- |
| 36 |
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/bin/") |
| 37 |
- |
| 38 |
--set( CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Directory where man pages reside. (/usr/share/man, /usr/local/share/man, etc.)" ) |
| 39 |
-- |
| 40 |
- set( CMAKE_COMPRESS_MAN TRUE CACHE BOOL "Whether or not to compress the man pages for install." ) |
| 41 |
- |
| 42 |
- if ( CMAKE_COMPRESS_MAN ) |
| 43 |
-@@ -21,7 +18,7 @@ |
| 44 |
- |
| 45 |
- include_directories("${PROJECT_BINARY_DIR}") |
| 46 |
- |
| 47 |
--add_definitions(-DSLOP_VERSION="v6.3.46") |
| 48 |
-+add_definitions(-DSLOP_VERSION="v${PROJECT_VERSION}") |
| 49 |
- |
| 50 |
- # The names have to be unique unfortunately. |
| 51 |
- set(EXECUTABLE_NAME "slop") |
| 52 |
-@@ -43,11 +40,13 @@ |
| 53 |
- |
| 54 |
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) |
| 55 |
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 11) |
| 56 |
-+set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_EXTENSIONS OFF) |
| 57 |
- |
| 58 |
- add_executable(${EXECUTABLE_NAME} src/main.cpp) |
| 59 |
- |
| 60 |
- set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD_REQUIRED ON) |
| 61 |
- set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_STANDARD 11) |
| 62 |
-+set_property(TARGET ${EXECUTABLE_NAME} PROPERTY CXX_EXTENSIONS OFF) |
| 63 |
- |
| 64 |
- set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules" ) |
| 65 |
- |
| 66 |
-@@ -83,7 +82,7 @@ |
| 67 |
- target_link_libraries(${EXECUTABLE_NAME} ${ICU_UC_LIBRARIES} ) |
| 68 |
- endif() |
| 69 |
- |
| 70 |
--install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" ) |
| 71 |
--install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" ) |
| 72 |
--install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" COMPONENT development ) |
| 73 |
-+install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}" ) |
| 74 |
-+install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) |
| 75 |
-+install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT development ) |
| 76 |
- install( FILES "${CMAKE_SOURCE_DIR}/${MANTARGET}" DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" COMPONENT doc ) |
Archives