diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch b/nixpkgs/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch new file mode 100644 index 000000000000..46a2dae382d2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch @@ -0,0 +1,55 @@ +From a3461f69222ef23b2edd411c5fc8daefea556a2c Mon Sep 17 00:00:00 2001 +From: Jan Tojnar <jtojnar@gmail.com> +Date: Wed, 20 Oct 2021 20:55:29 +0200 +Subject: [PATCH] pkg-config: Declare header dependencies as public +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The headers include libsoup and libxml2 headers but those libraries are only +listed in Requires.private. This does not matter for upstream pkg-config +because it uses Cflags from libraries in Requires.private as well but as our +pkg-config is patched to only use Requires.private for static linking. + +Let’s add libsoup-2.4 and libxml-2.0 to Requires rather than Requires.private +to make the reverse dependencies correctly find their headers. +--- + libgupnp/meson.build | 2 +- + meson.build | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/libgupnp/meson.build b/libgupnp/meson.build +index cb8a102..5fda9d8 100644 +--- a/libgupnp/meson.build ++++ b/libgupnp/meson.build +@@ -129,7 +129,7 @@ pkg.generate( + libgupnp, + subdirs: 'gupnp-1.2', + name : 'gupnp-1.2', +- requires : ['glib-2.0', 'gio-2.0', 'gssdp-1.2'], ++ requires : ['glib-2.0', 'gio-2.0', 'gssdp-1.2', 'libsoup-2.4 >= ' + libsoup_version, 'libxml-2.0'], + description : 'GObject-based UPnP library', + version : meson.project_version(), + filebase : 'gupnp-1.2' +diff --git a/meson.build b/meson.build +index 3790bcf..c96a983 100644 +--- a/meson.build ++++ b/meson.build +@@ -25,12 +25,13 @@ gssdp_dep = dependency('gssdp-1.2', version : '>= 1.3.0', default_options: ['sni + + gio_unix = dependency('gio-unix-2.0', version: '>= 2.44', required: host_machine.system() != 'windows') + ++libsoup_version = '2.48.0' + dependencies = [ + dependency('glib-2.0', version : '>= ' + glib_version), + dependency('gio-2.0', version : '>= ' + glib_version), + dependency('gmodule-2.0', version : '>= ' + glib_version), + dependency('gobject-2.0', version : '>= ' + glib_version), +- dependency('libsoup-2.4', version : '>= 2.48.0'), ++ dependency('libsoup-2.4', version : '>= ' + libsoup_version), + gssdp_dep, + dependency('libxml-2.0'), + ] +-- +2.33.0 + |