diff options
author | tytan652 | 2023-09-01 12:29:22 +0200 |
---|---|---|
committer | tytan652 | 2023-09-01 12:29:22 +0200 |
commit | c23cfa0521041f3373e70508cc8f48d4a2201491 (patch) | |
tree | 53d95077a26874de580fac9067fec03ee0e08efc /0001-Add_finder_for_uthash.patch | |
parent | 7dbb355d4cace5305b87b4dccf55c20c755dd131 (diff) | |
download | aur-c23cfa0521041f3373e70508cc8f48d4a2201491.tar.gz |
build: Backport changes
- Fix blank browser dock titles with Qt 6.5
- Use system-wide uthash RC package backport
Diffstat (limited to '0001-Add_finder_for_uthash.patch')
-rw-r--r-- | 0001-Add_finder_for_uthash.patch | 192 |
1 files changed, 192 insertions, 0 deletions
diff --git a/0001-Add_finder_for_uthash.patch b/0001-Add_finder_for_uthash.patch new file mode 100644 index 000000000000..c27fe27a92b9 --- /dev/null +++ b/0001-Add_finder_for_uthash.patch @@ -0,0 +1,192 @@ +From ba026f32aa87c6deefdfabf1bcc48b205622c708 Mon Sep 17 00:00:00 2001 +From: tytan652 <tytan652@tytanium.xyz> +Date: Mon, 24 Jul 2023 10:50:14 +0200 +Subject: [PATCH] cmake: Add finder for uthash + +--- + cmake/Modules/FindUthash.cmake | 84 ++++++++++++++++++++++++++++++++++ + cmake/finders/FindUthash.cmake | 84 ++++++++++++++++++++++++++++++++++ + 2 files changed, 168 insertions(+) + create mode 100644 cmake/Modules/FindUthash.cmake + create mode 100644 cmake/finders/FindUthash.cmake + +diff --git a/cmake/Modules/FindUthash.cmake b/cmake/Modules/FindUthash.cmake +new file mode 100644 +index 0000000000000..fde6bd5d12321 +--- /dev/null ++++ b/cmake/Modules/FindUthash.cmake +@@ -0,0 +1,84 @@ ++#[=======================================================================[.rst ++FindUthash ++---------- ++ ++FindModule for uthash and the associated library ++ ++Imported Targets ++^^^^^^^^^^^^^^^^ ++ ++.. versionadded:: 3.0 ++ ++This module defines the :prop_tgt:`IMPORTED` target ``Uthash::Uthash``. ++ ++Result Variables ++^^^^^^^^^^^^^^^^ ++ ++This module sets the following variables: ++ ++``Uthash_FOUND`` ++ True, if the library was found. ++``Uthash_VERSION`` ++ Detected version of found uthash library. ++ ++Cache variables ++^^^^^^^^^^^^^^^ ++ ++The following cache variables may also be set: ++ ++``Uthash_INCLUDE_DIR`` ++ Directory containing ``uthash.h``. ++ ++#]=======================================================================] ++ ++# cmake-format: off ++# cmake-lint: disable=C0103 ++# cmake-lint: disable=C0301 ++# cmake-format: on ++ ++include(FindPackageHandleStandardArgs) ++ ++find_path( ++ Uthash_INCLUDE_DIR ++ NAMES uthash.h ++ PATHS /usr/include /usr/local/include ++ DOC "uthash include directory") ++ ++if(EXISTS "${Uthash_INCLUDE_DIR}/uthash.h") ++ file(STRINGS "${Uthash_INCLUDE_DIR}/uthash.h" _version_string ++ REGEX "#define[ \t]+UTHASH_VERSION[ \t]+[0-9]+\\.[0-9]+\\.[0-9]+") ++ ++ string(REGEX REPLACE "#define[ \t]+UTHASH_VERSION[ \t]+([0-9]+\\.[0-9]+\\.[0-9]+)" "\\1" Uthash_VERSION ++ "${_version_string}") ++else() ++ if(NOT Uthash_FIND_QUIETLY) ++ message(AUTHOR_WARNING "Failed to find uthash version.") ++ endif() ++ set(Uthash_VERSION 0.0.0) ++endif() ++ ++if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows") ++ set(Uthash_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.") ++elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD") ++ set(Uthash_ERROR_REASON "Ensure uthash library is available in local include paths.") ++endif() ++ ++find_package_handle_standard_args( ++ Uthash ++ REQUIRED_VARS Uthash_INCLUDE_DIR ++ VERSION_VAR Uthash_VERSION REASON_FAILURE_MESSAGE "${Uthash_ERROR_REASON}") ++mark_as_advanced(Uthash_INCLUDE_DIR) ++unset(Uthash_ERROR_REASON) ++ ++if(Uthash_FOUND) ++ if(NOT TARGET Uthash::Uthash) ++ add_library(Uthash::Uthash INTERFACE IMPORTED) ++ set_target_properties(Uthash::Uthash PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Uthash_INCLUDE_DIR}") ++ endif() ++endif() ++ ++include(FeatureSummary) ++set_package_properties( ++ Uthash PROPERTIES ++ URL "https://troydhanson.github.io/uthash" ++ DESCRIPTION "A hash table for C structures") +diff --git a/cmake/finders/FindUthash.cmake b/cmake/finders/FindUthash.cmake +new file mode 100644 +index 0000000000000..fde6bd5d12321 +--- /dev/null ++++ b/cmake/finders/FindUthash.cmake +@@ -0,0 +1,84 @@ ++#[=======================================================================[.rst ++FindUthash ++---------- ++ ++FindModule for uthash and the associated library ++ ++Imported Targets ++^^^^^^^^^^^^^^^^ ++ ++.. versionadded:: 3.0 ++ ++This module defines the :prop_tgt:`IMPORTED` target ``Uthash::Uthash``. ++ ++Result Variables ++^^^^^^^^^^^^^^^^ ++ ++This module sets the following variables: ++ ++``Uthash_FOUND`` ++ True, if the library was found. ++``Uthash_VERSION`` ++ Detected version of found uthash library. ++ ++Cache variables ++^^^^^^^^^^^^^^^ ++ ++The following cache variables may also be set: ++ ++``Uthash_INCLUDE_DIR`` ++ Directory containing ``uthash.h``. ++ ++#]=======================================================================] ++ ++# cmake-format: off ++# cmake-lint: disable=C0103 ++# cmake-lint: disable=C0301 ++# cmake-format: on ++ ++include(FindPackageHandleStandardArgs) ++ ++find_path( ++ Uthash_INCLUDE_DIR ++ NAMES uthash.h ++ PATHS /usr/include /usr/local/include ++ DOC "uthash include directory") ++ ++if(EXISTS "${Uthash_INCLUDE_DIR}/uthash.h") ++ file(STRINGS "${Uthash_INCLUDE_DIR}/uthash.h" _version_string ++ REGEX "#define[ \t]+UTHASH_VERSION[ \t]+[0-9]+\\.[0-9]+\\.[0-9]+") ++ ++ string(REGEX REPLACE "#define[ \t]+UTHASH_VERSION[ \t]+([0-9]+\\.[0-9]+\\.[0-9]+)" "\\1" Uthash_VERSION ++ "${_version_string}") ++else() ++ if(NOT Uthash_FIND_QUIETLY) ++ message(AUTHOR_WARNING "Failed to find uthash version.") ++ endif() ++ set(Uthash_VERSION 0.0.0) ++endif() ++ ++if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows") ++ set(Uthash_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.") ++elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD") ++ set(Uthash_ERROR_REASON "Ensure uthash library is available in local include paths.") ++endif() ++ ++find_package_handle_standard_args( ++ Uthash ++ REQUIRED_VARS Uthash_INCLUDE_DIR ++ VERSION_VAR Uthash_VERSION REASON_FAILURE_MESSAGE "${Uthash_ERROR_REASON}") ++mark_as_advanced(Uthash_INCLUDE_DIR) ++unset(Uthash_ERROR_REASON) ++ ++if(Uthash_FOUND) ++ if(NOT TARGET Uthash::Uthash) ++ add_library(Uthash::Uthash INTERFACE IMPORTED) ++ set_target_properties(Uthash::Uthash PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Uthash_INCLUDE_DIR}") ++ endif() ++endif() ++ ++include(FeatureSummary) ++set_package_properties( ++ Uthash PROPERTIES ++ URL "https://troydhanson.github.io/uthash" ++ DESCRIPTION "A hash table for C structures") |