diff options
| author | Seth Flynn <[email protected]> | 2025-03-06 03:00:58 -0500 |
|---|---|---|
| committer | Seth Flynn <[email protected]> | 2025-03-06 03:18:59 -0500 |
| commit | 77f2cc5791904caf4077c526fbdaca4ad27e2374 (patch) | |
| tree | cb8707a8cf28cf59ef16fcab81e83828e75970b1 /pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch | |
| parent | 6fa4458f59160cdf9e82ad2138300b1041f510ad (diff) | |
apply build system patches
This is a more upstreamable approach, and doesn't require any kind of
weird substitution on our end. It also avoids downloading Kotlin in our
antDeps and fixes cross compilation!! (only tested on aarch64)
Signed-off-by: Seth Flynn <[email protected]>
Diffstat (limited to 'pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch')
| -rw-r--r-- | pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch b/pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch new file mode 100644 index 0000000..0f6eb87 --- /dev/null +++ b/pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch @@ -0,0 +1,50 @@ +From 3aa1fc52ef6a72c99f1224e4c8ba2aedeb515277 Mon Sep 17 00:00:00 2001 +From: Seth Flynn <[email protected]> +Date: Wed, 5 Mar 2025 17:10:20 -0500 +Subject: [PATCH 4/5] build: add dbus as dependency for nfd_portal + +--- + config/linux/build.xml | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/config/linux/build.xml b/config/linux/build.xml +index 4500d23c0..829ce2b1d 100644 +--- a/config/linux/build.xml ++++ b/config/linux/build.xml +@@ -307,9 +307,17 @@ + </build> + <build module="nfd" suffix="_portal" simple="true" linker="g++" if:true="${binding.nfd}"> + <beforeCompile> ++ <local name="dbus-cflags"/> ++ <local name="dbus-libflags"/> + <local name="glib-cflags"/> + <local name="glib-libflags"/> + <local name="stderr"/> ++ <exec outputproperty="dbus-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="dbus-cflags"> ++ <arg line="--cflags dbus-1"/> ++ </exec> ++ <exec outputproperty="dbus-libflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="dbus-libflags"> ++ <arg line="--libs dbus-1"/> ++ </exec> + <exec outputproperty="glib-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="glib-cflags"> + <arg line="--cflags glib-2.0"/> + </exec> +@@ -317,6 +325,7 @@ + <arg line="--libs glib-2.0"/> + </exec> + <compile lang="c++"> ++ <arg line="${dbus-cflags}"/> + <arg line="${glib-cflags}"/> + <arg value="-I${src.main.rel}/include"/> + <fileset dir="." includes="${src.main}/nfd_portal.cpp"/> +@@ -326,6 +335,7 @@ + <arg value="-I${src.main.rel}/include"/> + </source> + <link> ++ <arg line="${dbus-libflags}"/> + <arg line="${glib-libflags}"/> + </link> + </build> +-- +2.48.1 + |