Accepting request 1171410 from GNOME:Factory

- Convert package to obs_scm service.
- Add gnome-robots-libm.patch: explicitly link against libm.
  Needed, as new librsvg no longer takes care of that for us (and
  robots wrongly relied on it). (forwarded request 1171409 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/1171410
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-robots?expand=0&rev=36
This commit is contained in:
Ana Guerrero 2024-05-02 21:48:37 +00:00 committed by Git OBS Bridge
commit 6c1ed12698
7 changed files with 81 additions and 5 deletions

19
_service Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/gnome-robots.git</param>
<param name="revision">40.0</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">v?(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param>
<!-- <param name="changesgenerate">enable</param> -->
</service>
<service name="tar" mode="buildtime"/>
<service name="recompress" mode="buildtime">
<param name="file">*.tar</param>
<param name="compression">zst</param>
</service>
<service name="set_version" mode="manual" />
</services>

View File

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

View File

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

43
gnome-robots-libm.patch Normal file
View File

@ -0,0 +1,43 @@
From f34f794554f6091071435874a18e1c39696e4d24 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 2 May 2024 17:54:50 +0200
Subject: [PATCH] build: Link against libm
Fixes build in case none of our dependenices adds -lm to LDFLAGS.
Since gnome-robot's own code uses atan2, it is our own responsibility
to ensure the linking against libm.
Fixes https://gitlab.gnome.org/GNOME/gnome-robots/-/issues/19
---
meson.build | 3 +++
src/meson.build | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index a1bedfb..017fb21 100644
--- a/meson.build
+++ b/meson.build
@@ -22,6 +22,9 @@ gtk_dependency = dependency('gtk+-3.0', version: '>= 3.24.0')
gdk_dependency = dependency('gdk-3.0', version: '>= 3.24.0')
rsvg_dependency = dependency('librsvg-2.0', version: '>= 2.36.2')
+cc = meson.get_compiler('c')
+m_dep = cc.find_library('m', required : false)
+
bindir = join_paths(get_option('prefix'), get_option('bindir'))
datadir = join_paths(get_option('prefix'), get_option('datadir'))
pkgdatadir = join_paths(datadir, meson.project_name())
diff --git a/src/meson.build b/src/meson.build
index 1787353..34505c9 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -53,7 +53,8 @@ executable(
gsound_dependency,
gtk_dependency,
gdk_dependency,
- rsvg_dependency
+ rsvg_dependency,
+ m_dep
],
install_dir: get_option('bindir'),
install: true

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu May 2 13:12:38 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Convert package to obs_scm service.
- Add gnome-robots-libm.patch: explicitly link against libm.
Needed, as new librsvg no longer takes care of that for us (and
robots wrongly relied on it).
-------------------------------------------------------------------
Sun Mar 21 08:03:01 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

4
gnome-robots.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: gnome-robots
version: 40.0
mtime: 1616284913
commit: 6c9525c31e4ee08f2cb4e21d9d9de41850084fb4

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-robots
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -23,7 +23,9 @@ Summary: Robots Game for GNOME
License: GPL-3.0-or-later
Group: Amusements/Games/Action/Arcade
URL: https://live.gnome.org/Robots
Source0: https://download.gnome.org/sources/gnome-robots/40/%{name}-%{version}.tar.xz
Source0: %{name}-%{version}.tar.zst
# PATCH-FIX-UPSTREAM
Patch0: gnome-robots-libm.patch
BuildRequires: fdupes
BuildRequires: gnome-games-scripts
BuildRequires: itstool