haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

lgogdownloader, bump version for tinyxml2 (#11570)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-01-03 12:31:16 +01:00
committed by GitHub
parent e43da62ff3
commit 996b926de2
2 changed files with 1 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
games-util/lgogdownloader/lgogdownloader-3.15.recipe → games-util/lgogdownloader/lgogdownloader-3.16.recipe
View File

@@ -6,8 +6,7 @@ COPYRIGHT="2004 Sam Hocevar"
LICENSE="WTFPL"
REVISION="1"
SOURCE_URI="https://github.com/Sude-/lgogdownloader/releases/download/v$portVersion/lgogdownloader-$portVersion.tar.gz"
CHECKSUM_SHA256="9946558bb30b72cd5ed712e7fc425eef4b2a1fd22b5475d1a998720800cd25f0"
PATCHES="lgogdownloader-$portVersion.patchset"
CHECKSUM_SHA256="24b005bf3caf00ebc8c603251f5689d66098f66dd37bdf399836289064cb0c9f"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"

98
games-util/lgogdownloader/patches/lgogdownloader-3.15.patchset
View File

@@ -1,98 +0,0 @@
From 32d09c3972fdc2ce2f061f64706167b0013292e0 Mon Sep 17 00:00:00 2001
From: "Mika T. Lindqvist" <postmaster@raasu.org>
Date: Tue, 8 Oct 2024 11:55:27 +0000
Subject: Fix linking with iconv.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0238ae0..bd84338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ find_package(Boost
iostreams
)
find_package(CURL 7.55.0 REQUIRED)
+find_package(Iconv REQUIRED)
find_package(Jsoncpp REQUIRED)
find_package(Tinyxml2 REQUIRED)
find_package(Rhash REQUIRED)
@@ -109,6 +110,7 @@ target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include
PRIVATE ${Boost_INCLUDE_DIRS}
PRIVATE ${CURL_INCLUDE_DIRS}
+ PRIVATE ${ICONV_INCLUDE_DIR}
PRIVATE ${OAuth_INCLUDE_DIRS}
PRIVATE ${Jsoncpp_INCLUDE_DIRS}
PRIVATE ${Tinyxml2_INCLUDE_DIRS}
@@ -120,6 +122,7 @@ target_include_directories(${PROJECT_NAME}
target_link_libraries(${PROJECT_NAME}
PRIVATE ${Boost_LIBRARIES}
PRIVATE ${CURL_LIBRARIES}
+ PRIVATE ${ICONV_LIBRARY}
PRIVATE ${OAuth_LIBRARIES}
PRIVATE ${Jsoncpp_LIBRARIES}
PRIVATE ${Tinyxml2_LIBRARIES}
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
new file mode 100644
index 0000000..2d53426
--- /dev/null
+++ b/cmake/FindIconv.cmake
@@ -0,0 +1,11 @@
+find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
+find_library(ICONV_LIBRARY NAMES iconv libiconv)
+find_package_handle_standard_args(Iconv DEFAULT_MSG
+ ICONV_INCLUDE_DIR)
+mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARY)
+
+add_library(iconv INTERFACE)
+target_include_directories(iconv SYSTEM BEFORE INTERFACE ICONV_INCLUDE_DIR)
+if(ICONV_LIBRARY)
+ target_link_libraries(iconv INTERFACE ICONV_LIBRARY)
+endif()
--
2.45.2
From 431c9c0968505b4f6b784de9532e8d719d0b17a1 Mon Sep 17 00:00:00 2001
From: "Mika T. Lindqvist" <postmaster@raasu.org>
Date: Wed, 23 Oct 2024 04:36:03 +0000
Subject: Fix finding Tidy.
diff --git a/cmake/FindTidy.cmake b/cmake/FindTidy.cmake
index 6cdbaad..04e5727 100644
--- a/cmake/FindTidy.cmake
+++ b/cmake/FindTidy.cmake
@@ -5,27 +5,8 @@
# Tidy_INCLUDE_DIRS - The tidy include directories
# Tidy_LIBRARIES - The libraries needed to use tidy
-find_package(PkgConfig)
-pkg_check_modules(PC_TIDY tidy REQUIRED)
-
-find_path(TIDY_INCLUDE_DIR tidy.h
- HINTS
- ${PC_TIDY_INCLUDEDIR}
- ${PC_TIDY_INCLUDE_DIRS}
- PATH_SUFFIXES
- tidy
- PATHS
- ${PC_TIDY_INCLUDE_DIRS}
- )
-
-find_library(TIDY_LIBRARY tidy
- HINTS
- ${PC_TIDY_LIBDIR}
- ${PC_TIDY_LIBRARY_DIRS}
- PATHS
- ${PC_TIDY_LIBRARY_DIRS}
- )
-
+find_path(TIDY_INCLUDE_DIR NAMES tidy.h)
+find_library(TIDY_LIBRARY NAMES tidy)
mark_as_advanced(TIDY_INCLUDE_DIR TIDY_LIBRARY)
if(TIDY_INCLUDE_DIR)
--
2.45.2