pool/gnome-desktop
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 963974 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/963974
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-desktop?expand=0&rev=176
This commit is contained in:
Dominique Leuenberger 2022-03-23 19:17:06 +00:00 committed by Git OBS Bridge
commit e44c01ea6e
5 changed files with 316 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
a3ed548d92b160245b79978ae362d47091ad8dad.patch Normal file
View File

@ -0,0 +1,164 @@
From a3ed548d92b160245b79978ae362d47091ad8dad Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Sun, 20 Mar 2022 18:07:17 -0700
Subject: [PATCH] meson: Fix build_gtk4 option
(cherry picked from commit a9ad6e704f9fead5748c2a9697990b01e91b9de0)
---
libgnome-desktop/meson.build | 134 +++++++++++++++++------------------
1 file changed, 67 insertions(+), 67 deletions(-)
diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
index 2aaf81b1..7dfbfeb4 100644
--- a/libgnome-desktop/meson.build
+++ b/libgnome-desktop/meson.build
@@ -78,79 +78,79 @@ libgnome_desktop_base_headers = [
'gnome-xkb-info.h',
]
-install_headers(libgnome_desktop_base_headers,
- subdir: 'gnome-desktop-4.0/libgnome-desktop'
-)
+if get_option('build_gtk4')
+ install_headers(libgnome_desktop_base_headers,
+ subdir: 'gnome-desktop-4.0/libgnome-desktop'
+ )
-base_deps = [
- gdk_pixbuf_dep,
- glib_dep,
- gio_dep,
- gio_unix_dep,
- libsystemd_dep,
- schemas_dep,
- xkb_config_dep,
- xkbregistry_dep,
- iso_codes_dep,
- udev_dep,
- seccomp_dep,
- m_dep,
- rt_dep,
-]
+ base_deps = [
+ gdk_pixbuf_dep,
+ glib_dep,
+ gio_dep,
+ gio_unix_dep,
+ libsystemd_dep,
+ schemas_dep,
+ xkb_config_dep,
+ xkbregistry_dep,
+ iso_codes_dep,
+ udev_dep,
+ seccomp_dep,
+ m_dep,
+ rt_dep,
+ ]
-libgnome_desktop_base = library('gnome-desktop-4',
- sources: [
- libgnome_desktop_base_sources,
- libgnome_desktop_base_private_sources,
- dbus_idle_built_sources,
- ],
- dependencies: base_deps,
- soversion: soversion,
- version: libversion,
- c_args: libargs,
- link_args: base_ldflags,
- install: true,
- include_directories: [
- include_directories('.'),
- include_directories('..'),
- ],
-)
+ libgnome_desktop_base = library('gnome-desktop-4',
+ sources: [
+ libgnome_desktop_base_sources,
+ libgnome_desktop_base_private_sources,
+ dbus_idle_built_sources,
+ ],
+ dependencies: base_deps,
+ soversion: soversion,
+ version: libversion,
+ c_args: libargs,
+ link_args: base_ldflags,
+ install: true,
+ include_directories: [
+ include_directories('.'),
+ include_directories('..'),
+ ],
+ )
-libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
- sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
- export_packages: 'gnome-desktop-4',
- namespace: 'GnomeDesktop',
- nsversion: '4.0',
- includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
- identifier_prefix: 'Gnome',
- symbol_prefix: 'gnome',
- install: true,
-)
+ libgnome_desktop_base_gir = gnome.generate_gir(libgnome_desktop_base,
+ sources: [libgnome_desktop_base_headers, libgnome_desktop_base_sources],
+ export_packages: 'gnome-desktop-4',
+ namespace: 'GnomeDesktop',
+ nsversion: '4.0',
+ includes: ['GObject-2.0', 'Gio-2.0', 'GDesktopEnums-3.0', 'GdkPixbuf-2.0'],
+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+ identifier_prefix: 'Gnome',
+ symbol_prefix: 'gnome',
+ install: true,
+ )
-pkg.generate(
- libgnome_desktop_base,
- requires: ['gsettings-desktop-schemas'],
- version: meson.project_version(),
- name: 'gnome-desktop-4',
- filebase: 'gnome-desktop-4',
- description: 'Utility library for GNOME desktop components',
- subdirs: 'gnome-desktop-4.0',
-)
+ pkg.generate(
+ libgnome_desktop_base,
+ requires: ['gsettings-desktop-schemas'],
+ version: meson.project_version(),
+ name: 'gnome-desktop-4',
+ filebase: 'gnome-desktop-4',
+ description: 'Utility library for GNOME desktop components',
+ subdirs: 'gnome-desktop-4.0',
+ )
-libgnome_desktop_base_dep = declare_dependency(
- sources: [
- libgnome_desktop_base_gir,
- ],
- dependencies: base_deps,
- link_with: libgnome_desktop_base,
- include_directories: [
- include_directories('.'),
- include_directories('..'),
- ],
-)
+ libgnome_desktop_base_dep = declare_dependency(
+ sources: [
+ libgnome_desktop_base_gir,
+ ],
+ dependencies: base_deps,
+ link_with: libgnome_desktop_base,
+ include_directories: [
+ include_directories('.'),
+ include_directories('..'),
+ ],
+ )
-if gtk4_dep.found()
subdir('gnome-bg')
subdir('gnome-rr')
endif
--
GitLab

3
gnome-desktop-41.3.tar.xz
View File

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

3
gnome-desktop-42.0.tar.xz Normal file
View File

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

49
gnome-desktop.changes
View File

@ -1,3 +1,52 @@
-------------------------------------------------------------------
Tue Mar 22 08:00:53 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.0:
+ No changes, stable bump only.
- Add a3ed548d92b160245b79978ae362d47091ad8dad.patch: meson: Fix
build_gtk4 option
-------------------------------------------------------------------
Mon Mar 14 10:55:35 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.rc:
+ Updated translations.
-------------------------------------------------------------------
Fri Feb 18 09:02:26 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.beta:
+ Add async methods for thumbnail creation
+ thumbnail: Resolve symlinks before exporting them with Flatpak
+ Make table:cangjie5 the default input method for zh_HK
+ Updated translations.
-------------------------------------------------------------------
Wed Jan 12 16:59:53 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 42.alpha.1:
+ build: fix soversion in libgnome-desktop-4.
- Drop 129.patch: fixed upstream.
-------------------------------------------------------------------
Wed Jan 12 11:56:57 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 42.alpha:
+ gnome-languages: fix translation of 3-letter code languages.
+ Introduce gnome-desktop-4, libgnome-desktop-3.0 is still
available with a build flag.
+ Split libgnome-desktop into three, gnome-desktop, gnome-rr,
gnome-bg. -rr and -bg depend on gtk4.
+ Refactor gnome-gettext-portable.h.
+ Updated translations.
- Add pgkconfig(gtk4) BuildReuires: new dependency.
- Split out new packages for the API 4.0 variant:
libgnome-desktop-4-devel, libgnome-desktop-4-1,
typelib-1_0-GnomeDesktop-4-0, typelib-1_0-GnomeBG-4-0, and
typelib-1_0-GnomeRR-4-0
- Add 129.patch: Fix soname of the new libgnome-desktop-4
libraries.
-------------------------------------------------------------------
Tue Jan 11 17:15:39 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

103
gnome-desktop.spec
View File

@ -17,16 +17,18 @@
Name: gnome-desktop
Version: 41.3
Version: 42.0
Release: 0
Summary: The GNOME Desktop API Library
License: LGPL-2.1-or-later
Group: System/GUI/GNOME
URL: https://www.gnome.org
Source0: https://download.gnome.org/sources/gnome-desktop/41/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-desktop/42/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gnome-desktop-switch-Japanese-default-input-to-mozc.patch bnc#1029083 boo#1056289 qzhao@suse.com -- Switch new user's default input engine from "anthy" to "mozc" in gnome-desktop with Japanese language and ibus input frame-work condition.
Patch1: gnome-desktop-switch-Japanese-default-input-to-mozc.patch
# PATCH-FIX-UPSTREAM a3ed548d92b160245b79978ae362d47091ad8dad.patch -- meson: Fix build_gtk4 option
Patch2: https://gitlab.gnome.org/GNOME/gnome-desktop/-/commit/a3ed548d92b160245b79978ae362d47091ad8dad.patch
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
@ -41,6 +43,7 @@ BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0) >= 2.53.0
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.31.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.6
BuildRequires: pkgconfig(gtk4)
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsystemd)
@ -115,6 +118,71 @@ The libgnome-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons.
%package -n libgnome-desktop-4-devel
Summary: Development files for the GNOME Desktop API library
Group: Development/Libraries/GNOME
Requires: libgnome-desktop-4-1 = %{version}
Requires: typelib-1_0-GnomeBG-4_0 = %{version}
Requires: typelib-1_0-GnomeDesktop-4_0 = %{version}
Requires: typelib-1_0-GnomeRR-4_0 = %{version}
%description -n libgnome-desktop-4-devel
The libgnome-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons.
%package -n libgnome-desktop-4-1
Summary: The GNOME Desktop API Library
Group: System/Libraries
# the library calls out to bwrap in order to fire up thumbnailers in a secure container
Requires: bubblewrap
Requires: gsettings-desktop-schemas
# Data files for libgnome-desktop, split in an own package for SLPP compliancy
Requires: libgnome-desktop-3_0-common >= %{version}
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
%description -n libgnome-desktop-4-1
The libgnome-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons.
%package -n typelib-1_0-GnomeDesktop-4_0
Summary: Introspection bindings for the GNOME Desktop API library
Group: System/Libraries
%description -n typelib-1_0-GnomeDesktop-4_0
The libgnome-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons.
This package provides the GObject Introspection bindings for
libgnome-desktop.
%package -n typelib-1_0-GnomeBG-4_0
Summary: Introspection bindings for the GNOME Desktop API library
Group: System/Libraries
%description -n typelib-1_0-GnomeBG-4_0
The libgnome-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons.
This package provides the GObject Introspection bindings for
libgnome-desktop.
%package -n typelib-1_0-GnomeRR-4_0
Summary: Introspection bindings for the GNOME Desktop API library
Group: System/Libraries
%description -n typelib-1_0-GnomeRR-4_0
The libgnome-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons.
This package provides the GObject Introspection bindings for
libgnome-desktop.
%lang_package
%prep
@ -142,6 +210,9 @@ reasons.
%post -n libgnome-desktop-3-19 -p /sbin/ldconfig
%postun -n libgnome-desktop-3-19 -p /sbin/ldconfig
%post -n libgnome-desktop-4-1 -p /sbin/ldconfig
%postun -n libgnome-desktop-4-1 -p /sbin/ldconfig
%files -n libgnome-desktop-3-19
%license COPYING.LIB
%doc AUTHORS NEWS
@ -161,7 +232,7 @@ reasons.
%{_includedir}/gnome-desktop-3.0/
%{_libdir}/libgnome-desktop-3.so
%{_libdir}/pkgconfig/gnome-desktop-3.0.pc
%{_datadir}/gir-1.0/*.gir
%{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%files lang -f %{name}-3.0.lang
@ -172,4 +243,30 @@ reasons.
%dir %{_datadir}/gnome
%{_datadir}/gnome/gnome-version.xml
%files -n libgnome-desktop-4-devel
%{_datadir}/gir-1.0/GnomeBG-4.0.gir
%{_datadir}/gir-1.0/GnomeDesktop-4.0.gir
%{_datadir}/gir-1.0/GnomeRR-4.0.gir
%{_includedir}/gnome-desktop-4.0
%{_libdir}/libgnome-bg-4.so
%{_libdir}/libgnome-desktop-4.so
%{_libdir}/libgnome-rr-4.so
%{_libdir}/pkgconfig/gnome-bg-4.pc
%{_libdir}/pkgconfig/gnome-desktop-4.pc
%{_libdir}/pkgconfig/gnome-rr-4.pc
%files -n typelib-1_0-GnomeBG-4_0
%{_libdir}/girepository-1.0/GnomeBG-4.0.typelib
%files -n typelib-1_0-GnomeDesktop-4_0
%{_libdir}/girepository-1.0/GnomeDesktop-4.0.typelib
%files -n typelib-1_0-GnomeRR-4_0
%{_libdir}/girepository-1.0/GnomeRR-4.0.typelib
%files -n libgnome-desktop-4-1
%{_libdir}/libgnome-desktop-4.so.1*
%{_libdir}/libgnome-bg-4.so.1*
%{_libdir}/libgnome-rr-4.so.1*
%changelog