debian/control: Remove not longer used libwebkitgtk-1.0-0; remove unused patches

4 files changed, 2 insertions, 93 deletions

diff --git a/debian/changelog b/debian/changelog
index a4d6136..4544c7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,18 +6,17 @@ xtrkcad (1:5.1.0-1) unstable; urgency=medium
       + debian/patches/0900-spelling-errors.patch
       + debian/patches/0700-info_file.patch
       + debian/patches/0705-help_path.patch
-    - Refresh patches
       + debian/patches/0100-gtk.patch
     - Refresh debian/copyright.
     - debian/xtrkcad.docs: Rename Readme.txt to Readme.md.
     - debian/xtrkcad.install: Remove Readme.txt.
+    - debian/control: Remove not longer used libwebkitgtk-1.0-0
+      (Closes: #790221).
   * debian/control:
     - Add Daniel E. Markle as maintainer again.
     - Add myself as uploader.
     - Use http for the homepage because https isn't available.
   * Declare compliance with Debian Policy 4.0.0. (No changes needed).
-  * New debian/patches/0001-webkit.patch (Closes: #790221):
-    - Change from outdated libwebkitgtk-1.0-0 to libwebkitgtk-3.0-0.
   * Migrate to debhelper 11:
     - Change debian/compat to 11.
     - Bump minimum debhelper version in debian/control to >= 11.
diff --git a/debian/patches/0001-webkit.patch b/debian/patches/0001-webkit.patch
deleted file mode 100644
index 73338c1..0000000
--- a/debian/patches/0001-webkit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index b37e835..0000000
--- a/debian/patches/0100-gtk.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
index 85c4b65..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-#1.diff
-#0100-gtk.patch
-#0001-webkit.patch