1
0
forked from brl/citadel

GNOME 41.1

This commit is contained in:
Bruce Leidl 2021-11-29 19:16:51 -05:00
parent 70a0414d18
commit eb148b10fe
16 changed files with 30 additions and 5029 deletions

View File

@ -19,7 +19,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
" "
SRC_URI_append_class-native = " file://relocate-modules.patch" SRC_URI_append_class-native = " file://relocate-modules.patch"
SRC_URI[sha256sum] = "200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742" SRC_URI[sha256sum] = "f9b7bce7f51753a1f43853bbcaca8bf09e15e994268e29cfd7a76f65636263c0"
# Find any meson cross files in FILESPATH that are relevant for the current # Find any meson cross files in FILESPATH that are relevant for the current
# build (using siteinfo) and add them to EXTRA_OEMESON. # build (using siteinfo) and add them to EXTRA_OEMESON.

View File

@ -7,10 +7,12 @@ DEPENDS = " \
libarchive \ libarchive \
" "
GNOMEBASEBUILDCLASS = "meson"
GIR_MESON_ENABLE_FLAG = "enabled"
GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gobject-introspection gtk-doc vala inherit gnomebase gobject-introspection gtk-doc vala
SRC_URI[archive.md5sum] = "3149496d0189623a8e1289bbab4d8385" SRC_URI[archive.sha256sum] = "646bd50ebad92d91c1be89097a15364156157442cac1471ded7ecb27d9a9150e"
SRC_URI[archive.sha256sum] = "0e78713e6f0de339fdee16bab82753ae290fe80fa7b4ba6e3db8c1465b81d0f8"
do_compile_prepend() { do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs"

View File

@ -37,7 +37,7 @@ def gnome_verdir(v):
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive"
SRC_URI[archive.sha256sum] = "a5696222ad353fcf9a07c406e287ecc9138e250645cb2a5941a88ff0685658c1" SRC_URI[archive.sha256sum] = "ea0c71484c65ce2cc11376f9b01e6211fa4a7ffd334f4307fc52c93f0fddd4c7"
# #

View File

@ -15,7 +15,7 @@ def gnome_verdir(v):
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive"
SRC_URI += "file://0001-needs-stdint-include.patch" SRC_URI += "file://0001-needs-stdint-include.patch"
SRC_URI[archive.sha256sum] = "69cb1d3d9a10700eb66348ef1c0e66a855fc5a97ae62902df97a499da11562d2" SRC_URI[archive.sha256sum] = "be8aafa64d7ba2fd31079eed639d39fda1ea77ef77d35a678f019c4d91d473c2"
DEPENDS += "itstool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp" DEPENDS += "itstool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev libseccomp"

View File

@ -1,4 +1,4 @@
From 724ea2e98f186456ea984fe9250f8650ed025a9c Mon Sep 17 00:00:00 2001 From ac70fbe1edeef149c55d5779008429aec9945b76 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com> From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 5 Oct 2021 11:17:47 +0000 Date: Tue, 5 Oct 2021 11:17:47 +0000
Subject: [PATCH] Disabled calendar events from user session Subject: [PATCH] Disabled calendar events from user session

View File

@ -1,4 +1,4 @@
From 12fd2083761c1d432a2b505a210d1289b2b1624f Mon Sep 17 00:00:00 2001 From 9d4edfc419cdb2868a6a69bf1ed4565478789a35 Mon Sep 17 00:00:00 2001
From: David McKinney <mckinney@subgraph.com> From: David McKinney <mckinney@subgraph.com>
Date: Wed, 8 Jul 2020 14:07:06 +0000 Date: Wed, 8 Jul 2020 14:07:06 +0000
Subject: [PATCH] Remove calendar server, fix build Subject: [PATCH] Remove calendar server, fix build
@ -12,10 +12,10 @@ Subject: [PATCH] Remove calendar server, fix build
5 files changed, 9 insertions(+), 9 deletions(-) 5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
index 2f047bb..6484cdc 100644 index 68e8bd1..16efaeb 100644
--- a/js/dbusServices/meson.build --- a/js/dbusServices/meson.build
+++ b/js/dbusServices/meson.build +++ b/js/dbusServices/meson.build
@@ -26,7 +26,7 @@ foreach service, dir : dbus_services @@ -27,7 +27,7 @@ foreach service, dir : dbus_services
serviceconf = configuration_data() serviceconf = configuration_data()
serviceconf.set('service', service) serviceconf.set('service', service)
@ -25,12 +25,12 @@ index 2f047bb..6484cdc 100644
configure_file( configure_file(
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index d86879a..c23ab0b 100644 index 58f66cd..1dc4729 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -18,8 +18,8 @@ cogl_pc = 'mutter-cogl-' + mutter_api_version @@ -19,8 +19,8 @@ cogl_pango_pc = 'mutter-cogl-pango-' + mutter_api_version
cogl_pango_pc = 'mutter-cogl-pango-' + mutter_api_version
libmutter_pc = 'libmutter-' + mutter_api_version libmutter_pc = 'libmutter-' + mutter_api_version
libmutter_test_pc = 'libmutter-test-' + mutter_api_version
-ecal_req = '>= 3.33.1' -ecal_req = '>= 3.33.1'
-eds_req = '>= 3.33.1' -eds_req = '>= 3.33.1'
@ -39,7 +39,7 @@ index d86879a..c23ab0b 100644
gcr_req = '>= 3.7.5' gcr_req = '>= 3.7.5'
gio_req = '>= 2.56.0' gio_req = '>= 2.56.0'
gi_req = '>= 1.49.1' gi_req = '>= 1.49.1'
@@ -71,8 +71,8 @@ else @@ -72,8 +72,8 @@ else
endif endif
atk_bridge_dep = dependency('atk-bridge-2.0') atk_bridge_dep = dependency('atk-bridge-2.0')
@ -50,7 +50,7 @@ index d86879a..c23ab0b 100644
gcr_dep = dependency('gcr-base-3', version: gcr_req) gcr_dep = dependency('gcr-base-3', version: gcr_req)
gdk_x11_dep = dependency('gdk-x11-3.0') gdk_x11_dep = dependency('gdk-x11-3.0')
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
@@ -134,7 +134,7 @@ endif @@ -139,7 +139,7 @@ endif
mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir') mutter_typelibdir = mutter_dep.get_pkgconfig_variable('typelibdir')
python = find_program('python3') python = find_program('python3')
@ -60,7 +60,7 @@ index d86879a..c23ab0b 100644
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
diff --git a/src/meson.build b/src/meson.build diff --git a/src/meson.build b/src/meson.build
index a7c56bb..3118e67 100644 index 53b8b52..5fa9fdf 100644
--- a/src/meson.build --- a/src/meson.build
+++ b/src/meson.build +++ b/src/meson.build
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
@ -73,10 +73,10 @@ index a7c56bb..3118e67 100644
subdir('st') subdir('st')
subdir('tray') subdir('tray')
diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build
index a378a7e..f2a37ba 100644 index f311db6..8f7bba4 100644
--- a/subprojects/extensions-app/js/meson.build --- a/subprojects/extensions-app/js/meson.build
+++ b/subprojects/extensions-app/js/meson.build +++ b/subprojects/extensions-app/js/meson.build
@@ -5,7 +5,7 @@ launcherconf.set('PACKAGE_VERSION', meson.project_version()) @@ -9,7 +9,7 @@ endif
launcherconf.set('prefix', prefix) launcherconf.set('prefix', prefix)
launcherconf.set('libdir', libdir) launcherconf.set('libdir', libdir)
launcherconf.set('pkgdatadir', pkgdatadir) launcherconf.set('pkgdatadir', pkgdatadir)
@ -86,10 +86,10 @@ index a378a7e..f2a37ba 100644
configure_file( configure_file(
input: prgname + '.in', input: prgname + '.in',
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index 4acd94c..c6bdd5f 100644 index 6143eef..a619f63 100644
--- a/subprojects/extensions-app/meson.build --- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build +++ b/subprojects/extensions-app/meson.build
@@ -35,7 +35,7 @@ localedir = join_paths(datadir, 'locale') @@ -44,7 +44,7 @@ localedir = join_paths(datadir, 'locale')
metainfodir = join_paths(datadir, 'metainfo') metainfodir = join_paths(datadir, 'metainfo')
servicedir = join_paths(datadir, 'dbus-1', 'services') servicedir = join_paths(datadir, 'dbus-1', 'services')

View File

@ -1,4 +1,4 @@
From 38a41a143b97b7dcf0512d6509e61d11582e681d Mon Sep 17 00:00:00 2001 From 5e5da06bd97175bed4a2719e5e67a5b2b51e4efc Mon Sep 17 00:00:00 2001
From: David McKinney <mckinney@subgraph.com> From: David McKinney <mckinney@subgraph.com>
Date: Fri, 12 Feb 2021 13:58:36 +0000 Date: Fri, 12 Feb 2021 13:58:36 +0000
Subject: [PATCH] Remove log out label from power off in status UI Subject: [PATCH] Remove log out label from power off in status UI

View File

@ -1,4 +1,4 @@
From 66351cb08cf4e71d5b30dfcd4a47fd69eb49c116 Mon Sep 17 00:00:00 2001 From 4398d05df199e3c63d1af8de0774582d430368d5 Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com> From: brl <bruce@subgraph.com>
Date: Sun, 24 Dec 2017 17:44:02 -0500 Date: Sun, 24 Dec 2017 17:44:02 -0500
Subject: [PATCH] do not use python path from build environment Subject: [PATCH] do not use python path from build environment

View File

@ -1,4 +1,4 @@
From 681362d7640885a9cc9a97b50292e7810e4385a7 Mon Sep 17 00:00:00 2001 From fa02a178a28487474df5c550116f6379b872c63e Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com> From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 5 Oct 2021 11:34:09 +0000 Date: Tue, 5 Oct 2021 11:34:09 +0000
Subject: [PATCH] Citadel Gnome Shell changes Subject: [PATCH] Citadel Gnome Shell changes

View File

@ -20,7 +20,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}
file://0002-Citadel-Gnome-Shell-changes.patch \ file://0002-Citadel-Gnome-Shell-changes.patch \
" "
SRC_URI[archive.sha256sum] = "52f971e85140e5de74b9369ef6656e49ce95af1f232fc1e0df1f046129ab4f65" SRC_URI[archive.sha256sum] = "5f742456dfe00605c0f090a3728ca62797bc49e50af852bbd7285da1a0517ff6"
DEPENDS = " \ DEPENDS = " \

View File

@ -19,7 +19,7 @@ DEPENDS = " \
GNOMEBASEBUILDCLASS = "meson" GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even
SRC_URI[archive.sha256sum] = "b016d89efc3fbc2a85a8ea664077a06158a462c03c222d82478ce01531d5390c" SRC_URI[archive.sha256sum] = "c319b1405501b8c7693e616f48eced41695d2e786148ca5f9e27bc7d98f4aeb1"
EXTRA_OEMESON = "-Ddocs=false -Dnautilus_extension=false -Dsearch_provider=false" EXTRA_OEMESON = "-Ddocs=false -Dnautilus_extension=false -Dsearch_provider=false"

View File

@ -5,7 +5,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz \ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz \
" "
SRC_URI[sha256sum] = "e0a1508f441686c3a20dfec48af533b19a4b2e017c18eaee31dccdb7d292505b" SRC_URI[sha256sum] = "0faada983dc6b0bc409cb34c1713c1f3267e67c093f86b1e3b17db6100a3ddf4"
S = "${WORKDIR}/gtk-${PV}" S = "${WORKDIR}/gtk-${PV}"

View File

@ -49,7 +49,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}
file://0001-Citadel-changes-to-Mutter.patch \ file://0001-Citadel-changes-to-Mutter.patch \
" "
SRC_URI[archive.sha256sum] = "fa80a1a744044d88ebfd677ff03203d67705ed2cd624ea06cbb8b58948cdf89e" SRC_URI[archive.sha256sum] = "58e63fd0bc43f35134f21313aff4aebf92c829d6df4dc99a044a1e376691e3f3"
# x11 is still mandatory - see meson.build # x11 is still mandatory - see meson.build
REQUIRED_DISTRO_FEATURES = "x11 systemd" REQUIRED_DISTRO_FEATURES = "x11 systemd"

View File

@ -18,8 +18,8 @@ GIR_MESON_OPTION = 'gir'
inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection
SRCREV = "a913a6de14047c1939b84617f2dd483d37e89194" SRCREV = "956d3bbd265279c296c56d9fb5ada1fee94768ee"
SRC_URI = "git://gitlab.gnome.org/GNOME/vte.git;protocol=https;branch=vte-0-64" SRC_URI = "git://gitlab.gnome.org/GNOME/vte.git;protocol=https;branch=vte-0-66"
# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) # vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"