diff options
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/fix_xtrkcad_build_failure.patch | 58 | ||||
-rw-r--r-- | debian/patches/0005-fix_link_lib_failed.patch | 41 | ||||
-rw-r--r-- | debian/patches/series | 1 |
4 files changed, 107 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 80354fa..cea4da0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xtrkcad (1:5.3.0GA-2) UNRELEASED; urgency=medium + + * fix link zip lib failed on all arch except amd64 (Closes: #1087474). + - Thanks to Yue Gui <yuemeng.gui@gmail.com>. + + -- Jörg Frings-Fürst <debian@jff.email> Thu, 14 Nov 2024 10:40:35 +0800 + xtrkcad (1:5.3.0GA-1) unstable; urgency=medium * New upstream release (Closes: #1057286, #1074722): diff --git a/debian/fix_xtrkcad_build_failure.patch b/debian/fix_xtrkcad_build_failure.patch new file mode 100644 index 0000000..fef5e6c --- /dev/null +++ b/debian/fix_xtrkcad_build_failure.patch @@ -0,0 +1,58 @@ +diff -Nru xtrkcad-5.3.0GA/debian/changelog xtrkcad-5.3.0GA/debian/changelog +--- xtrkcad-5.3.0GA/debian/changelog 2024-07-04 03:32:38.000000000 +0800 ++++ xtrkcad-5.3.0GA/debian/changelog 2024-11-14 10:40:35.000000000 +0800 +@@ -1,3 +1,9 @@ ++xtrkcad (1:5.3.0GA-1.1) UNRELEASED; urgency=medium ++ ++ * fix link zip lib failed on all arch except amd64. ++ ++ -- Gui-Yue <yuemeng.gui@gmail.com> Thu, 14 Nov 2024 10:40:35 +0800 ++ + xtrkcad (1:5.3.0GA-1) unstable; urgency=medium + + * New upstream release (Closes: #1057286, #1074722): +diff -Nru xtrkcad-5.3.0GA/debian/patches/fix_link_lib_failed.patch xtrkcad-5.3.0GA/debian/patches/fix_link_lib_failed.patch +--- xtrkcad-5.3.0GA/debian/patches/fix_link_lib_failed.patch 1970-01-01 08:00:00.000000000 +0800 ++++ xtrkcad-5.3.0GA/debian/patches/fix_link_lib_failed.patch 2024-11-14 10:40:35.000000000 +0800 +@@ -0,0 +1,34 @@ ++--- 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 -Nru xtrkcad-5.3.0GA/debian/patches/series xtrkcad-5.3.0GA/debian/patches/series +--- xtrkcad-5.3.0GA/debian/patches/series 2024-07-03 16:21:59.000000000 +0800 ++++ xtrkcad-5.3.0GA/debian/patches/series 2024-11-14 10:28:36.000000000 +0800 +@@ -1,2 +1,3 @@ + #0001-usr_gtk-3.patch + #0900-spelling-errors.patch ++fix_link_lib_failed.patch 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 <yuemeng.gui@gmail.com> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1087474 +Forwarded: not-needed +Last-Update: 2024-11-14 <YYYY-MM-DD, last update of the meta-information, optional> +--- +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 |