diff --git a/wayland-protocols-sysroot-prefix-fix.patch b/wayland-protocols-sysroot-prefix-fix.patch new file mode 100644 index 0000000..4eff9f6 --- /dev/null +++ b/wayland-protocols-sysroot-prefix-fix.patch @@ -0,0 +1,25 @@ +From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001 +From: Tomek Bury +Date: Fri, 4 Aug 2017 16:16:38 +0100 +Subject: Use sysroot prefix for pkgdatadir variable + +The pc_sysroot is automatically added to cflags and libs but not +to 'pkg-config --variable' + +Reviewed-by: Daniel Stone + +diff --git a/wayland-protocols.pc.in b/wayland-protocols.pc.in +index a26744c..379be06 100644 +--- a/wayland-protocols.pc.in ++++ b/wayland-protocols.pc.in +@@ -1,6 +1,6 @@ + prefix=@prefix@ + datarootdir=@datarootdir@ +-pkgdatadir=@datadir@/@PACKAGE@ ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ + + Name: Wayland Protocols + Description: Wayland protocol files +-- +cgit v0.10.2 + diff --git a/wayland-protocols.changes b/wayland-protocols.changes index 3ca6c4d..ff1ec7a 100644 --- a/wayland-protocols.changes +++ b/wayland-protocols.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 9 18:34:47 UTC 2017 - zaitor@opensuse.org + +- Add wayland-protocols-sysroot-prefix-fix.patch: Use sysroot + prefix for pkgdatadir variable. The pc_sysroot is automatically + added to cflags and libs but not to 'pkg-config --variable'. + ------------------------------------------------------------------- Tue Aug 22 09:09:49 UTC 2017 - zaitor@opensuse.org diff --git a/wayland-protocols.spec b/wayland-protocols.spec index 0581b08..243a5ee 100644 --- a/wayland-protocols.spec +++ b/wayland-protocols.spec @@ -27,6 +27,8 @@ Url: http://wayland.freedesktop.org/ Source: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz Source2: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz.sig Source3: %name.keyring +# PATCH-FIX-UPSTREAM wayland-protocols-sysroot-prefix-fix.patch zaitor@opensuse.org -- Use sysroot prefix for pkgdatadir variable +Patch0: wayland-protocols-sysroot-prefix-fix.patch BuildRequires: pkg-config BuildRequires: pkgconfig(wayland-scanner) BuildArch: noarch @@ -52,6 +54,7 @@ wayland-protocols. %prep %setup -q +%patch0 -p1 %build %configure