From 401facbb430fa84882171f267e081f6da3463b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Nov 2024 20:20:43 +0100 Subject: New d/p/0005-fix_link_lib_failed.patch --- debian/patches/0005-fix_link_lib_failed.patch | 41 +++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 debian/patches/0005-fix_link_lib_failed.patch (limited to 'debian/patches') diff --git a/debian/patches/0005-fix_link_lib_failed.patch b/debian/patches/0005-fix_link_lib_failed.patch new file mode 100644 index 0000000..23deba2 --- /dev/null +++ b/debian/patches/0005-fix_link_lib_failed.patch @@ -0,0 +1,41 @@ +Description: fix_xtrkcad_build_failure +Author: Yue Gui +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087474 +Forwarded: not-needed +Last-Update: 2024-11-14 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/CMake/FindLibzip.cmake ++++ b/CMake/FindLibzip.cmake +@@ -37,17 +37,23 @@ + HINTS ${PC_LIBZIP_INCLUDE_DIRS}) + + if(UNIX AND NOT APPLE) ++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") + find_library(LIBZIP_LIBRARY + NAMES libzip.a zip + PATHS +- /usr/lib64 +- /usr/lib +- /usr/local/lib64 +- /usr/local/lib +- /sw/lib +- /opt/local/lib +- ${CMAKE_CURRENT_SOURCE_DIR}/app/tools/lib/linux +- ) ++ /usr/lib64 ++ /usr/lib ++ /usr/local/lib64 ++ /usr/local/lib ++ /sw/lib ++ /opt/local/lib ++ ${CMAKE_CURRENT_SOURCE_DIR}/app/tools/lib/linux ++ ) ++ else() ++ find_library(LIBZIP_LIBRARY ++ NAMES zip ++ ) ++ endif() + else() + find_library(LIBZIP_LIBRARY + NAMES zip) diff --git a/debian/patches/series b/debian/patches/series index 0f9e10d..086db6d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ #0001-usr_gtk-3.patch #0900-spelling-errors.patch +0005-fix_link_lib_failed.patch -- cgit v1.2.3 From a398e30eea8db3ec6a643b45a2774fa97b672931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 15 Nov 2024 18:05:03 +0100 Subject: merge NMU --- debian/patches/0901-implicit-function-declaration.patch | 10 ++++++++++ debian/patches/series | 1 + 2 files changed, 11 insertions(+) create mode 100644 debian/patches/0901-implicit-function-declaration.patch (limited to 'debian/patches') diff --git a/debian/patches/0901-implicit-function-declaration.patch b/debian/patches/0901-implicit-function-declaration.patch new file mode 100644 index 0000000..dbf878b --- /dev/null +++ b/debian/patches/0901-implicit-function-declaration.patch @@ -0,0 +1,10 @@ +--- a/app/bin/ctext.c ++++ b/app/bin/ctext.c +@@ -36,6 +36,7 @@ + void UpdateFontSizeList( long *, wList_p, wIndex_t ); + long GetFontSize(long); + long GetFontSizeIndex(long size); ++void wSetSelectedFontSize(wFontSize_t size); + + static wMenu_p textPopupM; + diff --git a/debian/patches/series b/debian/patches/series index 086db6d..2017ae8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ #0001-usr_gtk-3.patch +0901-implicit-function-declaration.patch #0900-spelling-errors.patch 0005-fix_link_lib_failed.patch -- cgit v1.2.3