mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
gnome-base/gnome-desktop: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
This commit is contained in:
@@ -1,3 +1 @@
|
||||
DIST gnome-desktop-41.3.tar.xz 732804 BLAKE2B 40a88ba4454455f85a46676d4b2f37159617f7eae9d0f5e1a27c3f0ed1e44953ae9475e81558b7cce1b6fd8cd8804cd3f452d060d843d4f58a7af8748b4c35fa SHA512 b02d9fe3bfad56993f9ed7225b38b4b0b685c7ad1480a9d9db5f9a6a8e13c16918d87e6a51160ee3101ab8ce24f4c0632ae351e7bb11cc473523e216ee9cf6bf
|
||||
DIST gnome-desktop-42.0.tar.xz 743484 BLAKE2B 7c7d5e74fe01e082c8ec1994bb7666f191e0eed4212c8ef6257ebb4c3e3a5fb95c8a0c47f1c8f0864a36faa239251569e67eafa734cba4a181b6774233352357 SHA512 b9d37765d3cc43bb709e1e9b97deb6ef16d2a8e6ef7cc3c577ba465d4856bbfe8774fb7fc6eaae4d88064081aeeea0c0c77fe2b4ef79b4d9af1232c918526b44
|
||||
DIST gnome-desktop-42.1.tar.xz 743032 BLAKE2B 1eda3138e50b0ded50ede12179311ab8888ab0837c650f3e6bad600a4327cdba02b3fbf7cf7ff845669075cbb56b69ca600b8b63b4f05dce93b0a71e76cedbd7 SHA512 a084f705aedf2d159da91dc54f38261760a50e51041321e6a69ee0dff499e11f0a440f5a9582a31977b0270c87e3ba7de0f5c9cc182c0631858afa1d9508ecf4
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit gnome.org meson xdg
|
||||
|
||||
DESCRIPTION="Library with common API for various GNOME modules"
|
||||
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
|
||||
SLOT="3/19" # subslot = libgnome-desktop-3 soname version
|
||||
IUSE="debug gtk-doc +introspection seccomp systemd udev"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
|
||||
>=x11-libs/gtk+-3.3.6:3[X,introspection?]
|
||||
>=dev-libs/glib-2.53.0:2
|
||||
>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
|
||||
x11-misc/xkeyboard-config
|
||||
x11-libs/libxkbcommon
|
||||
app-text/iso-codes
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
udev? ( virtual/libudev:= )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
|
||||
x11-libs/cairo:=
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
media-libs/fontconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
seccomp? ( sys-apps/bubblewrap )
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
dev-util/gdbus-codegen
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.14 )
|
||||
dev-util/itstool
|
||||
>=sys-devel/gettext-0.19.8
|
||||
x11-base/xorg-proto
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# Don't build manual test programs that will never get run
|
||||
sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
|
||||
xdg_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dgnome_distributor=Gentoo
|
||||
-Ddate_in_gnome_version=true
|
||||
-Ddesktop_docs=true
|
||||
$(meson_use debug debug_tools)
|
||||
$(meson_use introspection)
|
||||
$(meson_feature udev)
|
||||
$(meson_feature systemd)
|
||||
$(meson_use gtk-doc gtk_doc)
|
||||
-Dinstalled_tests=false
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit gnome.org meson xdg
|
||||
|
||||
DESCRIPTION="Library with common API for various GNOME modules"
|
||||
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
|
||||
SLOT="3/19" # subslot = libgnome-desktop-3 soname version
|
||||
IUSE="debug +introspection seccomp systemd udev"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
|
||||
>=x11-libs/gtk+-3.3.6:3[X,introspection?]
|
||||
>=dev-libs/glib-2.53.0:2
|
||||
>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
|
||||
x11-misc/xkeyboard-config
|
||||
x11-libs/libxkbcommon
|
||||
app-text/iso-codes
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
udev? ( virtual/libudev:= )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
|
||||
x11-libs/cairo:=
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
media-libs/fontconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
seccomp? ( sys-apps/bubblewrap )
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
dev-util/gdbus-codegen
|
||||
dev-util/itstool
|
||||
>=sys-devel/gettext-0.19.8
|
||||
x11-base/xorg-proto
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PV}-meson-Fix-build_gtk4-option.patch
|
||||
"${FILESDIR}"/${PV}-meson-Add-optionality-for-introspection.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
xdg_environment_reset
|
||||
|
||||
# Don't build manual test programs that will never get run
|
||||
sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dgnome_distributor=Gentoo
|
||||
-Ddate_in_gnome_version=true
|
||||
-Ddesktop_docs=false
|
||||
$(meson_use debug debug_tools)
|
||||
$(meson_use introspection)
|
||||
$(meson_feature udev)
|
||||
$(meson_feature systemd)
|
||||
-Dgtk_doc=false
|
||||
-Dinstalled_tests=false
|
||||
-Dbuild_gtk4=false
|
||||
-Dlegacy_library=true
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
rm -r \
|
||||
${ED}/usr/share/gnome/gnome-version.xml \
|
||||
${ED}/usr/share/locale \
|
||||
|| die
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit gnome.org meson xdg
|
||||
|
||||
DESCRIPTION="Library with common API for various GNOME modules"
|
||||
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
|
||||
|
||||
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
|
||||
SLOT="4/1" # subslot = libgnome-desktop-4 soname version
|
||||
IUSE="debug gtk-doc +introspection seccomp systemd udev"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
|
||||
>=gui-libs/gtk-4.4.0:4[X,introspection?]
|
||||
>=dev-libs/glib-2.53.0:2
|
||||
>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
|
||||
x11-misc/xkeyboard-config
|
||||
x11-libs/libxkbcommon
|
||||
app-text/iso-codes
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
udev? ( virtual/libudev:= )
|
||||
seccomp? ( sys-libs/libseccomp )
|
||||
|
||||
x11-libs/cairo:=
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
media-libs/fontconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
seccomp? ( sys-apps/bubblewrap )
|
||||
!<gnome-base/gnome-desktop-${PV}:3
|
||||
"
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
dev-util/gdbus-codegen
|
||||
gtk-doc? ( >=dev-util/gtk-doc-1.14 )
|
||||
dev-util/itstool
|
||||
>=sys-devel/gettext-0.19.8
|
||||
x11-base/xorg-proto
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PV}-meson-Fix-build_gtk4-option.patch
|
||||
"${FILESDIR}"/${PV}-meson-Add-optionality-for-introspection.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
xdg_environment_reset
|
||||
|
||||
# Don't build manual test programs that will never get run
|
||||
sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
-Dgnome_distributor=Gentoo
|
||||
-Ddate_in_gnome_version=true
|
||||
-Ddesktop_docs=true
|
||||
$(meson_use debug debug_tools)
|
||||
$(meson_use introspection)
|
||||
$(meson_feature udev)
|
||||
$(meson_feature systemd)
|
||||
$(meson_use gtk-doc gtk_doc)
|
||||
-Dinstalled_tests=false
|
||||
-Dbuild_gtk4=true
|
||||
-Dlegacy_library=false
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
Reference in New Issue
Block a user