Accepting request 847343 from GNOME:Factory

initialized devel package after accepting 847343

OBS-URL: https://build.opensuse.org/request/show/847343
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf-xlib?expand=0&rev=4

1.patch

@@ -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
+

2.patch

@@ -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
+

_service

@@ -0,0 +1,14 @@
+<services>
+  <service name="obs_scm" mode="disabled">
+    <param name="url">https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib.git</param>
+    <param name="scm">git</param>
+    <param name="revision">dc22ea36</param>
+    <param name="versionformat">2.40.1</param>
+  </service>
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service mode="disabled" name="set_version" />
+</services>

gdk-pixbuf-xlib-2.40.1.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b8436d1d6773a8b90abb2d4d088ea994f0290581ea402ff3f1f94463f8e10d0
+size 260619

gdk-pixbuf-xlib-2.40.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b8e1c270ec16a06f665ea841f8e4e167eaa0118d0cbfeeade43745f09198ff7
-size 53588

gdk-pixbuf-xlib.changes

@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-Fri Nov 13 18:07:08 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 2.40.2:
-  + build:
-    - Declare public dependencies in pkg-config.
-    - Fix Cflags.
-- Drop patches fixed upstream:
-  + 1.patch
-  + 2.patch
-- Switch to tarball release now that one is available.
-
 -------------------------------------------------------------------
 Mon Nov  9 17:07:41 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

gdk-pixbuf-xlib.obsinfo

@@ -0,0 +1,5 @@
+name: gdk-pixbuf-xlib
+version: 2.40.1
+mtime: 1571498066
+commit: dc22ea36f69755007c66877284596df270532cc1
+

gdk-pixbuf-xlib.spec

@@ -17,13 +17,17 @@
 
 
 Name:           gdk-pixbuf-xlib
-Version:        2.40.2
+Version:        2.40.1
 Release:        0
 Summary:        An GdkPixbuf compat library
 License:        LGPL-2.1-or-later
 URL:            https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib
-Source:         https://download.gnome.org/sources/%{name}/2.40/%{name}-%{version}.tar.xz
+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