From edd195ffe033e30eb0b6911d697b389267c5749886170008a117fd032933f545 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 19 Feb 2018 13:17:33 +0000 Subject: [PATCH 1/2] Accepting request 577277 from home:elvigia:branches:GNOME:Factory - Add explicit buildrequire on zlib and xcb-render OBS-URL: https://build.opensuse.org/request/show/577277 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=130 --- cairo.changes | 5 +++++ cairo.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cairo.changes b/cairo.changes index 4d624ab..500c208 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 16 14:30:02 UTC 2018 - crrodriguez@opensuse.org + +- Add explicit buildrequire on zlib and xcb-render + ------------------------------------------------------------------- Mon Dec 18 16:38:19 UTC 2017 - zaitor@opensuse.org diff --git a/cairo.spec b/cairo.spec index 61c1445..d3d45af 100644 --- a/cairo.spec +++ b/cairo.spec @@ -1,7 +1,7 @@ # # spec file for package cairo # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,6 +41,7 @@ BuildRequires: pkgconfig(pixman-1) >= 0.30.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(zlib) # These libraries are needed only for tests. # Do not enable tests in build systems, it causes build loop! #BuildRequires: librsvg-devel poppler-devel @@ -50,6 +51,7 @@ BuildRequires: pkgconfig(gl) %endif %if %{build_xcb_backend} BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-render) BuildRequires: pkgconfig(xcb-shm) %endif From ca6f9af1f16be4a3dd545dc9ea080b23bd9d3c0f0b4b7fb596988433d0041ea2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 19 Feb 2018 13:20:00 +0000 Subject: [PATCH 2/2] - Add explicit pkgconfig(zlib) and (conditionalized on build_xcb_backend) pkgconfig(xcb-render) BuildRequires: closer alignment with what configure checks for. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=131 --- cairo.changes | 4 +++- cairo.spec | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cairo.changes b/cairo.changes index 500c208..302d7b0 100644 --- a/cairo.changes +++ b/cairo.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- Fri Feb 16 14:30:02 UTC 2018 - crrodriguez@opensuse.org -- Add explicit buildrequire on zlib and xcb-render +- Add explicit pkgconfig(zlib) and (conditionalized on + build_xcb_backend) pkgconfig(xcb-render) BuildRequires: closer + alignment with what configure checks for. ------------------------------------------------------------------- Mon Dec 18 16:38:19 UTC 2017 - zaitor@opensuse.org diff --git a/cairo.spec b/cairo.spec index d3d45af..bf97e88 100644 --- a/cairo.spec +++ b/cairo.spec @@ -50,8 +50,8 @@ BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gl) %endif %if %{build_xcb_backend} -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-render) +BuildRequires: pkgconfig(xcb) >= 1.6 +BuildRequires: pkgconfig(xcb-render) >= 1.6 BuildRequires: pkgconfig(xcb-shm) %endif