Accepting request 1060502 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1060502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libchamplain?expand=0&rev=57
This commit is contained in:
2023-01-24 18:43:02 +00:00
committed by Git OBS Bridge
5 changed files with 20 additions and 41 deletions
+11
View File
@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Jan 19 08:20:17 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 0.12.21:
+ Add libsoup3 HTTP backend.
+ Minor fixes.
- Drop 91a9e41fed6269637da52d5f88699782a940b198.patch: Fixed
upstream.
- Replace pkgconfig(libsoup-2.4) with pkgconfig(libsoup-3.0)
BuildRequires following upstreams port.
-------------------------------------------------------------------
Wed Jan 19 12:42:38 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+6 -8
View File
@@ -1,7 +1,7 @@
#
# spec file for package libchamplain
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,13 @@
Name: libchamplain
Version: 0.12.20
Version: 0.12.21
Release: 0
Summary: Library to display maps
License: LGPL-2.1-or-later
Group: Development/Libraries/GNOME
URL: https://wiki.gnome.org/Projects/libchamplain
Source0: https://download.gnome.org/sources/libchamplain/0.12/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM 91a9e41fed6269637da52d5f88699782a940b198.patch -- g-i: Annotate champlain_layer_set_view to allow NULL as view
Patch0: https://gitlab.gnome.org/GNOME/libchamplain/-/commit/91a9e41fed6269637da52d5f88699782a940b198.patch
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
@@ -36,11 +34,11 @@ BuildRequires: pkgconfig(cairo) >= 1.4
BuildRequires: pkgconfig(clutter-1.0) >= 1.12
BuildRequires: pkgconfig(clutter-gtk-1.0) >= 0.90
BuildRequires: pkgconfig(gdk-3.0) >= 2.90
BuildRequires: pkgconfig(gio-2.0) >= 2.16
BuildRequires: pkgconfig(glib-2.0) >= 2.16
BuildRequires: pkgconfig(gobject-2.0) >= 2.10
BuildRequires: pkgconfig(gio-2.0) >= 2.68
BuildRequires: pkgconfig(glib-2.0) >= 2.68
BuildRequires: pkgconfig(gobject-2.0) >= 2.68
BuildRequires: pkgconfig(gtk+-3.0) >= 2.90
BuildRequires: pkgconfig(libsoup-2.4) >= 2.42
BuildRequires: pkgconfig(libsoup-3.0) >= 3.0
BuildRequires: pkgconfig(sqlite3) >= 3.0
BuildRequires: pkgconfig(vapigen)
@@ -1,30 +0,0 @@
From 91a9e41fed6269637da52d5f88699782a940b198 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 22 Jun 2020 18:17:06 +0200
Subject: [PATCH] g-i: Annotate champlain_layer_set_view to allow NULL as view
---
champlain/champlain-layer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/champlain/champlain-layer.c b/champlain/champlain-layer.c
index 2c973de5..ec279010 100644
--- a/champlain/champlain-layer.c
+++ b/champlain/champlain-layer.c
@@ -58,11 +58,11 @@ champlain_layer_class_init (ChamplainLayerClass *klass)
/**
* champlain_layer_set_view:
* @layer: a #ChamplainLayer
- * @view: a #ChamplainView
+ * @view: (nullable): a #ChamplainView
*
* #ChamplainView calls this method to pass a reference to itself to the layer
* when the layer is added to the view. When the layer is removed from the
- * view, it passes NULL to the layer. Custom layers can implement this method
+ * view, it passes %NULL to the layer. Custom layers can implement this method
* and perform the necessary initialization. This method should not be called
* by user code.
*
--
GitLab
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0232b4bfcd130a1c5bda7b6aec266bf2d06e701e8093df1886f1e26bc1ba3066
size 222168
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a915cd172a0c52944c5579fcb4683f8a878c571bf5e928254b5dafefc727e5a7
size 223748