Merge branch 'release/debian/1_5.3.0GA-1.1'HEADdebian/1_5.3.0GA-1.1master

4 files changed, 70 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 80354fa..f927e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xtrkcad (1:5.3.0GA-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Reintroduce changes from 1:5.2.0Beta2.1-2 accidentally dropped by the
+    last upload. (Closes: #1087529, #1066691)
+  * Delete precompiled libzip.a via d/clean (Closes: #1087474)
+
+ -- Tobias Frost <tobi@debian.org>  Thu, 14 Nov 2024 20:36:25 +0100
+
 xtrkcad (1:5.3.0GA-1) unstable; urgency=medium
 
   * New upstream release (Closes: #1057286, #1074722):
@@ -22,6 +31,14 @@ xtrkcad (1:5.3.0GA-1) unstable; urgency=medium
 
  -- Jörg Frings-Fürst <debian@jff.email>  Wed, 03 Jul 2024 21:32:38 +0200
 
+xtrkcad (1:5.2.0Beta2.1-2) unstable; urgency=medium
+
+  * debian/patches:
+    + Add 0901-implicit-function-declaration.patch. Fix FTBFS after dpkg enabled
+      -Werror=implicit-function-declaration by default. (Closes: #1066691).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Wed, 03 Apr 2024 10:41:33 +0200
+
 xtrkcad (1:5.2.0Beta2.1-1) unstable; urgency=medium
 
   * New upstream release.
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/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 0f9e10d..2017ae8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 #0001-usr_gtk-3.patch
+0901-implicit-function-declaration.patch
 #0900-spelling-errors.patch
+0005-fix_link_lib_failed.patch