summaryrefslogtreecommitdiff
path: root/gnome-base/gnome-desktop/files
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base/gnome-desktop/files')
-rw-r--r--gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch48
-rw-r--r--gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch165
2 files changed, 0 insertions, 213 deletions
diff --git a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
deleted file mode 100644
index 7471a3e6a2dc..000000000000
--- a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1b8fb6b0fd155975f64b5e2ef03bece96a5e3340 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 18 Sep 2019 22:28:21 +0300
-Subject: [PATCH] build: Add optionality for introspection
-
----
- libgnome-desktop/meson.build | 2 ++
- meson_options.txt | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b448..a7355f31 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,6 +96,7 @@ libgnome_desktop_dep = declare_dependency(
- link_with: libgnome_desktop
- )
-
-+if get_option('introspection')
- gnome.generate_gir(libgnome_desktop,
- sources: introspection_sources + libgnome_desktop_headers,
- export_packages: 'gnome-desktop-3.0',
-@@ -107,6 +108,7 @@ gnome.generate_gir(libgnome_desktop,
- symbol_prefix: 'gnome',
- install: true
- )
-+endif
-
- desktop_pc = pkg.generate(
- libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a11..7efe43ce 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'
- )
---
-2.20.1
-
diff --git a/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch b/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch
deleted file mode 100644
index 9b166e23bab8..000000000000
--- a/gnome-base/gnome-desktop/files/42.0-meson-Fix-build_gtk4-option.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-https://gitlab.gnome.org/GNOME/gnome-desktop/-/merge_requests/138
-
-From a9ad6e704f9fead5748c2a9697990b01e91b9de0 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sun, 20 Mar 2022 18:07:17 -0700
-Subject: [PATCH 1/2] meson: Fix build_gtk4 option
-
----
- 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 e81530ed..a0fb11f8 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -86,79 +86,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
---
-2.34.1
-