pool/gdk-pixbuf-xlib
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 847322 from GNOME:Next

Browse Source 
- Add 1.patch (MR!1): Headers are installed to the gdk-pixbuf-2.0
  subdir for backwards compatibility but the Cflags in the
  pkg-config file did not match that.
- Add 2.patch (MR!2): Subject: [PATCH] build: Declare public
  dependencies in pkg-config; gdk-pixbuf and X11 headers are
  included in public headers so they should be in Requires.

OBS-URL: https://build.opensuse.org/request/show/847322
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf-xlib?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2020-11-09 19:34:01 +00:00 committed by Git OBS Bridge
parent dfe90c672e
commit 2d6e3c9ee5
4 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
1.patch Normal file
View File

@ -0,0 +1,41 @@
From 54eaae9772cc0d3bb4972eea3fdeb1ddfceeddbf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 11 Jun 2020 14:54:36 +0200
Subject: [PATCH] build: Fix Cflags
Headers are installed to the gdk-pixbuf-2.0 subdir for backwards
compatibility but the Cflags in the pkg-config file did not match that.
---
gdk-pixbuf-xlib/meson.build | 2 +-
meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdk-pixbuf-xlib/meson.build b/gdk-pixbuf-xlib/meson.build
index 2209ede..a19476d 100644
--- a/gdk-pixbuf-xlib/meson.build
+++ b/gdk-pixbuf-xlib/meson.build
@@ -12,7 +12,7 @@ gdkpixbuf_xlib_headers = [
gdkpixbuf_xlib_inc = include_directories('.')
-gdkpixbuf_xlib_api_path = join_paths('gdk-pixbuf-@0@'.format(api_version), 'gdk-pixbuf-xlib')
+gdkpixbuf_xlib_api_path = join_paths(api_name, 'gdk-pixbuf-xlib')
install_headers(gdkpixbuf_xlib_headers, subdir: gdkpixbuf_xlib_api_path)
diff --git a/meson.build b/meson.build
index b8256ee..4c3c009 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@ version_minor = version_arr[1].to_int()
version_micro = version_arr[2].to_int()
api_version = '@0@.0'.format(version_major)
-api_name = '@0@-@1@'.format(meson.project_name(), api_version)
+api_name = 'gdk-pixbuf-@0@'.format(api_version)
if version_minor.is_odd()
interface_age = 0
--
GitLab

27
2.patch Normal file
View File

@ -0,0 +1,27 @@
From 19482794a621d542b223219940e836257d4ae2c9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 11 Jun 2020 15:31:09 +0200
Subject: [PATCH] build: Declare public dependencies in pkg-config
gdk-pixbuf and X11 headers are included in public headers so they should be in Requires.
---
gdk-pixbuf-xlib/meson.build | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gdk-pixbuf-xlib/meson.build b/gdk-pixbuf-xlib/meson.build
index a19476d..4e34f8c 100644
--- a/gdk-pixbuf-xlib/meson.build
+++ b/gdk-pixbuf-xlib/meson.build
@@ -44,5 +44,9 @@ pkgconfig.generate(
name: 'GdkPixbuf Xlib',
description: 'GdkPixbuf rendering for Xlib',
filebase: 'gdk-pixbuf-xlib-2.0',
+ requires: [
+ gdk_pixbuf_dep,
+ x11_dep,
+ ],
subdirs: api_name,
)
--
GitLab

10
gdk-pixbuf-xlib.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Nov 9 17:07:41 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 1.patch (MR!1): Headers are installed to the gdk-pixbuf-2.0
subdir for backwards compatibility but the Cflags in the
pkg-config file did not match that.
- Add 2.patch (MR!2): Subject: [PATCH] build: Declare public
dependencies in pkg-config; gdk-pixbuf and X11 headers are
included in public headers so they should be in Requires.
-------------------------------------------------------------------
Wed Nov 27 17:41:00 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

5
gdk-pixbuf-xlib.spec
View File

@ -24,7 +24,10 @@ License: LGPL-2.1-or-later
URL: https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
Source: %{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM 1.patch dimstar@opensuse.org -- Headers are installed to the gdk-pixbuf-2.0 for compat reasons
Patch1: https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib/-/merge_requests/1.patch
# PATCH-FIX-UPSTREAM 2.patch dimstar@opensuse.org -- build: Declare public dependencies in pkg-config
Patch2: https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib/-/merge_requests/2.patch
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.39.2