snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

gnome-desktop: update to 42.2

This commit is contained in:
oreo639 2022-03-23 17:14:01 -07:00 committed by Michal Vasilek
parent a1c7c38248
commit 40c62637c0
5 changed files with 100 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/shlibs
View File

@ -1128,6 +1128,9 @@ libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
libgnome-desktop-4.so.1 gnome-desktop-42.0_1
libgnome-bg-4.so.1 gnome-desktop-42.0_1
libgnome-rr-4.so.1 gnome-desktop-42.0_1
libsecret-1.so.0 libsecret-0.10_1
libgweather-4.so.0 libgweather-4.0.0_1
libgnomekbd.so.8 libgnomekbd-3.6.0_1

18
srcpkgs/gnome-desktop/patches/build.patch
View File

@ -1,18 +0,0 @@
commit 4f55ff078411993b782e74ea18c5c6ab35adf685
Author: Daniel Kolesa <daniel@octaforge.org>
Date: Wed Aug 12 05:26:00 2020 +0200
bla
diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
index 111bab3..7698672 100644
--- a/libgnome-desktop/gnome-rr.h
+++ b/libgnome-desktop/gnome-rr.h
@@ -28,6 +28,7 @@
#error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
#endif
+#include <stdint.h>
#include <glib.h>
#include <gdk/gdk.h>

93
srcpkgs/gnome-desktop/patches/optional_introspection.patch Normal file
View File

@ -0,0 +1,93 @@
From 94b253000f081423a3c813d340ed486fc170768d Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Wed, 18 Sep 2019 22:28:21 +0300
Subject: [PATCH] meson: Add optionality for introspection
---
libgnome-desktop/meson.build | 48 +++++++++++++++++++-----------------
meson_options.txt | 4 +++
2 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
index a0fb11f8..375cf57c 100644
--- a/libgnome-desktop/meson.build
+++ b/libgnome-desktop/meson.build
@@ -125,17 +125,19 @@ if get_option('build_gtk4')
],
)
- 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,
- )
+ if get_option('introspection')
+ 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,
+ )
+ endif
pkg.generate(
libgnome_desktop_base,
@@ -255,17 +257,19 @@ if get_option('legacy_library')
],
)
- gnome.generate_gir(libgnome_desktop,
- sources: introspection_sources + libgnome_desktop_headers,
- export_packages: 'gnome-desktop-3.0',
- namespace: 'GnomeDesktop',
- nsversion: '3.0',
- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
- extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
- identifier_prefix: 'Gnome',
- symbol_prefix: 'gnome',
- install: true
- )
+ if get_option('introspection')
+ gnome.generate_gir(libgnome_desktop,
+ sources: introspection_sources + libgnome_desktop_headers,
+ export_packages: 'gnome-desktop-3.0',
+ namespace: 'GnomeDesktop',
+ nsversion: '3.0',
+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+ extra_args: ['-DGNOME_DESKTOP_USE_UNSTABLE_API', '--quiet', '--warn-all'],
+ identifier_prefix: 'Gnome',
+ symbol_prefix: 'gnome',
+ install: true
+ )
+ endif
pkg.generate(
libraries: libgnome_desktop,
diff --git a/meson_options.txt b/meson_options.txt
index e17e7330..c4db6eaf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,6 +17,10 @@ option('debug_tools',
type: 'boolean', value: true, description: 'Build debug tools'
)
+option('introspection',
+ type: 'boolean', value: true, description: 'Whether to build introspection files'
+)
+
option('udev',
type: 'feature', description: 'Udev support'
)
--
GitLab

47
srcpkgs/gnome-desktop/patches/optionalise-gir.patch
View File

@ -1,47 +0,0 @@
diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
index c365b44..33af6f4 100644
--- a/libgnome-desktop/meson.build
+++ b/libgnome-desktop/meson.build
@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
link_with: libgnome_desktop
)
-gnome.generate_gir(libgnome_desktop,
- sources: introspection_sources + libgnome_desktop_headers,
- export_packages: 'gnome-desktop-3.0',
- namespace: 'GnomeDesktop',
- nsversion: '3.0',
- includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
- extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
- identifier_prefix: 'Gnome',
- symbol_prefix: 'gnome',
- install: true
-)
+if get_option('introspection')
+ gnome.generate_gir(libgnome_desktop,
+ sources: introspection_sources + libgnome_desktop_headers,
+ export_packages: 'gnome-desktop-3.0',
+ namespace: 'GnomeDesktop',
+ nsversion: '3.0',
+ includes: ['GObject-2.0', 'Gtk-3.0', 'GDesktopEnums-3.0'],
+ extra_args: '-DGNOME_DESKTOP_USE_UNSTABLE_API',
+ identifier_prefix: 'Gnome',
+ symbol_prefix: 'gnome',
+ install: true
+ )
+endif
desktop_pc = pkg.generate(
libraries: libgnome_desktop,
diff --git a/meson_options.txt b/meson_options.txt
index e3402a1..1dbaf5d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,3 +28,7 @@ option('gtk_doc',
option('installed_tests',
type: 'boolean', value: false, description: 'Enable installed tests'
)
+
+option('introspection',
+ type: 'boolean', value: false, description: 'Build GIR data'
+)

8
srcpkgs/gnome-desktop/template
View File

@ -1,13 +1,13 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
version=41.3
version=42.2
revision=1
build_style=meson
build_helper="gir"
configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled -Dsystemd=disabled
-Dintrospection=$(vopt_if gir true false)"
hostmakedepends="gettext itstool pkg-config glib-devel"
makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel
makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk4-devel gtk+3-devel
iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel
libxkbfile-devel libXrandr-devel gdk-pixbuf-devel"
depends="bubblewrap gsettings-desktop-schemas iso-codes xkeyboard-config"
@ -15,9 +15,9 @@ short_desc="GNOME desktop management utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-desktop"
changelog="https://gitlab.gnome.org/GNOME/gnome-desktop/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=8cd1caab9311828c0452468c6a5067a9bc4463835b23a14be44e8fd9b03001c6
make_check=no # needs X
checksum=f42b14eac8d1456c2bfc1fbc97ef6afe49c8dd6f57796e8fd5feb39331ed55bd
build_options="gir"
build_options_default="gir"