diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-webkit.patch | 19 | ||||
| -rw-r--r-- | debian/patches/0100-gtk.patch | 68 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 90 insertions, 0 deletions
diff --git a/debian/patches/0001-webkit.patch b/debian/patches/0001-webkit.patch new file mode 100644 index 0000000..73338c1 --- /dev/null +++ b/debian/patches/0001-webkit.patch @@ -0,0 +1,19 @@ +Description: Change webkitgtk from 1 to 3.0.0 +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790221 +Last-Update: 2017-07-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/CMakeLists.txt +=================================================================== +--- trunk.orig/CMakeLists.txt ++++ trunk/CMakeLists.txt +@@ -65,7 +65,7 @@ ENDIF(WIN32 AND NOT XTRKCAD_USE_GTK) + IF(XTRKCAD_USE_GTK) + INCLUDE(FindPkgConfig) + PKG_CHECK_MODULES(GTK REQUIRED "gtk+-2.0") +- PKG_CHECK_MODULES(GTK_WEBKIT REQUIRED "webkit-1.0") ++ PKG_CHECK_MODULES(GTK_WEBKIT REQUIRED "webkitgtk-3.0") + ENDIF(XTRKCAD_USE_GTK) + + IF(XTRKCAD_USE_PACKAGEMAKER) diff --git a/debian/patches/0100-gtk.patch b/debian/patches/0100-gtk.patch new file mode 100644 index 0000000..b37e835 --- /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/print.c +=================================================================== +--- trunk.orig/app/wlib/gtklib/print.c ++++ trunk/app/wlib/gtklib/print.c +@@ -118,7 +118,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 { +@@ -144,7 +144,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 { +@@ -193,7 +193,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)); +@@ -216,7 +216,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)); +@@ -900,7 +900,7 @@ doPrintJobFinished(GtkPrintJob *job, voi + 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); + } + } + +Index: trunk/app/wlib/gtklib/text.c +=================================================================== +--- trunk.orig/app/wlib/gtklib/text.c ++++ trunk/app/wlib/gtklib/text.c +@@ -360,7 +360,7 @@ 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)); + gtk_widget_destroy(dialog); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..73eb1c8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +#1.diff +0100-gtk.patch +#0001-webkit.patch |