summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0001-usr_gtk-3.patch13
-rw-r--r--debian/patches/0005-fix_link_lib_failed.patch41
-rw-r--r--debian/patches/0900-spelling-errors.patch32
-rw-r--r--debian/patches/0901-implicit-function-declaration.patch10
-rw-r--r--debian/patches/series4
5 files changed, 100 insertions, 0 deletions
diff --git a/debian/patches/0001-usr_gtk-3.patch b/debian/patches/0001-usr_gtk-3.patch
new file mode 100644
index 0000000..afe0689
--- /dev/null
+++ b/debian/patches/0001-usr_gtk-3.patch
@@ -0,0 +1,13 @@
+Index: trunk/CMakeLists.txt
+===================================================================
+--- trunk.orig/CMakeLists.txt
++++ trunk/CMakeLists.txt
+@@ -64,7 +64,7 @@ if(APPLE)
+ endif()
+
+ IF(UNIX)
+- PKG_CHECK_MODULES(GTK REQUIRED "gtk+-2.0")
++ PKG_CHECK_MODULES(GTK REQUIRED "gtk+-3.0")
+ ENDIF()
+
+ IF(APPLE)
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/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch
new file mode 100644
index 0000000..39ac3e9
--- /dev/null
+++ b/debian/patches/0900-spelling-errors.patch
@@ -0,0 +1,32 @@
+Description: Correct some typos
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/165/
+Last-Update: 2018-03-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/app/bin/csensor.c
+===================================================================
+--- trunk.orig/app/bin/csensor.c
++++ trunk/app/bin/csensor.c
+@@ -388,7 +388,7 @@ static paramData_t sensorEditPLs[] = {
+ #define I_SENSORNAME (0)
+ /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(sensorEditName)},
+ #define I_ORIGX (1)
+- /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") },
++ /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") },
+ #define I_ORIGY (2)
+ /*2*/ { PD_FLOAT, &sensorEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") },
+ #define I_SENSORSCRIPT (3)
+Index: trunk/app/bin/csignal.c
+===================================================================
+--- trunk.orig/app/bin/csignal.c
++++ trunk/app/bin/csignal.c
+@@ -508,7 +508,7 @@ static paramData_t signalEditPLs[] = {
+ #define I_SIGNALNAME (0)
+ /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, 0, sizeof(signalEditName)},
+ #define I_ORIGX (1)
+- /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") },
++ /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") },
+ #define I_ORIGY (2)
+ /*2*/ { PD_FLOAT, &signalEditOrig.y, "origy", PDO_DIM, &r_1000_1000, N_("Origin Y") },
+ #define I_ANGLE (3)
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
new file mode 100644
index 0000000..ae4b507
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+#0001-usr_gtk-3.patch
+#0901-implicit-function-declaration.patch
+#0900-spelling-errors.patch
+0005-fix_link_lib_failed.patch