commit: 019fc7b5d06976fbab715698dc23fc9d07995648
Author: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com>
AuthorDate: Thu May 4 15:44:30 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu May 4 15:44:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=019fc7b5
app-misc/Clipboard: add 0.7.0, drop 0.6.0
Signed-off-by: Quincy Fleming <quincyf467 <AT> protonmail.com>
...ipboard-0.6.0.ebuild => Clipboard-0.7.0.ebuild} | 6 +-
app-misc/Clipboard/Manifest | 2 +-
....0-libdestination-and-disable-lto-and-git.patch | 103 ---------------------
...g.patch => Clipboard-0.7.0-disable-debug.patch} | 6 +-
.../Clipboard-0.7.0-disable-git-and-lto.patch | 80 ++++++++++++++++
5 files changed, 85 insertions(+), 112 deletions(-)
diff --git a/app-misc/Clipboard/Clipboard-0.6.0.ebuild
b/app-misc/Clipboard/Clipboard-0.7.0.ebuild
similarity index 83%
rename from app-misc/Clipboard/Clipboard-0.6.0.ebuild
rename to app-misc/Clipboard/Clipboard-0.7.0.ebuild
index 856d2293c..6173c91af 100644
--- a/app-misc/Clipboard/Clipboard-0.6.0.ebuild
+++ b/app-misc/Clipboard/Clipboard-0.7.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="X? ( x11-libs/libX11 )
)
"
PATCHES=(
- "${FILESDIR}/${P}-libdestination-and-disable-lto-and-git.patch"
+ "${FILESDIR}/${P}-disable-git-and-lto.patch"
)
src_prepare() {
@@ -43,7 +43,3 @@ src_configure() {
)
cmake_src_configure
}
-
-pkg_postinst() {
- elog "The \"clipboard\" command is depreciated. Use \"cb\" instead.
\"cb\" is symlinked to \"clipboard\" for now."
-}
diff --git a/app-misc/Clipboard/Manifest b/app-misc/Clipboard/Manifest
index 58b92a5cd..874d9c260 100644
--- a/app-misc/Clipboard/Manifest
+++ b/app-misc/Clipboard/Manifest
@@ -1 +1 @@
-DIST Clipboard-0.6.0.tar.gz 9187112 BLAKE2B
91f1a4064d7cb539aa4e2cb227703cee6a7f9a4931d7555bf35fa9b4499a641cdd9093cadb713ab4f4d2a985e98616216921b658388b2adc939b4495293a301c
SHA512
aaf8a05736ba36b24448ec2df822d633f3532557b8f976447e19342fb6a482be8194d2c4d67c8fb9c4d8ecc04f88db5af14ad9d836b923fedfecce275c420875
+DIST Clipboard-0.7.0.tar.gz 19982465 BLAKE2B
8ad1f03a3ae59d38fd543a45dff84eb307d716564c972b1c2de3c7cd8b07d7c48d1d4800ce5bb17a440c7e9d402804a40f49496869b4955a8acf60dbf6375845
SHA512
f5ffdc362854a5a6728914351462286cd2afb39cdf319cf1837045e892baf34896059a4f4415eb4ec118cd6770840978ffdbef7be715648b79bd344c6ecade5f
diff --git
a/app-misc/Clipboard/files/Clipboard-0.6.0-libdestination-and-disable-lto-and-git.patch
b/app-misc/Clipboard/files/Clipboard-0.6.0-libdestination-and-disable-lto-and-git.patch
deleted file mode 100644
index e717f94ba..000000000
---
a/app-misc/Clipboard/files/Clipboard-0.6.0-libdestination-and-disable-lto-and-git.patch
+++ /dev/null
@@ -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})
diff --git a/app-misc/Clipboard/files/Clipboard-0.6.0-disable-debug.patch
b/app-misc/Clipboard/files/Clipboard-0.7.0-disable-debug.patch
similarity index 55%
rename from app-misc/Clipboard/files/Clipboard-0.6.0-disable-debug.patch
rename to app-misc/Clipboard/files/Clipboard-0.7.0-disable-debug.patch
index 12c68f3ae..2720a6ace 100644
--- a/app-misc/Clipboard/files/Clipboard-0.6.0-disable-debug.patch
+++ b/app-misc/Clipboard/files/Clipboard-0.7.0-disable-debug.patch
@@ -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>
diff --git a/app-misc/Clipboard/files/Clipboard-0.7.0-disable-git-and-lto.patch
b/app-misc/Clipboard/files/Clipboard-0.7.0-disable-git-and-lto.patch
new file mode 100644
index 000000000..c4e487c64
--- /dev/null
+++ b/app-misc/Clipboard/files/Clipboard-0.7.0-disable-git-and-lto.patch
@@ -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})
