From e74d8bf20af210c57e42c785a8338a74e552ef76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 13 Jan 2021 11:36:10 +0100 Subject: [PATCH] Patch to allow building of build-helpers --- debian/patches/debian_buildcmake.patch | 28 ++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 29 insertions(+) create mode 100644 debian/patches/debian_buildcmake.patch diff --git a/debian/patches/debian_buildcmake.patch b/debian/patches/debian_buildcmake.patch new file mode 100644 index 00000000..31de9f04 --- /dev/null +++ b/debian/patches/debian_buildcmake.patch @@ -0,0 +1,28 @@ +Description: link applications against libpng/libjpeg + since we have stripped libpng & libjpeg, we need to explicitely link against + the system provided libraries +Author: IOhannes m zmölnig +Origin: Debian +Forwarded: not-needed +Last-Update: 2021-01-13 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- juce.orig/extras/Build/CMake/JUCEUtils.cmake ++++ juce/extras/Build/CMake/JUCEUtils.cmake +@@ -140,6 +140,7 @@ + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + _juce_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl) + _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0) ++ _juce_create_pkgconfig_target(JUCE_IMG_LINUX_DEPS libpng libjpeg) + + # If you really need to override the detected arch for some reason, + # you can configure the build with -DJUCE_LINUX_TARGET_ARCHITECTURE= +@@ -682,6 +683,8 @@ + if(needs_browser) + target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_BROWSER_LINUX_DEPS) + endif() ++ ++ target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_IMG_LINUX_DEPS) + elseif(APPLE) + get_target_property(needs_storekit ${target} JUCE_NEEDS_STORE_KIT) + diff --git a/debian/patches/series b/debian/patches/series index b59fac7b..c1d3c359 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,5 @@ debian_unittests_globalpaths.patch debian_vst.patch debian_link_systemlibs.patch cross.patch +debian_buildcmake.patch overridable_pkg-config.patch -- 2.30.2