Drop patches applied upstream

diff --git a/debian/patches/meson.patch b/debian/patches/meson.patch
deleted file mode 100644 (file)
index 8fdab02..0000000
--- a/debian/patches/meson.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: fix meson.build to allow for some vars to be empty
- the CLI-configuration has no resources nor UI elements, but the qt5-meson
- module doesn't like this...
-Author: IOhannes m zmölnig
-Origin: Debian
-Bug: https://github.com/jacktrip/jacktrip/issues/1069
-Last-Update: 2023-06-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: jacktrip-1.9.0+ds/meson.build
-===================================================================
---- jacktrip-1.9.0+ds.orig/meson.build
-+++ jacktrip-1.9.0+ds/meson.build
-@@ -231,9 +231,15 @@ if host_machine.system() == 'darwin' and
-       deps += apple_av_dep
- endif
- 
--qres_files = qt.compile_resources(sources: qres)
-+qres_files = []
-+if qres.length() > 0
-+      qres_files = qt.compile_resources(sources: qres)
-+endif
- moc_files = qt.compile_moc(headers: moc_h, extra_args: defines)
--ui_files = qt.compile_ui(sources: ui_h)
-+ui_files = []
-+if ui_h.length() > 0
-+      ui_files = qt.compile_ui(sources: ui_h)
-+endif
- 
- jacktrip = executable('jacktrip', src, qres_files, ui_files, moc_files, include_directories: incdirs, dependencies: deps, c_args: c_defines, cpp_args: defines, install: true )
- 

diff --git a/debian/patches/series b/debian/patches/series
index 6f9abf18908125fd3900ba4f2f32a2258414085c..0d8f1eeb376a6eca67dd4b6f6f3d1fdbb709a602 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 gui-launcher.patch
-meson.patch