mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-23 05:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

app-misc/Clipboard: add 0.7.0, drop 0.6.0

Browse Source 
Signed-off-by: Quincy Fleming <quincyf467@protonmail.com>
This commit is contained in:
Quincy Fleming
2023-05-04 10:44:30 -05:00
parent cf77b8212a
commit 019fc7b5d0
5 changed files with 85 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
app-misc/Clipboard/files/Clipboard-0.6.0-libdestination-and-disable-lto-and-git.patch
View File

@@ -1,103 +0,0 @@
diff -ur '--color=auto' Clipboard-0.6.0/CMakeLists.txt Clipboard-0.6.0-new/CMakeLists.txt
--- Clipboard-0.6.0/CMakeLists.txt 2023-04-08 12:34:14.000000000 -0500
+++ Clipboard-0.6.0-new/CMakeLists.txt 2023-04-24 10:03:45.180861938 -0500
@@ -11,22 +11,6 @@
set(X11WL ON)
endif()
-execute_process( # save the current branch to GIT_BRANCH
- COMMAND git rev-parse --abbrev-ref HEAD
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_BRANCH
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-execute_process( # save the current commit hash to GIT_COMMIT_HASH
- COMMAND git log -1 --format=%h
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_COMMIT_HASH
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
-add_definitions(-DGIT_BRANCH="${GIT_BRANCH}")
add_definitions(-DCLIPBOARD_VERSION="${PROJECT_VERSION}")
if (MSVC)
@@ -74,17 +58,6 @@
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE} ${LIB_LOCATION})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CMAKE_BUILD_TYPE} ${BIN_LOCATION})
-function(enable_lto this_target)
-include(CheckIPOSupported)
-check_ipo_supported(RESULT lto_supported)
-if(lto_supported AND NOT NO_LTO)
- set_property(TARGET ${this_target} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
- if(CMAKE_COMPILER_IS_GNUCXX)
- list(APPEND CMAKE_CXX_COMPILE_OPTIONS_IPO "-flto=auto") # set the thread amount to what is available on the CPU
- endif()
-endif()
-endfunction()
-
add_subdirectory(src/gui)
find_package(X11)
diff -ur '--color=auto' Clipboard-0.6.0/src/clipboard/CMakeLists.txt Clipboard-0.6.0-new/src/clipboard/CMakeLists.txt
--- Clipboard-0.6.0/src/clipboard/CMakeLists.txt 2023-04-08 12:34:14.000000000 -0500
+++ Clipboard-0.6.0-new/src/clipboard/CMakeLists.txt 2023-04-24 10:04:39.144864894 -0500
@@ -5,8 +5,6 @@
src/themes.cpp
)
-enable_lto(clipboard)
-
target_link_libraries(clipboard gui)
if(WIN32)
@@ -45,13 +43,13 @@
TARGET clipboard
APPEND
PROPERTY BUILD_RPATH
- "${CMAKE_INSTALL_PREFIX}/lib"
+ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
)
set_property(
TARGET clipboard
APPEND
PROPERTY INSTALL_RPATH
- "${CMAKE_INSTALL_PREFIX}/lib"
+ "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
)
target_link_options(clipboard PRIVATE -z origin) # set the rpath to $ORIGIN
target_link_libraries(clipboard ${CMAKE_DL_LIBS})
diff -ur '--color=auto' Clipboard-0.6.0/src/clipboardwayland/CMakeLists.txt Clipboard-0.6.0-new/src/clipboardwayland/CMakeLists.txt
--- Clipboard-0.6.0/src/clipboardwayland/CMakeLists.txt 2023-04-08 12:34:14.000000000 -0500
+++ Clipboard-0.6.0-new/src/clipboardwayland/CMakeLists.txt 2023-04-24 10:05:44.524868476 -0500
@@ -60,8 +60,6 @@
)
add_dependencies(clipboardwayland clipboardwayland_generatedheaders)
-enable_lto(clipboardwayland)
-
target_link_libraries(clipboardwayland
${WAYLAND_CLIENT_LIBRARIES}
gui
@@ -71,4 +69,4 @@
${GENERATED_INCLUDE_DIR}
)
-install(TARGETS clipboardwayland LIBRARY DESTINATION lib)
+install(TARGETS clipboardwayland LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff -ur '--color=auto' Clipboard-0.6.0/src/clipboardx11/CMakeLists.txt Clipboard-0.6.0-new/src/clipboardx11/CMakeLists.txt
--- Clipboard-0.6.0/src/clipboardx11/CMakeLists.txt 2023-04-08 12:34:14.000000000 -0500
+++ Clipboard-0.6.0-new/src/clipboardx11/CMakeLists.txt 2023-04-24 10:05:23.048867299 -0500
@@ -7,8 +7,6 @@
gui
)
-enable_lto(clipboardx11)
-
target_include_directories(clipboardx11 PRIVATE ${X11_INCLUDE_DIR})
-install(TARGETS clipboardx11 LIBRARY DESTINATION lib)
+install(TARGETS clipboardx11 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

6
app-misc/Clipboard/files/Clipboard-0.6.0-disable-debug.patch → app-misc/Clipboard/files/Clipboard-0.7.0-disable-debug.patch
View File

@@ -1,6 +1,6 @@
diff -ur '--color=auto' Clipboard-0.6.0/src/gui/include/all/clipboard/logging.hpp Clipboard-0.6.0-new/src/gui/include/all/clipboard/logging.hpp
--- Clipboard-0.6.0/src/gui/include/all/clipboard/logging.hpp 2023-04-08 12:34:14.000000000 -0500
+++ Clipboard-0.6.0-new/src/gui/include/all/clipboard/logging.hpp 2023-04-19 23:01:23.069641770 -0500
diff -ur '--color=auto' Clipboard-0.7.0/src/gui/include/all/clipboard/logging.hpp Clipboard-0.7.0-new/src/gui/include/all/clipboard/logging.hpp
--- Clipboard-0.7.0/src/gui/include/all/clipboard/logging.hpp 2023-05-03 10:43:47.000000000 -0500
+++ Clipboard-0.7.0-new/src/gui/include/all/clipboard/logging.hpp 2023-05-04 09:23:58.640044952 -0500
@@ -17,7 +17,6 @@
#include <iostream>
#include <streambuf>

80
app-misc/Clipboard/files/Clipboard-0.7.0-disable-git-and-lto.patch Normal file
View File

@@ -0,0 +1,80 @@
diff -ur '--color=auto' Clipboard-0.7.0/CMakeLists.txt Clipboard-0.7.0-new/CMakeLists.txt
--- Clipboard-0.7.0/CMakeLists.txt 2023-05-03 10:43:47.000000000 -0500
+++ Clipboard-0.7.0-new/CMakeLists.txt 2023-05-04 09:19:30.508030264 -0500
@@ -11,22 +11,6 @@
set(X11WL ON)
endif()
-execute_process( # save the current branch to GIT_BRANCH
- COMMAND git rev-parse --abbrev-ref HEAD
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_BRANCH
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-execute_process( # save the current commit hash to GIT_COMMIT_HASH
- COMMAND git log -1 --format=%h
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_COMMIT_HASH
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-add_definitions(-DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}")
-add_definitions(-DGIT_BRANCH="${GIT_BRANCH}")
add_definitions(-DCLIPBOARD_VERSION="${PROJECT_VERSION}")
if (MSVC)
@@ -84,17 +68,6 @@
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${LIB_LOCATION})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${BIN_LOCATION})
-function(enable_lto this_target)
-include(CheckIPOSupported)
-check_ipo_supported(RESULT lto_supported)
-if(lto_supported AND NOT NO_LTO)
- set_property(TARGET ${this_target} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
- if(CMAKE_COMPILER_IS_GNUCXX)
- list(APPEND CMAKE_CXX_COMPILE_OPTIONS_IPO "-flto=auto") # set the thread amount to what is available on the CPU
- endif()
-endif()
-endfunction()
-
add_subdirectory(src/gui)
find_package(X11)
diff -ur '--color=auto' Clipboard-0.7.0/src/cb/CMakeLists.txt Clipboard-0.7.0-new/src/cb/CMakeLists.txt
--- Clipboard-0.7.0/src/cb/CMakeLists.txt 2023-05-03 10:43:47.000000000 -0500
+++ Clipboard-0.7.0-new/src/cb/CMakeLists.txt 2023-05-04 09:17:57.458025167 -0500
@@ -5,8 +5,6 @@
src/themes.cpp
)
-enable_lto(cb)
-
target_link_libraries(cb gui)
if(WIN32)
diff -ur '--color=auto' Clipboard-0.7.0/src/cbwayland/CMakeLists.txt Clipboard-0.7.0-new/src/cbwayland/CMakeLists.txt
--- Clipboard-0.7.0/src/cbwayland/CMakeLists.txt 2023-05-03 10:43:47.000000000 -0500
+++ Clipboard-0.7.0-new/src/cbwayland/CMakeLists.txt 2023-05-04 09:18:34.454027194 -0500
@@ -60,8 +60,6 @@
)
add_dependencies(cbwayland cbwayland_generatedheaders)
-enable_lto(cbwayland)
-
target_link_libraries(cbwayland
${WAYLAND_CLIENT_LIBRARIES}
gui
diff -ur '--color=auto' Clipboard-0.7.0/src/cbx11/CMakeLists.txt Clipboard-0.7.0-new/src/cbx11/CMakeLists.txt
--- Clipboard-0.7.0/src/cbx11/CMakeLists.txt 2023-05-03 10:43:47.000000000 -0500
+++ Clipboard-0.7.0-new/src/cbx11/CMakeLists.txt 2023-05-04 09:16:59.336021983 -0500
@@ -7,8 +7,6 @@
gui
)
-enable_lto(cbx11)
-
target_include_directories(cbx11 PRIVATE ${X11_INCLUDE_DIR})
install(TARGETS cbx11 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})