From cd07d1b697f5b497708914663299a2162fca9cddf348503d74ba52a6223a6898 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 2 May 2024 16:00:55 +0000 Subject: [PATCH] Accepting request 1171409 from GNOME:Next - 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). OBS-URL: https://build.opensuse.org/request/show/1171409 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-robots?expand=0&rev=78 --- _service | 19 +++++++++++++++++ gnome-robots-40.0.obscpio | 3 +++ gnome-robots-40.0.tar.xz | 3 --- gnome-robots-libm.patch | 43 +++++++++++++++++++++++++++++++++++++++ gnome-robots.changes | 8 ++++++++ gnome-robots.obsinfo | 4 ++++ gnome-robots.spec | 6 ++++-- 7 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 _service create mode 100644 gnome-robots-40.0.obscpio delete mode 100644 gnome-robots-40.0.tar.xz create mode 100644 gnome-robots-libm.patch create mode 100644 gnome-robots.obsinfo diff --git a/_service b/_service new file mode 100644 index 0000000..6827f62 --- /dev/null +++ b/_service @@ -0,0 +1,19 @@ + + + + git + https://gitlab.gnome.org/GNOME/gnome-robots.git + 40.0 + @PARENT_TAG@+@TAG_OFFSET@ + v?(.*)\+0 + \1 + + + + + *.tar + zst + + + + diff --git a/gnome-robots-40.0.obscpio b/gnome-robots-40.0.obscpio new file mode 100644 index 0000000..f3cd36e --- /dev/null +++ b/gnome-robots-40.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee95f35e0af4f3da67124d839cdc5942bd5cc275efdc10827aa32b6815808745 +size 2626060 diff --git a/gnome-robots-40.0.tar.xz b/gnome-robots-40.0.tar.xz deleted file mode 100644 index 3a8636a..0000000 --- a/gnome-robots-40.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fbf2f885750f1a5110a724f8f35addd9bc61184ee31cf0c0cb89953e4f4cb11 -size 420024 diff --git a/gnome-robots-libm.patch b/gnome-robots-libm.patch new file mode 100644 index 0000000..be65850 --- /dev/null +++ b/gnome-robots-libm.patch @@ -0,0 +1,43 @@ +From f34f794554f6091071435874a18e1c39696e4d24 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +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 diff --git a/gnome-robots.changes b/gnome-robots.changes index 97d449a..b9dfedf 100644 --- a/gnome-robots.changes +++ b/gnome-robots.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 2 13:12:38 UTC 2024 - Dominique Leuenberger + +- 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 diff --git a/gnome-robots.obsinfo b/gnome-robots.obsinfo new file mode 100644 index 0000000..8ee6815 --- /dev/null +++ b/gnome-robots.obsinfo @@ -0,0 +1,4 @@ +name: gnome-robots +version: 40.0 +mtime: 1616284913 +commit: 6c9525c31e4ee08f2cb4e21d9d9de41850084fb4 diff --git a/gnome-robots.spec b/gnome-robots.spec index a8cf38e..1ee0a19 100644 --- a/gnome-robots.spec +++ b/gnome-robots.spec @@ -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