Accepting request 1002640 from GNOME:Next

GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already)

OBS-URL: https://build.opensuse.org/request/show/1002640
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-kiosk?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2022-09-13 07:33:57 +00:00 committed by Git OBS Bridge
parent 1df8ae1b88
commit f24d1bb7a6
8 changed files with 49 additions and 21 deletions

18
_service Normal file
View File

@ -0,0 +1,18 @@
<?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-kiosk.git</param>
<param name="revision">main</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+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">xz</param>
</service>
<service name="set_version" mode="manual" />
</services>

4
_servicedata Normal file
View File

@ -0,0 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://gitlab.gnome.org/GNOME/gnome-kiosk.git</param>
<param name="changesrevision">3c33b4e6e3ad753733687949c503d18aa4fb185a</param></service></servicedata>

View File

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

View File

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

View File

@ -1,13 +0,0 @@
diff -Nur orig-gnome-kiosk-42.alpha/meson.build gnome-kiosk-42.alpha/meson.build
--- orig-gnome-kiosk-42.alpha/meson.build 2022-02-02 22:19:47.297891292 +0100
+++ gnome-kiosk-42.alpha/meson.build 2022-02-02 22:20:52.338499586 +0100
@@ -142,7 +142,7 @@
configuration: desktop_config_data
)
-i18n.merge_file('desktop',
+i18n.merge_file(
input: desktop_file,
output: 'org.gnome.Kiosk.desktop',
po_dir: po_dir,

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sat Sep 10 13:37:57 UTC 2022 - bjorn.lie@gmail.com
- Update to version 42.0+12:
* compositor:
- Delete g_autoptr blank lines
- Run entire codebase through uncrustify
* scripts:
- Don't force newline after variable declarations
- Add uncrustify config
* ci: Enforce coding style in CI
* Bump mutter library requirements to 11 (mutter 43)
* Drop unused positional argument to i18n.merge_file
- Switch to git checkout via source service, following this, bump
mutter_api to 11 following upstream changes.
- Drop gnome-kiosk-fix-meson-061.patch: Fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 22 08:10:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> Tue Mar 22 08:10:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

4
gnome-kiosk.obsinfo Normal file
View File

@ -0,0 +1,4 @@
name: gnome-kiosk
version: 42.0+12
mtime: 1659117819
commit: 364e7e108fa3e0a4adc2d25c1d432ccb8872732a

View File

@ -16,17 +16,15 @@
# #
%define mutter_api 10 %define mutter_api 11
Name: gnome-kiosk Name: gnome-kiosk
Version: 42.0 Version: 42.0+12
Release: 0 Release: 0
Summary: Mutter based compositor for kiosks Summary: Mutter based compositor for kiosks
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://gitlab.gnome.org/GNOME/gnome-kiosk URL: https://gitlab.gnome.org/GNOME/gnome-kiosk
Source0: https://download.gnome.org/sources/gnome-kiosk/42/%{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-kiosk-fix-meson-061.patch bjorn.lie@gmail.com -- Fix build with meson 0.61 and newer
Patch0: gnome-kiosk-fix-meson-061.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: meson BuildRequires: meson