diff mbox series

[RFC2[meta-oe,1/2] flatpak: avoid to patch the pkgconfig file

Message ID 20230826004748.578231-1-f_l_k@t-online.de
State New
Headers show
Series [RFC2[meta-oe,1/2] flatpak: avoid to patch the pkgconfig file | expand

Commit Message

Markus Volk Aug. 26, 2023, 12:47 a.m. UTC 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../0001-flatpak-pc-add-pc_sysrootdir.patch   | 28 -------------------
 .../flatpak/flatpak_1.15.4.bb                 |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch
deleted file mode 100644
index c1f2cca5c..000000000
--- a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@ 
-From 3a1ab02d821cd4b0af44c0dad87e290ebaabef83 Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Wed, 14 Dec 2022 06:50:40 +0100
-Subject: [PATCH] flatpak.pc: add pc_sysrootdir
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
-Upstream-Status: Pending
-
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 4a0b865e..5f69b1d9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}'
- pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir'))
- 
- pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir'))
--pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/'
-+pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/'
- pkgconfig_variables += 'httpbackend=' + get_option('http_backend')
- 
- pkgconfig.generate(
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb
index f5a726a83..ed888ded0 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.4.bb
@@ -5,7 +5,6 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = " \
     gitsm://github.com/flatpak/flatpak;protocol=https;nobranch=1 \
-    file://0001-flatpak-pc-add-pc_sysrootdir.patch \
 "
 
 SRCREV = "e936e3100d406c50ba49f3ad6a0ecae455345ec0"