diff --git a/srcpkgs/hyprpicker/patches/build-no-git.patch b/srcpkgs/hyprpicker/patches/build-no-git.patch index b7007d8fd59..8f6932ae6d8 100644 --- a/srcpkgs/hyprpicker/patches/build-no-git.patch +++ b/srcpkgs/hyprpicker/patches/build-no-git.patch @@ -1,53 +1,49 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -7,31 +7,6 @@ +@@ -14,32 +14,6 @@ add_compile_definitions(HYPRPICKER_VERSION="${VERSION}") message(STATUS "Configuring hyprpicker!") --# Get git info --# hash and branch +-# Get git info hash and branch -execute_process( -- COMMAND git rev-parse --abbrev-ref HEAD -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_BRANCH -- OUTPUT_STRIP_TRAILING_WHITESPACE) +- COMMAND git rev-parse --abbrev-ref HEAD +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_BRANCH +- OUTPUT_STRIP_TRAILING_WHITESPACE) - -execute_process( -- COMMAND git rev-parse HEAD -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_COMMIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) +- COMMAND git rev-parse HEAD +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_COMMIT_HASH +- OUTPUT_STRIP_TRAILING_WHITESPACE) - -execute_process( -- COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1" -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_COMMIT_MESSAGE -- OUTPUT_STRIP_TRAILING_WHITESPACE) +- COMMAND bash -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1" +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_COMMIT_MESSAGE +- OUTPUT_STRIP_TRAILING_WHITESPACE) - -execute_process( -- COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\"" -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -- OUTPUT_VARIABLE GIT_DIRTY -- OUTPUT_STRIP_TRAILING_WHITESPACE) - # - # +- COMMAND bash -c "git diff-index --quiet HEAD -- || echo \"dirty\"" +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE GIT_DIRTY +- 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 @@ - - add_executable(hyprpicker ${SRCFILES}) - --target_compile_definitions(hyprpicker PRIVATE "-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"") +-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_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_link_libraries(hyprpicker rt) 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) diff --git a/srcpkgs/hyprpicker/patches/fix-musl.patch b/srcpkgs/hyprpicker/patches/fix-musl.patch deleted file mode 100644 index f25bb702b18..00000000000 --- a/srcpkgs/hyprpicker/patches/fix-musl.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/includes.hpp -+++ b/src/includes.hpp -@@ -1,5 +1,7 @@ - #pragma once - -+#include -+ - #include - #include - #include diff --git a/srcpkgs/hyprpicker/patches/scanner-cross.patch b/srcpkgs/hyprpicker/patches/scanner-cross.patch new file mode 100644 index 00000000000..751c0cee45a --- /dev/null +++ b/srcpkgs/hyprpicker/patches/scanner-cross.patch @@ -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") + diff --git a/srcpkgs/hyprpicker/template b/srcpkgs/hyprpicker/template index e43df7940fd..b15a6de2cb9 100644 --- a/srcpkgs/hyprpicker/template +++ b/srcpkgs/hyprpicker/template @@ -1,24 +1,22 @@ # Template file for 'hyprpicker' pkgname=hyprpicker -version=0.2.0 +version=0.4.5 revision=1 build_style=cmake -hostmakedepends="pkg-config wayland-devel" -makedepends="wayland-devel wayland-protocols cairo-devel pango-devel libjpeg-turbo-devel wlroots-devel libglvnd-devel" +hostmakedepends="pkg-config hyprwayland-scanner" +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" maintainer="RAR27 " license="BSD-3-Clause" homepage="https://github.com/hyprwm/hyprpicker" changelog="https://github.com/hyprwm/hyprpicker/releases" distfiles="https://github.com/hyprwm/hyprpicker/archive/refs/tags/v${version}.tar.gz" -checksum=fa1b0c29682f5ede5a03d754770d152f38d869bc1faa300564680cef2de0758a +checksum=fe9611ec78524f9bbea0d39308da3d9c61cb20f6103179a269cad8013bb0c1f3 pre_build() { make protocols } -do_install() { - vbin build/hyprpicker - vman doc/hyprpicker.1 +post_install() { vlicense LICENSE }