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/changelog | 18 +++++-- debian/fix_xtrkcad_build_failure.patch | 58 ---------------------- .../0901-implicit-function-declaration.patch | 10 ++++ debian/patches/series | 1 + 4 files changed, 25 insertions(+), 62 deletions(-) delete mode 100644 debian/fix_xtrkcad_build_failure.patch create mode 100644 debian/patches/0901-implicit-function-declaration.patch diff --git a/debian/changelog b/debian/changelog index cea4da0..f927e75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ -xtrkcad (1:5.3.0GA-2) UNRELEASED; urgency=medium +xtrkcad (1:5.3.0GA-1.1) unstable; urgency=medium - * fix link zip lib failed on all arch except amd64 (Closes: #1087474). - - Thanks to Yue Gui . + * 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) - -- Jörg Frings-Fürst Thu, 14 Nov 2024 10:40:35 +0800 + -- Tobias Frost Thu, 14 Nov 2024 20:36:25 +0100 xtrkcad (1:5.3.0GA-1) unstable; urgency=medium @@ -29,6 +31,14 @@ xtrkcad (1:5.3.0GA-1) unstable; urgency=medium -- Jörg Frings-Fürst 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 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/fix_xtrkcad_build_failure.patch b/debian/fix_xtrkcad_build_failure.patch deleted file mode 100644 index fef5e6c..0000000 --- a/debian/fix_xtrkcad_build_failure.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 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/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