From 39ba701ccdcff41dfc144e598a460ac6dec1700d Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Tue, 21 Jun 2022 16:16:52 +0200 Subject: [PATCH] Refresh patches --- debian/patches/debian_buildcmake.patch | 4 ++-- debian/patches/debian_cmake.patch | 8 ++++---- debian/patches/debian_fixed-defines.patch | 2 +- debian/patches/debian_link_systemlibs.patch | 4 ++-- debian/patches/debian_system_modules.patch | 2 +- debian/patches/debian_unittests_globalpaths.patch | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/patches/debian_buildcmake.patch b/debian/patches/debian_buildcmake.patch index f6e33ab5..54dbe030 100644 --- a/debian/patches/debian_buildcmake.patch +++ b/debian/patches/debian_buildcmake.patch @@ -15,7 +15,7 @@ Last-Update: 2021-01-13 --- juce.orig/extras/Build/CMake/JUCEUtils.cmake +++ juce/extras/Build/CMake/JUCEUtils.cmake -@@ -83,6 +83,7 @@ +@@ -87,6 +87,7 @@ if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) _juce_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl) _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0) @@ -23,7 +23,7 @@ Last-Update: 2021-01-13 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") find_program(JUCE_XCRUN xcrun) -@@ -225,6 +226,8 @@ +@@ -235,6 +236,8 @@ if(needs_browser) target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_BROWSER_LINUX_DEPS) endif() diff --git a/debian/patches/debian_cmake.patch b/debian/patches/debian_cmake.patch index 8b1cad1f..b73b2708 100644 --- a/debian/patches/debian_cmake.patch +++ b/debian/patches/debian_cmake.patch @@ -7,16 +7,16 @@ Last-Update: 2021-12-14 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- juce.orig/extras/Build/CMake/JUCEConfig.cmake.in +++ juce/extras/Build/CMake/JUCEConfig.cmake.in -@@ -20,6 +20,8 @@ +@@ -22,6 +22,8 @@ - @PACKAGE_INIT@ + include("${CMAKE_CURRENT_LIST_DIR}/LV2_HELPER.cmake") +set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") + if(NOT TARGET juce::juceaide) add_executable(juce::juceaide IMPORTED) set_target_properties(juce::juceaide PROPERTIES -@@ -28,11 +30,11 @@ +@@ -30,11 +32,11 @@ check_required_components("@PROJECT_NAME@") @@ -31,7 +31,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ set(_juce_modules juce_analytics -@@ -84,7 +86,7 @@ +@@ -86,7 +88,7 @@ unset(_targets_expected) foreach(_juce_module IN LISTS _juce_modules) diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index d719ab77..edcf5843 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -44,7 +44,7 @@ Forwarded: not-needed // The following checks should cause a compile error if you've forgotten to // define all your plugin settings properly.. -@@ -39,6 +63,7 @@ +@@ -38,6 +62,7 @@ #endif #define JUCE_CHECKSETTINGMACROS_H diff --git a/debian/patches/debian_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch index 7e7d8fe2..6eafd1d3 100644 --- a/debian/patches/debian_link_systemlibs.patch +++ b/debian/patches/debian_link_systemlibs.patch @@ -16,7 +16,7 @@ Last-Update: 2019-08-21 --- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -652,6 +652,9 @@ +@@ -692,6 +692,9 @@ StringArray result (linuxLibs); auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); @@ -28,7 +28,7 @@ Last-Update: 2019-08-21 for (auto& lib : libraries) --- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp -@@ -520,6 +520,39 @@ +@@ -558,6 +558,39 @@ if (isCurlEnabled (project) && ! isLoadCurlSymbolsLazilyEnabled (project)) packages.add ("libcurl"); diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index a54815bc..8261983f 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -11,7 +11,7 @@ Forwarded: not-needed --- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -@@ -362,7 +362,7 @@ +@@ -352,7 +352,7 @@ } else if (key == Ids::defaultJuceModulePath) { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index df636d2f..d898e653 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -51,5 +51,5 @@ Forwarded: not-needed + + - + -- 2.30.2