Accepting request 522823 from X11:Wayland
1 OBS-URL: https://build.opensuse.org/request/show/522823 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wayland-protocols?expand=0&rev=12
This commit is contained in:
commit
ad8f8c2543
25
wayland-protocols-sysroot-prefix-fix.patch
Normal file
25
wayland-protocols-sysroot-prefix-fix.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tomek Bury <tomek.bury@broadcom.com>
|
||||||
|
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 <daniels@collabora.com>
|
||||||
|
|
||||||
|
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
|
||||||
|
|
@ -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
|
Tue Aug 22 09:09:49 UTC 2017 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ Url: http://wayland.freedesktop.org/
|
|||||||
Source: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
|
Source: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
|
||||||
Source2: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz.sig
|
Source2: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz.sig
|
||||||
Source3: %name.keyring
|
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: pkg-config
|
||||||
BuildRequires: pkgconfig(wayland-scanner)
|
BuildRequires: pkgconfig(wayland-scanner)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -52,6 +54,7 @@ wayland-protocols.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
Loading…
Reference in New Issue
Block a user