* [gentoo-commits] repo/proj/guru:master commit in: app-misc/Clipboard/files/, app-misc/Clipboard/
@ 2023-04-26 9:44 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-04-26 9:44 UTC (permalink / raw
To: gentoo-commits
commit: e0705672ec72b999d135801a7d0bb1f61fa3ccbf
Author: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com>
AuthorDate: Tue Apr 25 03:02:10 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 03:02:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e0705672
app-misc/Clipboard: new package, add 0.6.0
Signed-off-by: Quincy Fleming <quincyf467 <AT> protonmail.com>
app-misc/Clipboard/Clipboard-0.6.0.ebuild | 49 ++++++++++
app-misc/Clipboard/Manifest | 1 +
.../files/Clipboard-0.6.0-disable-debug.patch | 18 ++++
....0-libdestination-and-disable-lto-and-git.patch | 103 +++++++++++++++++++++
app-misc/Clipboard/metadata.xml | 27 ++++++
5 files changed, 198 insertions(+)
diff --git a/app-misc/Clipboard/Clipboard-0.6.0.ebuild b/app-misc/Clipboard/Clipboard-0.6.0.ebuild
new file mode 100644
index 000000000..856d2293c
--- /dev/null
+++ b/app-misc/Clipboard/Clipboard-0.6.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Cut, copy, and paste anything in your terminal"
+HOMEPAGE="https://getclipboard.app/ https://github.com/Slackadays/Clipboard"
+SRC_URI="https://github.com/Slackadays/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X wayland lto debug"
+
+RDEPEND="X? ( x11-libs/libX11 )
+ wayland? (
+ dev-libs/wayland-protocols
+ dev-libs/wayland
+ )
+"
+PATCHES=(
+ "${FILESDIR}/${P}-libdestination-and-disable-lto-and-git.patch"
+)
+
+src_prepare() {
+ if ! use wayland; then
+ sed -i '/pkg_check_modules(WAYLAND_CLIENT wayland-client wayland-protocols)/d' CMakeLists.txt || die
+ fi
+
+ if ! use debug; then
+ eapply "${FILESDIR}/${P}-disable-debug.patch"
+ fi
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
+ "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=$(usex lto TRUE FALSE)"
+ "-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex X OFF ON)"
+ )
+ 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
new file mode 100644
index 000000000..58b92a5cd
--- /dev/null
+++ b/app-misc/Clipboard/Manifest
@@ -0,0 +1 @@
+DIST Clipboard-0.6.0.tar.gz 9187112 BLAKE2B 91f1a4064d7cb539aa4e2cb227703cee6a7f9a4931d7555bf35fa9b4499a641cdd9093cadb713ab4f4d2a985e98616216921b658388b2adc939b4495293a301c SHA512 aaf8a05736ba36b24448ec2df822d633f3532557b8f976447e19342fb6a482be8194d2c4d67c8fb9c4d8ecc04f88db5af14ad9d836b923fedfecce275c420875
diff --git a/app-misc/Clipboard/files/Clipboard-0.6.0-disable-debug.patch b/app-misc/Clipboard/files/Clipboard-0.6.0-disable-debug.patch
new file mode 100644
index 000000000..12c68f3ae
--- /dev/null
+++ b/app-misc/Clipboard/files/Clipboard-0.6.0-disable-debug.patch
@@ -0,0 +1,18 @@
+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
+@@ -17,7 +17,6 @@
+ #include <iostream>
+ #include <streambuf>
+
+-#if defined(NDEBUG)
+ class NullBuffer : public std::streambuf {
+ public:
+ int overflow(int c) override { return c; }
+@@ -26,6 +25,3 @@
+ static NullBuffer nullBuffer;
+ static std::ostream nullStream(&nullBuffer);
+ static std::ostream& debugStream = nullStream;
+-#else
+-static std::ostream& debugStream = std::cerr;
+-#endif
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
new file mode 100644
index 000000000..e717f94ba
--- /dev/null
+++ b/app-misc/Clipboard/files/Clipboard-0.6.0-libdestination-and-disable-lto-and-git.patch
@@ -0,0 +1,103 @@
+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/metadata.xml b/app-misc/Clipboard/metadata.xml
new file mode 100644
index 000000000..0f4bbcf12
--- /dev/null
+++ b/app-misc/Clipboard/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>quincyf467@protonmail.com</email>
+ <name>Quincy Fleming</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="lto">Enable Link Time Optimization (LTO)</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">Slackadays/Clipboard</remote-id>
+ <doc lang="en">https://github.com/Slackadays/Clipboard/blob/main/README.md</doc>
+ <bugs-to>https://github.com/Slackadays/Clipboard/issues</bugs-to>
+ </upstream>
+ <longdescription lang="en">
+ CB (or Clipboard) is a ridonkulously easy-to-use data remembrance tool bursting with oodles of useful features and absolutely gorgeous eye candy.
+
+ That's underselling it a bit.
+
+ This is your one-way golden ticket to saving time and effort anytime and anywhere. Have a telepath with an infallible memory always by your side. Feel the sheer power flowing through your commanding body as you cut, copy, paste, add, remove, load, and make note of anything that dares lay in your terminal at the mere press of a button. In no time, you'll be reclined back on a sunny beach in the Caribbean sipping a succulent papaya smoothie with the love of your life all while you watch dolphins leaping from the shimmering waves of the soft blue water. Ok, so maybe that last part won't actually happen, but you get the idea
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-misc/Clipboard/files/, app-misc/Clipboard/
@ 2023-05-06 6:59 Viorel Munteanu
0 siblings, 0 replies; 3+ messages in thread
From: Viorel Munteanu @ 2023-05-06 6:59 UTC (permalink / raw
To: gentoo-commits
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})
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: app-misc/clipboard/files/, app-misc/clipboard/
@ 2023-10-03 9:34 David Roman
0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2023-10-03 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 3c61783003a71993daf9d907dbc9ca5b433ff0c0
Author: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com>
AuthorDate: Tue Oct 3 01:04:14 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Oct 3 01:04:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c617830
app-misc/clipboard: add 0.8.2 and modify ebuilds
Signed-off-by: Quincy Fleming <quincyf467 <AT> protonmail.com>
app-misc/clipboard/Manifest | 1 +
app-misc/clipboard/clipboard-0.8.0.ebuild | 26 +++----
app-misc/clipboard/clipboard-0.8.1.ebuild | 27 +++-----
...ipboard-0.8.0.ebuild => clipboard-0.8.2.ebuild} | 27 +++-----
app-misc/clipboard/files/disable-debug-info.patch | 19 ------
app-misc/clipboard/files/disable-git-and-lto.patch | 79 ----------------------
app-misc/clipboard/metadata.xml | 3 -
7 files changed, 27 insertions(+), 155 deletions(-)
diff --git a/app-misc/clipboard/Manifest b/app-misc/clipboard/Manifest
index e5bc79b7b5..0d44b01e72 100644
--- a/app-misc/clipboard/Manifest
+++ b/app-misc/clipboard/Manifest
@@ -1,2 +1,3 @@
DIST clipboard-0.8.0.tar.gz 29340849 BLAKE2B 91635f16eee4c7fec588f3ceae34571e815680a34553ecf352f67b77c0749ad4c4ee848713d1b65d7e0a4dee0a2a597b29f59abab9082400dc02acba00ab7326 SHA512 b600e8425e48625ed2ad068500e381b1a0d40eacce92e05d45af21c1f5517dcac516287fbcdc1c03fe87cd5bdd5933258ffccf31460a03dfd7e306dc22442c63
DIST clipboard-0.8.1.tar.gz 31510477 BLAKE2B 25243b59af15ef692f466fcb2b6c35cdd05e2ebaee95ddf2b1c6a555c2225d2273c4d0cc7785fb2da8cfdf8a5afeac968a48cc191c45e1df6966a8dfcfccff0b SHA512 b4c2c857cc734c6470990348c67f31b706cb61b116794135d5e60073d8e5389d4c93ee410e47a9c07998bd3a6578013879ee5f997eda9613c864ea312b54da2e
+DIST clipboard-0.8.2.tar.gz 31616470 BLAKE2B 7b4a58836928d95f5d92a446651e0daa33eebc585cfcb7556bcb887eef413ecbc89e200902db1cee61cdb72e55f2b1cd3c7f35529d399c9094e67b186db42b2f SHA512 a83174ed66ba8fe06abf002136f64e39940e07883af6de2245a45915ee14840b95f1009efa549d87f8adb768535a77f19c859951a1868207689175a3761ed34b
diff --git a/app-misc/clipboard/clipboard-0.8.0.ebuild b/app-misc/clipboard/clipboard-0.8.0.ebuild
index 57d5d1c0aa..f14f813c46 100644
--- a/app-misc/clipboard/clipboard-0.8.0.ebuild
+++ b/app-misc/clipboard/clipboard-0.8.0.ebuild
@@ -14,9 +14,12 @@ SRC_URI="https://github.com/Slackadays/${MY_PN}/archive/refs/tags/${PV}.tar.gz -
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="X wayland lto debug"
+IUSE="X wayland debug"
-RDEPEND="X? ( x11-libs/libX11 )
+RDEPEND="X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
wayland? (
dev-libs/wayland-protocols
dev-libs/wayland
@@ -24,26 +27,13 @@ RDEPEND="X? ( x11-libs/libX11 )
"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}/disable-git-and-lto.patch"
-)
-
-src_prepare() {
- if ! use wayland; then
- sed -i '/pkg_check_modules(WAYLAND_CLIENT wayland-client wayland-protocols)/d' CMakeLists.txt || die
- fi
-
- if ! use debug; then
- eapply "${FILESDIR}/disable-debug-info.patch"
- fi
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
- "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=$(usex lto TRUE FALSE)"
+ "-DCMAKE_C_FLAGS=$(usex debug "${CFLAGS}" "${CFLAGS} -DNDEBUG")"
+ "-DCMAKE_CXX_FLAGS=$(usex debug "${CXXFLAGS}" "${CXXFLAGS} -DNDEBUG")"
"-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex X OFF ON)"
+ "-DNO_WAYLAND=$(usex wayland FALSE TRUE)"
)
cmake_src_configure
}
diff --git a/app-misc/clipboard/clipboard-0.8.1.ebuild b/app-misc/clipboard/clipboard-0.8.1.ebuild
index 57d5d1c0aa..a21cd5e9cd 100644
--- a/app-misc/clipboard/clipboard-0.8.1.ebuild
+++ b/app-misc/clipboard/clipboard-0.8.1.ebuild
@@ -14,36 +14,27 @@ SRC_URI="https://github.com/Slackadays/${MY_PN}/archive/refs/tags/${PV}.tar.gz -
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="X wayland lto debug"
+IUSE="X wayland debug"
-RDEPEND="X? ( x11-libs/libX11 )
+RDEPEND="X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
wayland? (
dev-libs/wayland-protocols
dev-libs/wayland
)
+ media-libs/alsa-lib
"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}/disable-git-and-lto.patch"
-)
-
-src_prepare() {
- if ! use wayland; then
- sed -i '/pkg_check_modules(WAYLAND_CLIENT wayland-client wayland-protocols)/d' CMakeLists.txt || die
- fi
-
- if ! use debug; then
- eapply "${FILESDIR}/disable-debug-info.patch"
- fi
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
- "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=$(usex lto TRUE FALSE)"
+ "-DCMAKE_C_FLAGS=$(usex debug "${CFLAGS}" "${CFLAGS} -DNDEBUG")"
+ "-DCMAKE_CXX_FLAGS=$(usex debug "${CXXFLAGS}" "${CXXFLAGS} -DNDEBUG")"
"-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex X OFF ON)"
+ "-DNO_WAYLAND=$(usex wayland FALSE TRUE)"
)
cmake_src_configure
}
diff --git a/app-misc/clipboard/clipboard-0.8.0.ebuild b/app-misc/clipboard/clipboard-0.8.2.ebuild
similarity index 62%
copy from app-misc/clipboard/clipboard-0.8.0.ebuild
copy to app-misc/clipboard/clipboard-0.8.2.ebuild
index 57d5d1c0aa..312960b30a 100644
--- a/app-misc/clipboard/clipboard-0.8.0.ebuild
+++ b/app-misc/clipboard/clipboard-0.8.2.ebuild
@@ -14,36 +14,27 @@ SRC_URI="https://github.com/Slackadays/${MY_PN}/archive/refs/tags/${PV}.tar.gz -
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="X wayland lto debug"
+IUSE="X wayland debug"
-RDEPEND="X? ( x11-libs/libX11 )
+RDEPEND="X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
wayland? (
dev-libs/wayland-protocols
dev-libs/wayland
)
+ media-libs/alsa-lib
"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}/disable-git-and-lto.patch"
-)
-
-src_prepare() {
- if ! use wayland; then
- sed -i '/pkg_check_modules(WAYLAND_CLIENT wayland-client wayland-protocols)/d' CMakeLists.txt || die
- fi
-
- if ! use debug; then
- eapply "${FILESDIR}/disable-debug-info.patch"
- fi
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
"-DCMAKE_INSTALL_LIBDIR=$(get_libdir)"
- "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=$(usex lto TRUE FALSE)"
"-DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex X OFF ON)"
+ "-DCMAKE_C_FLAGS=$(usex debug "${CFLAGS}" "${CFLAGS} -DNDEBUG")"
+ "-DCMAKE_CXX_FLAGS=$(usex debug "${CXXFLAGS}" "${CXXFLAGS} -DNDEBUG")"
+ "-DNO_WAYLAND=$(usex wayland FALSE TRUE)"
)
cmake_src_configure
}
diff --git a/app-misc/clipboard/files/disable-debug-info.patch b/app-misc/clipboard/files/disable-debug-info.patch
deleted file mode 100644
index c69cfb30b2..0000000000
--- a/app-misc/clipboard/files/disable-debug-info.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#Created by Quincy Fleming.
-#Disables debug info without using flag NDEBUG as unless forced it will be ignored in favor of the user's specified compiler flags
---- a/src/gui/include/all/clipboard/logging.hpp
-+++ b/src/gui/include/all/clipboard/logging.hpp
-@@ -17,7 +17,6 @@
- #include <iostream>
- #include <streambuf>
-
--#if defined(NDEBUG)
- class NullBuffer : public std::streambuf {
- public:
- int overflow(int c) override { return c; }
-@@ -26,6 +25,3 @@
- static NullBuffer nullBuffer;
- static std::ostream nullStream(&nullBuffer);
- static std::ostream& debugStream = nullStream;
--#else
--static std::ostream& debugStream = std::cerr;
--#endif
diff --git a/app-misc/clipboard/files/disable-git-and-lto.patch b/app-misc/clipboard/files/disable-git-and-lto.patch
deleted file mode 100644
index 42e5c81e11..0000000000
--- a/app-misc/clipboard/files/disable-git-and-lto.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-#Created by Quincy Fleming
-#Disables git program as it will just result in fatal error during build (won't stop the build though. just annoying)
-#Also, this removes enabling of LTO by default and allows the user to choose wether or not they want LTO support via USE flag
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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)
---- a/src/cb/CMakeLists.txt
-+++ b/src/cb/CMakeLists.txt
-@@ -5,8 +5,6 @@
- src/themes.cpp
- )
-
--enable_lto(cb)
--
- target_link_libraries(cb gui)
-
- if(WIN32)
---- a/src/cbwayland/CMakeLists.txt
-+++ b/src/cbwayland/CMakeLists.txt
-@@ -60,8 +60,6 @@
- )
- add_dependencies(cbwayland cbwayland_generatedheaders)
-
--enable_lto(cbwayland)
--
- target_link_libraries(cbwayland
- ${WAYLAND_CLIENT_LIBRARIES}
- gui
---- a/src/cbx11/CMakeLists.txt
-+++ b/src/cbx11/CMakeLists.txt
-@@ -7,8 +7,6 @@
- gui
- )
-
--enable_lto(cbx11)
--
- target_include_directories(cbx11 PRIVATE ${X11_INCLUDE_DIR})
-
- install(TARGETS cbx11 LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/app-misc/clipboard/metadata.xml b/app-misc/clipboard/metadata.xml
index 8fd8220471..f760dd38cf 100644
--- a/app-misc/clipboard/metadata.xml
+++ b/app-misc/clipboard/metadata.xml
@@ -5,9 +5,6 @@
<email>quincyf467@protonmail.com</email>
<name>Quincy Fleming</name>
</maintainer>
- <use>
- <flag name="lto">Enable Link Time Optimization (LTO)</flag>
- </use>
<upstream>
<remote-id type="github">Slackadays/Clipboard</remote-id>
<doc lang="en">https://github.com/Slackadays/Clipboard/blob/main/README.md</doc>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-03 9:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-06 6:59 [gentoo-commits] repo/proj/guru:master commit in: app-misc/Clipboard/files/, app-misc/Clipboard/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2023-10-03 9:34 [gentoo-commits] repo/proj/guru:master commit in: app-misc/clipboard/files/, app-misc/clipboard/ David Roman
2023-04-26 9:44 [gentoo-commits] repo/proj/guru:master commit in: app-misc/Clipboard/files/, app-misc/Clipboard/ Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox