summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0100-gtk.patch68
-rw-r--r--debian/patches/0700-info_file.patch24
-rw-r--r--debian/patches/0705-help_path.patch25
-rw-r--r--debian/patches/0900-spelling-errors.patch58
-rw-r--r--debian/patches/series4
5 files changed, 179 insertions, 0 deletions
diff --git a/debian/patches/0100-gtk.patch b/debian/patches/0100-gtk.patch
new file mode 100644
index 0000000..d2e990f
--- /dev/null
+++ b/debian/patches/0100-gtk.patch
@@ -0,0 +1,68 @@
+Description: prevend gcc format-security errors
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/163/
+Last-Update: 2016-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/app/wlib/gtklib/gtktext.c
+===================================================================
+--- trunk.orig/app/wlib/gtklib/gtktext.c
++++ trunk/app/wlib/gtklib/gtktext.c
+@@ -448,7 +448,7 @@ EXPORT wBool_t wTextPrint(
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+- error->message);
++ "%s", error->message);
+
+ g_error_free (error);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+Index: trunk/app/wlib/gtklib/print.c
+===================================================================
+--- trunk.orig/app/wlib/gtklib/print.c
++++ trunk/app/wlib/gtklib/print.c
+@@ -120,7 +120,7 @@ WlibApplySettings( GtkPrintOperation *op
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+- err->message);
++ "%s", err->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ } else {
+@@ -142,7 +142,7 @@ WlibApplySettings( GtkPrintOperation *op
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+- err->message);
++ "%s", err->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ } else {
+@@ -184,7 +184,7 @@ WlibSaveSettings( GtkPrintOperation *op
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+- err->message);
++ "%s", err->message);
+
+ g_error_free (err);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+@@ -202,7 +202,7 @@ WlibSaveSettings( GtkPrintOperation *op
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+- err->message);
++ "%s", err->message);
+
+ g_error_free (err);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+@@ -824,7 +824,7 @@ doPrintJobFinished( GtkPrintJob *job, vo
+ dialog = gtk_message_dialog_new (GTK_WINDOW (gtkMainW->gtkwin),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+- err->message);
++ "%s", err->message);
+ }
+ }
+
diff --git a/debian/patches/0700-info_file.patch b/debian/patches/0700-info_file.patch
new file mode 100644
index 0000000..4ccff25
--- /dev/null
+++ b/debian/patches/0700-info_file.patch
@@ -0,0 +1,24 @@
+Description: add requested directory entry and INFO-DIR-SECTION
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: https://sourceforge.net/p/xtrkcad-fork/bugs/164/
+Last-Update: 2016-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/app/help/xtrkcad.info
+===================================================================
+--- trunk.orig/app/help/xtrkcad.info
++++ trunk/app/help/xtrkcad.info
+@@ -1,3 +1,8 @@
++INFO-DIR-SECTION CAD
++START-INFO-DIR-ENTRY
++* xtrkcad: xtrkcad-4.2.4. Model Train Track CAD Program
++END-INFO-DIR-ENTRY
++
+ :Help
+ Invokes on-line help for this dialog
+ :cancel
+@@ -1099,3 +1104,4 @@ Layer
+ :cmdLayerShow19
+ Layer
+ :
++
diff --git a/debian/patches/0705-help_path.patch b/debian/patches/0705-help_path.patch
new file mode 100644
index 0000000..ac5e463
--- /dev/null
+++ b/debian/patches/0705-help_path.patch
@@ -0,0 +1,25 @@
+Description: Change help html directory to the installation specific
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: not-needed
+Last-Update: 2017-01-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/app/wlib/gtklib/gtkhelp.c
+===================================================================
+--- trunk.orig/app/wlib/gtklib/gtkhelp.c
++++ trunk/app/wlib/gtklib/gtkhelp.c
+@@ -677,8 +677,12 @@ EXPORT void wHelp( const char * topic )
+ directory = malloc( BUFSIZ );
+ assert( directory != NULL );
+
+- sprintf( directory, "%s/html/", wGetAppLibDir());
+-
++/* sprintf( directory, "%s/html/", wGetAppLibDir());*/
++/*
++ * Change path for debian installation
++ *
++ */
++ sprintf( directory, "%s/html/", "/usr/share/doc/xtrkcad-common");
+ wHelpWindow = CreateHelpWindow();
+ /* load the default content */
+ load_into_view ("index.html", MAIN_VIEW);
diff --git a/debian/patches/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch
new file mode 100644
index 0000000..7570f18
--- /dev/null
+++ b/debian/patches/0900-spelling-errors.patch
@@ -0,0 +1,58 @@
+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: 2016-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/app/help/genhelp.in
+===================================================================
+--- trunk.orig/app/help/genhelp.in
++++ trunk/app/help/genhelp.in
+@@ -346,7 +346,7 @@ draw-benchorient Orientation of Benchwor
+ draw-arrowsize Size of Dimension Arrows cmdDraw
+ #
+ easement-val This controls the sharpness of the easement curve cmdEasement
+-easement-r Minumum radius cmdEasement
++easement-r Minimum radius cmdEasement
+ easement-x Maximum offset cmdEasement
+ easement-l Easement length cmdEasement
+ easement-radio These radio buttons are a short-cut for Values of 0.0, 0.5, 1.0 and 2.0. None turns Easements off cmdEasement
+Index: trunk/app/i18n/fi.po
+===================================================================
+--- trunk.orig/app/i18n/fi.po
++++ trunk/app/i18n/fi.po
+@@ -5702,7 +5702,7 @@ msgid "Mint"
+ msgstr "Loistava"
+
+ #: ../../../../build/xtrkcad/app/bin/bllnhlp.c:298
+-msgid "Minumum radius"
++msgid "Minimum radius"
+ msgstr "Pienin karresäde"
+
+ #: ../../../../build/xtrkcad/app/i18n/custmsg.h:41
+Index: trunk/app/i18n/pt_BR.po
+===================================================================
+--- trunk.orig/app/i18n/pt_BR.po
++++ trunk/app/i18n/pt_BR.po
+@@ -7210,7 +7210,7 @@ msgid "This controls the sharpness of th
+ msgstr ""
+
+ #: ../../../../xtrkcad-build/app/bin/bllnhlp.c:297
+-msgid "Minumum radius"
++msgid "Minimum radius"
+ msgstr ""
+
+ #: ../../../../xtrkcad-build/app/bin/bllnhlp.c:298
+Index: trunk/app/i18n/de_DE.po
+===================================================================
+--- trunk.orig/app/i18n/de_DE.po
++++ trunk/app/i18n/de_DE.po
+@@ -6814,7 +6814,7 @@ msgid "This controls the sharpness of th
+ msgstr "Steuert die Größe des Übergangsradius"
+
+ #: ../../../build/xtc_4-2-3dev/app/bin/bllnhlp.c:306
+-msgid "Minumum radius"
++msgid "Minimum radius"
+ msgstr "Mindestgleisradius"
+
+ #: ../../../build/xtc_4-2-3dev/app/bin/bllnhlp.c:307
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..aa10a1c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+0900-spelling-errors.patch
+0700-info_file.patch
+0100-gtk.patch
+0705-help_path.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 15:24:34 +0000