From 9b474012803e62ce48d5fa46be1bd158f50a68f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Sat, 17 Jun 2023 19:25:05 +0200 Subject: [PATCH] Drop patches applied upstream --- debian/patches/meson.patch | 31 ------------------------------- debian/patches/series | 1 - 2 files changed, 32 deletions(-) delete mode 100644 debian/patches/meson.patch diff --git a/debian/patches/meson.patch b/debian/patches/meson.patch deleted file mode 100644 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 6f9abf1..0d8f1ee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ gui-launcher.patch -meson.patch -- 2.30.2