wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-01 18:32:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hyprpicker: update to 0.4.5.

Browse source
This commit is contained in:
ii8 2025-06-12 13:24:42 +01:00 • committed by Duncan Overbruck
parent 18c51dc471
commit e1b0e6b3eb
4 changed files with 47 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
srcpkgs/hyprpicker/patches/build-no-git.patch
View file

@ -1,53 +1,49 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -7,31 +7,6 @@ @@ -14,32 +14,6 @@ add_compile_definitions(HYPRPICKER_VERSION="${VERSION}")
message(STATUS "Configuring hyprpicker!") message(STATUS "Configuring hyprpicker!")
-# Get git info -# Get git info hash and branch
-# hash and branch
-execute_process( -execute_process(
- COMMAND git rev-parse --abbrev-ref HEAD - COMMAND git rev-parse --abbrev-ref HEAD
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_BRANCH - OUTPUT_VARIABLE GIT_BRANCH
- OUTPUT_STRIP_TRAILING_WHITESPACE) - OUTPUT_STRIP_TRAILING_WHITESPACE)
- -
-execute_process( -execute_process(
- COMMAND git rev-parse HEAD - COMMAND git rev-parse HEAD
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_COMMIT_HASH - OUTPUT_VARIABLE GIT_COMMIT_HASH
- OUTPUT_STRIP_TRAILING_WHITESPACE) - OUTPUT_STRIP_TRAILING_WHITESPACE)
- -
-execute_process( -execute_process(
- COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1" - COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1"
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_COMMIT_MESSAGE - OUTPUT_VARIABLE GIT_COMMIT_MESSAGE
- OUTPUT_STRIP_TRAILING_WHITESPACE) - OUTPUT_STRIP_TRAILING_WHITESPACE)
- -
-execute_process( -execute_process(
- COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\"" - COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\""
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_DIRTY - OUTPUT_VARIABLE GIT_DIRTY
- OUTPUT_STRIP_TRAILING_WHITESPACE) - OUTPUT_STRIP_TRAILING_WHITESPACE)
# -#
# -
include_directories(.)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
@@ -113,13 +87,6 @@ protocolnew("stable/xdg-shell" "xdg-shell" false)
protocolnew("staging/cursor-shape" "cursor-shape-v1" false)
protocolnew("stable/tablet" "tablet-v2" false)
@@ -47,11 +22,6 @@ -target_compile_definitions(hyprpicker
- PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
add_executable(hyprpicker ${SRCFILES})
-target_compile_definitions(hyprpicker PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
-target_compile_definitions(hyprpicker PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"") -target_compile_definitions(hyprpicker PRIVATE "-DGIT_BRANCH=\"${GIT_BRANCH}\"")
-target_compile_definitions(hyprpicker PRIVATE "-DGIT_COMMIT_MESSAGE=\"${GIT_COMMIT_MESSAGE}\"") -target_compile_definitions(
- hyprpicker PRIVATE "-DGIT_COMMIT_MESSAGE=\"${GIT_COMMIT_MESSAGE}\"")
-target_compile_definitions(hyprpicker PRIVATE "-DGIT_DIRTY=\"${GIT_DIRTY}\"") -target_compile_definitions(hyprpicker PRIVATE "-DGIT_DIRTY=\"${GIT_DIRTY}\"")
- -
target_link_libraries(hyprpicker rt) target_link_libraries(hyprpicker rt)
set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_NAME ${PROJECT_NAME})
@@ -75,4 +45,4 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg -no-pie -fno-builtin")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg -no-pie -fno-builtin")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg -no-pie -fno-builtin")
-ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
\ No newline at end of file
+ENDIF(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)

10
srcpkgs/hyprpicker/patches/fix-musl.patch
View file

@ -1,10 +0,0 @@
--- a/src/includes.hpp
+++ b/src/includes.hpp
@@ -1,5 +1,7 @@
#pragma once
+#include <sys/types.h>
+
#include <vector>
#include <deque>
#include <iostream>

12
srcpkgs/hyprpicker/patches/scanner-cross.patch Normal file
View file

@ -0,0 +1,12 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,7 @@ pkg_check_modules(
pango
pangocairo
libjpeg
- hyprutils>=0.2.0
- hyprwayland-scanner>=0.4.0)
+ hyprutils>=0.2.0)
file(GLOB_RECURSE SRCFILES "src/*.cpp")

12
srcpkgs/hyprpicker/template
View file

@ -1,24 +1,22 @@
# Template file for 'hyprpicker' # Template file for 'hyprpicker'
pkgname=hyprpicker pkgname=hyprpicker
version=0.2.0 version=0.4.5
revision=1 revision=1
build_style=cmake build_style=cmake
hostmakedepends="pkg-config wayland-devel" hostmakedepends="pkg-config hyprwayland-scanner"
makedepends="wayland-devel wayland-protocols cairo-devel pango-devel libjpeg-turbo-devel wlroots-devel libglvnd-devel" makedepends="wayland-devel wayland-protocols cairo-devel pango-devel libjpeg-turbo-devel wlroots-devel libglvnd-devel hyprutils"
short_desc="Wlroots-compatible Wayland color picker that does not suck" short_desc="Wlroots-compatible Wayland color picker that does not suck"
maintainer="RAR27 <rar27@tuta.io>" maintainer="RAR27 <rar27@tuta.io>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://github.com/hyprwm/hyprpicker" homepage="https://github.com/hyprwm/hyprpicker"
changelog="https://github.com/hyprwm/hyprpicker/releases" changelog="https://github.com/hyprwm/hyprpicker/releases"
distfiles="https://github.com/hyprwm/hyprpicker/archive/refs/tags/v${version}.tar.gz" distfiles="https://github.com/hyprwm/hyprpicker/archive/refs/tags/v${version}.tar.gz"
checksum=fa1b0c29682f5ede5a03d754770d152f38d869bc1faa300564680cef2de0758a checksum=fe9611ec78524f9bbea0d39308da3d9c61cb20f6103179a269cad8013bb0c1f3
pre_build() { pre_build() {
make protocols make protocols
} }
do_install() { post_install() {
vbin build/hyprpicker
vman doc/hyprpicker.1
vlicense LICENSE vlicense LICENSE
} }