diff options
Diffstat (limited to 'meta-gnome')
242 files changed, 5378 insertions, 2519 deletions
diff --git a/meta-gnome/README b/meta-gnome/README.md index a11815fb15..fbb0d72476 100644 --- a/meta-gnome/README +++ b/meta-gnome/README.md @@ -2,17 +2,15 @@ Dependencies ------------ This layer depends on: -URI: git://github.com/openembedded/oe-core.git +URI: git://git.openembedded.org/openembedded-core branch: master -revision: HEAD -URI: git://github.com/openembedded/meta-oe.git +URI: git://git.openembedded.org/meta-openembedded branch: master -revision: HEAD Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> diff --git a/meta-gnome/classes/clutter.bbclass b/meta-gnome/classes/clutter.bbclass new file mode 100644 index 0000000000..24b53a13e4 --- /dev/null +++ b/meta-gnome/classes/clutter.bbclass @@ -0,0 +1,18 @@ +def get_minor_dir(v): + import re + m = re.match(r"^([0-9]+)\.([0-9]+)", v) + return "%s.%s" % (m.group(1), m.group(2)) + +def get_real_name(n): + import re + m = re.match(r"^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?", n) + return "%s" % (m.group(1)) + +VERMINOR = "${@get_minor_dir("${PV}")}" +REALNAME = "${@get_real_name("${BPN}")}" + +SRC_URI = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive" +S = "${WORKDIR}/${REALNAME}-${PV}" + +CLUTTERBASEBUILDCLASS ??= "autotools" +inherit ${CLUTTERBASEBUILDCLASS} pkgconfig gtk-doc gettext diff --git a/meta-gnome/classes/gnome-help.bbclass b/meta-gnome/classes/gnome-help.bbclass index 967091ba45..750670ae24 100644 --- a/meta-gnome/classes/gnome-help.bbclass +++ b/meta-gnome/classes/gnome-help.bbclass @@ -9,14 +9,12 @@ # else # pack all help files to ${PN}-help-<lingua> -FILES_${PN}-help = "${datadir}/*/translations" - # Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1 -PACKAGES_append = " ${PN}-help" -FILES_${PN}-help = "${datadir}/help" -RRECOMMENDS_${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}" +PACKAGES:append = " ${PN}-help" +FILES:${PN}-help = "${datadir}/help" +RRECOMMENDS:${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then rm -rf ${D}${datadir}/help/* fi @@ -55,15 +53,15 @@ python gnome_do_split_help() { ln = legitimize_package_name(l) pkg = pn + '-help-' + ln packages.append(pkg) - d.setVar('FILES_' + pkg, os.path.join(datadir, 'help', l)) - d.setVar('RRECOMMENDS_' + pkg, '%syelp' % mlprefix) - d.setVar('SUMMARY_' + pkg, '%s - %s help' % (summary, l)) - d.setVar('DESCRIPTION_' + pkg, '%s This package contains language help files for the %s locale.' % (description, l)) + d.setVar('FILES:' + pkg, os.path.join(datadir, 'help', l)) + d.setVar('RRECOMMENDS:' + pkg, '%syelp' % mlprefix) + d.setVar('SUMMARY:' + pkg, '%s - %s help' % (summary, l)) + d.setVar('DESCRIPTION:' + pkg, '%s This package contains language help files for the %s locale.' % (description, l)) if locale_section: - d.setVar('SECTION_' + pkg, locale_section) + d.setVar('SECTION:' + pkg, locale_section) d.setVar('PACKAGES', ' '.join(packages)) } -PACKAGESPLITFUNCS_prepend = "gnome_do_split_help " +PACKAGESPLITFUNCS:prepend = "gnome_do_split_help " diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 7aa9507eb5..75764e64c7 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -6,15 +6,26 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "gnome-layer" BBFILE_PATTERN_gnome-layer := "^${LAYERDIR}/" -BBFILE_PRIORITY_gnome-layer = "7" +BBFILE_PRIORITY_gnome-layer = "5" # auto-pack gnome help files -IMAGE_LINGUAS_COMPLEMENTARY_append = " ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','*-help-%s','',d)}" +IMAGE_LINGUAS_COMPLEMENTARY:append = " ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','*-help-%s','',d)}" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_gnome-layer = "1" -LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer" +LAYERDEPENDS_gnome-layer = "core openembedded-layer networking-layer meta-python" -LAYERSERIES_COMPAT_gnome-layer = "thud warrior zeus dunfell" +LAYERSERIES_COMPAT_gnome-layer = "scarthgap" + +SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += "\ + faenza-icon-theme->gdk-pixbuf \ + faenza-icon-theme->gtk+3 \ +" + +BBFILES_DYNAMIC += " \ + virtualization-layer:${LAYERDIR}/dynamic-layers/meta-virtualization/*/*/*.bb \ + virtualization-layer:${LAYERDIR}/dynamic-layers/meta-virtualization/*/*/*.bbappend \ + security:${LAYERDIR}/dynamic-layers/meta-security/*/*/*.bb \ +" diff --git a/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.0.bb b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.0.bb new file mode 100644 index 0000000000..b9ee0e60d5 --- /dev/null +++ b/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "Remote desktop daemon for GNOME using pipewire." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gettext gsettings features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI[archive.sha256sum] = "e75ce17c12a6d39254dc309c31514e5ef15763f136612d641c5f6f4445e00ac4" + +DEPENDS = " \ + asciidoc-native \ + libdrm \ + libei \ + libepoxy \ + cairo \ + glib-2.0 \ + pipewire \ + polkit \ + libnotify \ + libopus \ + libsecret \ + nv-codec-headers \ + tpm2-tss \ +" + +PACKAGECONFIG ??= " \ + rdp \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ +" + +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,pipewire-native wireplumber-native dbus-native" +PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver" +PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon" +PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" +FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d" diff --git a/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.0.bb b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.0.bb new file mode 100644 index 0000000000..44fdd2dbea --- /dev/null +++ b/meta-gnome/dynamic-layers/meta-virtualization/recipes-gnome/gnome-boxes/gnome-boxes_46.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "A simple GNOME application to access virtual machines." +SECTION = "network" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://copyright;md5=a65e9b0c9f78617732f09f68fc4ef79a" + +GNOMEBASEBUILDCLASS = "meson" + +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" + +DEPENDS = " \ + glib-2.0 \ + desktop-file-utils-native \ + libarchive \ + libgudev \ + libhandy \ + libosinfo \ + libportal \ + libsecret \ + libsoup \ + libvirt-glib \ + mtools \ + spice-gtk \ + tracker \ + webkitgtk3 \ + appstream-glib-native \ + spice-protocol \ + yelp-tools \ +" + +RDEPENDS:${PN} = "glib-2.0-dev libvirt-virsh qemu-common qemu-system-x86-64 genisoimage" + +inherit gnomebase gsettings pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check + +SRC_URI[archive.sha256sum] = "67eeb5e989294958b25c397cfc5615ff65f44315c700010f0b9e336e6f3407cb" + +GIR_MESON_OPTION = "" +VALA_MESON_OPTION = "" + +FILES:${PN} += "${datadir}" + +INSANE_SKIP:${PN} = "dev-deps" diff --git a/meta-gnome/files/static-passwd-meta-gnome b/meta-gnome/files/static-passwd-meta-gnome new file mode 100644 index 0000000000..4502d8bd10 --- /dev/null +++ b/meta-gnome/files/static-passwd-meta-gnome @@ -0,0 +1 @@ +gdm:x:680:nogroup::/:/bin/nologin
\ No newline at end of file diff --git a/meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb b/meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb new file mode 100644 index 0000000000..4d26817107 --- /dev/null +++ b/meta-gnome/recipes-connectivity/folks/folks_0.15.8.bb @@ -0,0 +1,28 @@ +SUMMARY = "Folks is a contact aggregation library." +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = " \ + glib-2.0 \ + libgee \ +" + +EXTRA_OEMESON += "-Dtests=false -Db_lto=false " + +CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration" +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +PACKAGECONFIG[eds] = "-Deds_backend=true,-Deds_backend=false,evolution-data-server" +PACKAGECONFIG[bluez] = "-Dbluez_backend=true,-Dbluez_backend=false,evolution-data-server" +PACKAGECONFIG[ofono] = "-Deds_backend=true -Dofono_backend=true,-Dofono_backend=false,evolution-data-server" +PACKAGECONFIG[telepathy] = "-Dtelepathy_backend=true,-Dtelepathy_backend=false,telepathy-glib dbus-glib" +PACKAGECONFIG[import_tool] = "-Dimport_tool=true,-Dimport_tool=false,libxml2" +PACKAGECONFIG[inspect_tool] = "-Dinspect_tool=true,-Dinspect_tool=false" + +PACKAGECONFIG ??= "" + +inherit pkgconfig gnomebase gettext gobject-introspection vala features_check + +SRC_URI[archive.sha256sum] = "954a6afb3e378f01d310fd443790f235cb0eb71e2139cff4f05f09ab725e49c2" diff --git a/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch new file mode 100644 index 0000000000..1e0640a666 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch @@ -0,0 +1,51 @@ +From a300be5877f35379bb569313eec901bda9c8d762 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 30 Apr 2023 22:08:39 -0700 +Subject: [PATCH] meson: Use PKG_CONFIG_SYSROOT_DIR when using pkg-config + +OE cross-builds and absolute paths found by pkg-config points to +non-sysroot'ed locations which are not correct as they point into native +sysroot from build machine which is incorrect. + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index d563dd08..9b72aeb4 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,6 +38,9 @@ metadata_dir = meson.project_source_root() / 'bindings'/ 'metadata' + po_dir = meson.project_source_root() / 'po' + vapi_dir = meson.project_source_root() / 'bindings' / 'vapi' + ++# pkg-config sysroot location ++pkgconf_sysroot = run_command('python3', '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() ++ + # Compiler configuration + add_project_arguments([ + # Make sure Meson can find custom VAPIs +@@ -120,7 +123,7 @@ icu_uc = declare_dependency( + if libunwind_dep.found() + # We need to add native lib to the search path for these so Flatpak + # builds can find it. +- unwind_lib = libunwind_dep.get_variable(pkgconfig: 'libdir') ++ unwind_lib = pkgconf_sysroot + libunwind_dep.get_variable(pkgconfig: 'libdir') + libunwind = declare_dependency( + dependencies: [ + valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), +@@ -207,8 +210,7 @@ vala_unit_proj = subproject( + vala_unit_dep = vala_unit_proj.get_variable('vala_unit_dep') + + # Language detection +- +-iso_codes_dir = iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' ++iso_codes_dir = pkgconf_sysroot + iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' + + iso_639_xml = get_option('iso_639_xml') + if iso_639_xml == '' +-- +2.40.1 + diff --git a/meta-gnome/recipes-connectivity/geary/geary_44.1.bb b/meta-gnome/recipes-connectivity/geary/geary_44.1.bb new file mode 100644 index 0000000000..decae6b2c7 --- /dev/null +++ b/meta-gnome/recipes-connectivity/geary/geary_44.1.bb @@ -0,0 +1,61 @@ +SUMMARY = "Geary is an email application built around conversations, for the GNOME 3 desktop." +SECTION = "network" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2" + +DEPENDS = " \ + appstream-glib \ + cairo \ + desktop-file-utils-native \ + enchant2 \ + evolution-data-server \ + folks \ + gcr3 \ + gmime \ + gnome-online-accounts \ + gsound \ + gspell \ + gtk+3 \ + icu \ + iso-codes \ + json-glib \ + libhandy \ + libical \ + libpeas \ + libsecret \ + libstemmer \ + libxml2 \ + sqlite3 \ + webkitgtk3 \ +" + +RDEPENDS:${PN} = "gnome-keyring" + +inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check + +SRC_URI = " \ + git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ + file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ +" + +S = "${WORKDIR}/git" +SRCREV = "37c378a563d5b1c269d57c34671edc940d1cd180" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" + +GIR_MESON_OPTION = "" +EXTRA_OEMESON = "-Dprofile=release" + +PACKAGECONFIG[libunwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" +PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" +PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" + +PACKAGECONFIG ??= "" +# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] +#| return NULL; +#| ^~~~ +CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" + +FILES:${PN} += "${datadir}" + diff --git a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb new file mode 100644 index 0000000000..8bd37f754c --- /dev/null +++ b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb @@ -0,0 +1,30 @@ +SUMMARY = "A VNC client viewer widget for GTK" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4339efb5fd592e45b9e2641de9fe734f" + +DEPENDS = " \ + gdk-pixbuf \ + glib-2.0 \ + gnutls \ + gtk+3 \ + libgcrypt \ + libx11 \ + zlib \ +" + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" +VALA_MESON_OPTION = "with-vala" +VALA_MESON_ENABLE_FLAG ?= 'enabled' +VALA_MESON_DISABLE_FLAG ?= 'disabled' + +PACKAGECONFIG[pulseaudio] = "-Dpulseaudio=enabled,-Dpulseaudio=disabled,pulseaudio" +PACKAGECONFIG[sasl] = "-Dsasl=enabled,-Dsasl=disabled,cyrus-sasl" + +PACKAGECONFIG ??= "pulseaudio sasl" + +inherit pkgconfig gnomebase gettext gobject-introspection vala features_check + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +SRC_URI[archive.sha256sum] = "512763ac4e0559d0158b6682ca5dd1a3bd633f082f5e4349d7158e6b5f80f1ce" diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb index 3b1698e72e..9a4dad35d1 100644 --- a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.28.bb +++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb @@ -1,26 +1,33 @@ SUMMARY = "NetworkManager GUI library" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 networkmanager" +DEPENDS = "glib-2.0 gtk+3 gtk4 networkmanager" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc gettext vala features_check -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)} opengl" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.md5sum] = "094c45d7694b153612cbdc3c713edcb5" -SRC_URI[archive.sha256sum] = "4af69552d131a3b2b8b6a2df584044258bf588448dcdb4bddfa12a07c134b726" +SRC_URI[archive.sha256sum] = "53a6fb2b190ad37c5986caed3e98bede7c3c602399ee4f93c8fc054303d76dab" PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" PACKAGECONFIG[iso_codes] = "-Diso_codes=true,-Diso_codes=false,iso-codes,iso-codes" PACKAGECONFIG[mobile_broadband_provider_info] = "-Dmobile_broadband_provider_info=true,-Dmobile_broadband_provider_info=false,mobile-broadband-provider-info,mobile-broadband-provider-info" +# for gnome-control-center >= 42 +EXTRA_OEMESON = "-Dlibnma_gtk4=true" + # go introspection is not supported for mipsn32/riscv32, but vapi needs it # -EXTRA_OEMESON_mipsarchn32_append = " -Dvapi=false" -EXTRA_OEMESON_riscv32_append = " -Dvapi=false" +EXTRA_OEMESON:append:mipsarchn32 = " -Dvapi=false" +EXTRA_OEMESON:append:riscv32 = " -Dvapi=false" +EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false" GTKDOC_MESON_OPTION = "gtk_doc" + +do_install:append() { + # conflicts with the file provided by network-manager-applet + rm -f ${D}${datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +} diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch new file mode 100644 index 0000000000..eafd497ae2 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch @@ -0,0 +1,30 @@ +From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 3 Sep 2023 08:48:42 -0700 +Subject: [PATCH] linker-script: Do not export _IO_stdin_used + +This is glibc specific toolhain issue, it should have been handled in +toolchain instead of exposing to applications. This was done to fix + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835550 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + linker-script-binary.ver | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linker-script-binary.ver b/linker-script-binary.ver +index a2780c0..f030d35 100644 +--- a/linker-script-binary.ver ++++ b/linker-script-binary.ver +@@ -1,6 +1,5 @@ + { + global: +- _IO_stdin_used; + local: + *; + }; +-- +2.42.0 + diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb deleted file mode 100644 index 60e4c22050..0000000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.18.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "GTK+ applet for NetworkManager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "gtk+3 libnma libnotify libsecret networkmanager iso-codes nss" - -GNOMEBASEBUILDCLASS = "meson" -inherit features_check gnomebase gsettings gtk-icon-cache gettext - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.sha256sum] = "ddbb400ace804b59cc513611ce9701f7ef3f00de151dbbfb96284c8c1ef2b18b" - -# We don't not have ubuntu's appindicator (yet?) -EXTRA_OEMESON = "-Dappindicator=no" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" -PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" - -RDEPENDS_${PN} =+ "networkmanager" - -FILES_${PN} += " \ - ${datadir}/nm-applet/ \ - ${datadir}/libnma/wifi.ui \ - ${datadir}/metainfo \ -" diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb new file mode 100644 index 0000000000..10e514775a --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "GTK+ applet for NetworkManager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss" + +inherit features_check gnomebase gsettings gtk-icon-cache gettext pkgconfig + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" + +SRC_URI[archive.sha256sum] = "a84704487ea3afe1485c47fb2ab598b8f779f540ae0dcbf0a1c5f85e64a7e253" + +# We don't not have ubuntu's appindicator (yet?) +EXTRA_OEMESON = "-Dappindicator=no" +# We currently don't build NetworkManager with libteamdctl support +EXTRA_OEMESON += "-Dteam=false" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" +PACKAGECONFIG[modemmanager] = "-Dwwan=true, -Dwwan=false, modemmanager" +PACKAGECONFIG[selinux] = "-Dselinux=true, -Dselinux=false, libselinux" + +RDEPENDS:${PN} =+ "networkmanager" + +FILES:${PN} += " \ + ${datadir}/nm-applet/ \ + ${datadir}/libnma/wifi.ui \ + ${datadir}/metainfo \ +" diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.1.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.1.0.bb deleted file mode 100644 index 3aaec3cdd2..0000000000 --- a/meta-gnome/recipes-extended/gparted/gparted_1.1.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "A partition editor to graphically manage disk partitions " -HOMEPAGE = "http://gparted.org/index.php" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit features_check autotools pkgconfig python3native gnome-help gtk-icon-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ - file://0001-Install-polkit-action-unconditionally-executable-pke.patch \ -" -SRC_URI[md5sum] = "0da45cb522d766dfb4886fb3bdbc2634" -SRC_URI[sha256sum] = "e2fe7b7afbc07e930491c00a05200c2682cc0576ca8f6da87245a000257f5924" - -DEPENDS += " \ - glib-2.0-native \ - yelp-tools-native \ - intltool-native \ - glib-2.0 \ - gtkmm3 \ - parted \ -" - -FILES_${PN} += " \ - ${datadir}/appdata \ - ${datadir}/icons \ -" - -PACKAGES += "${PN}-polkit" -FILES_${PN}-polkit = "${datadir}/polkit-1" - -RDEPENDS_${PN} = " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', '${PN}-polkit', '', d)} \ - dosfstools \ - mtools \ - e2fsprogs \ -" diff --git a/meta-gnome/recipes-extended/gparted/gparted_1.6.0.bb b/meta-gnome/recipes-extended/gparted/gparted_1.6.0.bb new file mode 100644 index 0000000000..ab2890679a --- /dev/null +++ b/meta-gnome/recipes-extended/gparted/gparted_1.6.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "A partition editor to graphically manage disk partitions " +HOMEPAGE = "http://gparted.org/index.php" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit autotools pkgconfig python3native gettext gnome-help gtk-icon-cache features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'file://0001-Install-polkit-action-unconditionally-executable-pke.patch', '', d)} \ +" +SRC_URI[sha256sum] = "9b9f51b3ce494ddcb59a55e1ae6679c09436604e331dbf5a536d60ded6c6ea5b" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gparted/files/gparted/" +UPSTREAM_CHECK_REGEX = "gparted-(?P<pver>\d+\.(\d+)+(\.\d+)+)" + +DEPENDS += " \ + glib-2.0-native \ + yelp-tools-native \ + intltool-native \ + glib-2.0 \ + gtkmm3 \ + parted \ +" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" +PACKAGECONFIG[polkit] = ",,polkit" + +FILES:${PN} += " \ + ${datadir}/appdata \ + ${datadir}/icons \ + ${datadir}/metainfo \ +" + +PACKAGES += "${PN}-polkit" +FILES:${PN}-polkit = "${datadir}/polkit-1" + +RDEPENDS:${PN} = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', '${PN}-polkit', '', d)} \ + dosfstools \ + mtools \ + e2fsprogs \ +" diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0001-Select-the-current-user-to-authenticate-with-by-defa.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0001-Select-the-current-user-to-authenticate-with-by-defa.patch new file mode 100644 index 0000000000..f8f7ec34f9 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0001-Select-the-current-user-to-authenticate-with-by-defa.patch @@ -0,0 +1,80 @@ +From: Utopia Maintenance Team + <pkg-utopia-maintainers@lists.alioth.debian.org> +Date: Mon, 30 Apr 2018 17:56:52 +0000 +Subject: Select the current user to authenticate with by default + +Bug: http://bugzilla.gnome.org/show_bug.cgi?id=596188 +Bug-Ubuntu: https://launchpad.net/bugs/435227 +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticationdialog.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +diff --git a/src/polkitgnomeauthenticationdialog.c b/src/polkitgnomeauthenticationdialog.c +index 743cc96..d307516 100644 +--- a/src/polkitgnomeauthenticationdialog.c ++++ b/src/polkitgnomeauthenticationdialog.c +@@ -138,7 +138,7 @@ user_combobox_changed (GtkComboBox *widget, + static void + create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + { +- int n; ++ int n, i, selected_index = 0; + GtkComboBox *combo; + GtkTreeIter iter; + GtkCellRenderer *renderer; +@@ -162,7 +162,7 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + + + /* For each user */ +- for (n = 0; dialog->priv->users[n] != NULL; n++) ++ for (i = 0, n = 0; dialog->priv->users[n] != NULL; n++) + { + gchar *gecos; + gchar *real_name; +@@ -224,6 +224,14 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + USERNAME_COL, dialog->priv->users[n], + -1); + ++ i++; ++ if (passwd->pw_uid == getuid ()) ++ { ++ selected_index = i; ++ g_free (dialog->priv->selected_user); ++ dialog->priv->selected_user = g_strdup (dialog->priv->users[n]); ++ } ++ + g_free (real_name); + g_object_unref (pixbuf); + } +@@ -252,8 +260,8 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + user_combobox_set_sensitive, + NULL, NULL); + +- /* Initially select the "Select user..." ... */ +- gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); ++ /* Select the default user */ ++ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), selected_index); + + /* Listen when a new user is selected */ + g_signal_connect (GTK_WIDGET (combo), +@@ -719,16 +727,13 @@ polkit_gnome_authentication_dialog_constructed (GObject *object) + gtk_widget_set_tooltip_markup (label, s); + g_free (s); + +- if (have_user_combobox) ++ /* Disable password entry and authenticate until have a user selected */ ++ if (have_user_combobox && gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->user_combobox)) == 0) + { +- /* ... and make the password entry and "Authenticate" button insensitive */ + gtk_widget_set_sensitive (dialog->priv->prompt_label, FALSE); + gtk_widget_set_sensitive (dialog->priv->password_entry, FALSE); + gtk_widget_set_sensitive (dialog->priv->auth_button, FALSE); + } +- else +- { +- } + + gtk_widget_realize (GTK_WIDGET (dialog)); + diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch new file mode 100644 index 0000000000..011fe6ef25 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch @@ -0,0 +1,34 @@ +From: Lars Uebernickel <lars@uebernic.de> +Date: Fri, 17 Oct 2014 15:35:25 +0200 +Subject: Auth dialog: Make the label wrap at 70 chars + +Because GtkWindow doesn't have a default width anymore. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=738688 +Bug-Ubuntu: https://launchpad.net/bugs/1382566 +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticationdialog.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/polkitgnomeauthenticationdialog.c b/src/polkitgnomeauthenticationdialog.c +index d307516..efd4185 100644 +--- a/src/polkitgnomeauthenticationdialog.c ++++ b/src/polkitgnomeauthenticationdialog.c +@@ -574,6 +574,7 @@ polkit_gnome_authentication_dialog_constructed (GObject *object) + g_free (s); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); ++ gtk_label_set_max_width_chars (GTK_LABEL (label), 70); + gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE, 0); + + /* secondary message */ +@@ -601,6 +602,7 @@ polkit_gnome_authentication_dialog_constructed (GObject *object) + } + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); ++ gtk_label_set_max_width_chars (GTK_LABEL (label), 70); + gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE, 0); + + /* user combobox */ diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch new file mode 100644 index 0000000000..a3759c4dcf --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch @@ -0,0 +1,138 @@ +From: Marc Deslauriers <marc.deslauriers@canonical.com> +Date: Mon, 30 Apr 2018 18:03:22 +0000 +Subject: Get user icon from accountsservice instead of looking in ~/.face + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=669857 +Bug-Ubuntu: https://launchpad.net/bugs/928249 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticationdialog.c | 107 ++++++++++++++++++++++++++++++---- + 1 file changed, 97 insertions(+), 10 deletions(-) + +diff --git a/src/polkitgnomeauthenticationdialog.c b/src/polkitgnomeauthenticationdialog.c +index efd4185..565da87 100644 +--- a/src/polkitgnomeauthenticationdialog.c ++++ b/src/polkitgnomeauthenticationdialog.c +@@ -135,6 +135,102 @@ user_combobox_changed (GtkComboBox *widget, + } + } + ++static GdkPixbuf * ++get_user_icon (char *username) ++{ ++ GError *error; ++ GDBusConnection *connection; ++ GVariant *find_user_result; ++ GVariant *get_icon_result; ++ GVariant *icon_result_variant; ++ const gchar *user_path; ++ const gchar *icon_filename; ++ GdkPixbuf *pixbuf; ++ ++ error = NULL; ++ connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); ++ ++ if (connection == NULL) ++ { ++ g_warning ("Unable to connect to system bus: %s", error->message); ++ g_error_free (error); ++ return NULL; ++ } ++ ++ find_user_result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.Accounts", ++ "/org/freedesktop/Accounts", ++ "org.freedesktop.Accounts", ++ "FindUserByName", ++ g_variant_new ("(s)", ++ username), ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ ++ if (find_user_result == NULL) ++ { ++ g_warning ("Accounts couldn't find user: %s", error->message); ++ g_error_free (error); ++ return NULL; ++ } ++ ++ user_path = g_variant_get_string (g_variant_get_child_value (find_user_result, 0), ++ NULL); ++ ++ get_icon_result = g_dbus_connection_call_sync (connection, ++ "org.freedesktop.Accounts", ++ user_path, ++ "org.freedesktop.DBus.Properties", ++ "Get", ++ g_variant_new ("(ss)", ++ "org.freedesktop.Accounts.User", ++ "IconFile"), ++ G_VARIANT_TYPE ("(v)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ ++ g_variant_unref (find_user_result); ++ ++ if (get_icon_result == NULL) ++ { ++ g_warning ("Accounts couldn't find user icon: %s", error->message); ++ g_error_free (error); ++ return NULL; ++ } ++ ++ g_variant_get_child (get_icon_result, 0, "v", &icon_result_variant); ++ icon_filename = g_variant_get_string (icon_result_variant, NULL); ++ ++ if (icon_filename == NULL) ++ { ++ g_warning ("Accounts didn't return a valid filename for user icon"); ++ pixbuf = NULL; ++ } ++ else ++ { ++ /* TODO: we probably shouldn't hard-code the size to 16x16 */ ++ pixbuf = gdk_pixbuf_new_from_file_at_size (icon_filename, ++ 16, ++ 16, ++ &error); ++ if (pixbuf == NULL) ++ { ++ g_warning ("Couldn't open user icon: %s", error->message); ++ g_error_free (error); ++ } ++ } ++ ++ g_variant_unref (icon_result_variant); ++ g_variant_unref (get_icon_result); ++ ++ return pixbuf; ++} ++ + static void + create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + { +@@ -197,16 +293,7 @@ create_user_combobox (PolkitGnomeAuthenticationDialog *dialog) + g_free (gecos); + + /* Load users face */ +- pixbuf = NULL; +- if (passwd->pw_dir != NULL) +- { +- gchar *path; +- path = g_strdup_printf ("%s/.face", passwd->pw_dir); +- /* TODO: we probably shouldn't hard-code the size to 16x16 */ +- pixbuf = gdk_pixbuf_new_from_file_at_scale (path, 16, 16, TRUE, NULL); +- g_free (path); +- } +- ++ pixbuf = get_user_icon (dialog->priv->users[n]); + /* fall back to avatar-default icon */ + if (pixbuf == NULL) + { diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch new file mode 100644 index 0000000000..2c9c5bb16b --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch @@ -0,0 +1,48 @@ +From: Jeffrey Knockel <jeff250@gmail.com> +Date: Mon, 30 Apr 2018 18:05:20 +0000 +Subject: Use fresh X11 timestamps when displaying authentication dialog + +This circumvents focus-stealing prevention. + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=676076 +Bug-Debian: https://bugs.debian.org/684300 +Bug-Ubuntu: https://launchpad.net/bugs/946171 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/polkitgnomeauthenticator.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/polkitgnomeauthenticator.c b/src/polkitgnomeauthenticator.c +index 23163b4..e57d76e 100644 +--- a/src/polkitgnomeauthenticator.c ++++ b/src/polkitgnomeauthenticator.c +@@ -26,6 +26,7 @@ + #include <sys/types.h> + #include <pwd.h> + #include <glib/gi18n.h> ++#include <gdk/gdkx.h> + + #include <polkit/polkit.h> + #include <polkitagent/polkitagent.h> +@@ -306,7 +307,17 @@ session_request (PolkitAgentSession *session, + } + + gtk_widget_show_all (GTK_WIDGET (authenticator->dialog)); +- gtk_window_present (GTK_WINDOW (authenticator->dialog)); ++ GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (authenticator->dialog)); ++ ++ if (GDK_IS_X11_WINDOW (window)) ++ { ++ gtk_window_present_with_time (GTK_WINDOW (authenticator->dialog), gdk_x11_get_server_time (window)); ++ } ++ else ++ { ++ gtk_window_present (GTK_WINDOW (authenticator->dialog)); ++ } ++ + password = polkit_gnome_authentication_dialog_run_until_response_for_prompt (POLKIT_GNOME_AUTHENTICATION_DIALOG (authenticator->dialog), + modified_request, + echo_on, + diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch new file mode 100644 index 0000000000..7eee12a920 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch @@ -0,0 +1,29 @@ +From 334abb04ff953dabec63a91094de43e3cf064d7d Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Fri, 24 Feb 2023 17:29:24 +0100 +Subject: [PATCH] configure.ac: disable gnome-tools that are not provided + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 24eb724..02fccbd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,8 +33,8 @@ LT_INIT + # GNOME + # ***** + +-GNOME_DEBUG_CHECK +-GNOME_COMPILE_WARNINGS([maximum]) ++#GNOME_DEBUG_CHECK ++#GNOME_COMPILE_WARNINGS([maximum]) + + #### gcc warning flags + +-- +2.34.1 + diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/polkit-gnome-authentication-agent-1.desktop new file mode 100644 index 0000000000..c45acfa543 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome/polkit-gnome-authentication-agent-1.desktop @@ -0,0 +1,87 @@ +[Desktop Entry] +Name=PolicyKit Authentication Agent +Name[ar]=مدير الاستيثاق PolicyKit +Name[be]=PolicyKit - аґент аўтэнтыфікацыі +Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Name[ca]=Agent d'autenticació del PolicyKit +Name[cs]=Ověřovací agent PolicyKit +Name[da]=Godkendelsesprogrammet PolicyKit +Name[de]=Legitimationsdienst von PolicyKit +Name[el]=Πράκτορας πιστοποίησης PolicyKit +Name[en_GB]=PolicyKit Authentication Agent +Name[es]=Agente de autenticación de PolicyKit +Name[eu]=PolicyKit autentifikatzeko agentea +Name[fi]=PolicytKit-tunnistautumisohjelma +Name[fr]=Agent d'authentification de PolicyKit +Name[gl]=Axente de autenticación PolicyKit +Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Name[hu]=PolicyKit hitelesítési ügynök +Name[it]=Agente di autenticazione per PolicyKit +Name[ja]=PolicyKit 認証エージェント +Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Name[lt]=PolicyKit tapatybės nustatymo agentas +Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Name[pl]=Agent uwierzytelniania PolicyKit +Name[pt]=Agente de Autenticação PolicyKit +Name[pt_BR]=Agente de autenticação PolicyKit +Name[ro]=Agent de autentificare PolicyKit +Name[sk]=Agent PolicyKit na overovanie totožnosti +Name[sl]=PolicyKit program overjanja +Name[sv]=Autentiseringsagent för PolicyKit +Name[ta]=PolicyKit அங்கீகார முகவர் +Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Name[uk]=Агент автентифікації PolicyKit +Name[zh_CN]=PolicyKit 认证代理 +Name[zh_HK]=PolicyKit 驗證代理程式 +Name[zh_TW]=PolicyKit 驗證代理程式 +Comment=PolicyKit Authentication Agent +Comment[ar]=مدير الاستيثاق PolicyKit +Comment[be]=PolicyKit - аґент аўтэнтыфікацыі +Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Comment[ca]=Agent d'autenticació del PolicyKit +Comment[cs]=Ověřovací agent PolicyKit +Comment[da]=Godkendelsesprogrammet PolicyKit +Comment[de]=Legitimationsdienst von PolicyKit +Comment[el]=Πράκτορας πιστοποίησης PolicyKit +Comment[en_GB]=PolicyKit Authentication Agent +Comment[es]=Agente de autenticación de PolicyKit +Comment[eu]=PolicyKit autentifikatzeko agentea +Comment[fi]=PolicytKit-tunnistautumisohjelma +Comment[fr]=Agent d'authentification de PolicyKit +Comment[gl]=Axente de autenticación PolicyKit +Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Comment[hu]=PolicyKit hitelesítési ügynök +Comment[it]=Agente di autenticazione per PolicyKit +Comment[ja]=PolicyKit 認証エージェント +Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Comment[lt]=PolicyKit tapatybės nustatymo agentas +Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Comment[pl]=Agent uwierzytelniania PolicyKit +Comment[pt]=Agente de Autenticação PolicyKit +Comment[pt_BR]=Agente de autenticação PolicyKit +Comment[ro]=Agent de autentificare PolicyKit +Comment[sk]=Agent PolicyKit na overovanie totožnosti +Comment[sl]=PolicyKit program overjanja +Comment[sv]=Autentiseringsagent för PolicyKit +Comment[ta]=PolicyKit அங்கீகார முகவர் +Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Comment[uk]=Агент автентифікації PolicyKit +Comment[zh_CN]=PolicyKit 认证代理 +Comment[zh_HK]=PolicyKit 驗證代理程式 +Comment[zh_TW]=PolicyKit 驗證代理程式 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +Terminal=false +Type=Application +Categories= +NoDisplay=true +OnlyShowIn=GNOME; diff --git a/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb new file mode 100644 index 0000000000..e0e4a59d24 --- /dev/null +++ b/meta-gnome/recipes-extended/polkit-gnome/polkit-gnome_0.105.bb @@ -0,0 +1,29 @@ +SUMMARY = "PolicyKit-gnome provides an Authentication Agent for PolicyKit" +HOMEPAGE = "https://gitlab.gnome.org/Archive/policykit-gnome" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec" + +DEPENDS = "glib-2.0-native glib-2.0 gtk+3 polkit intltool-native" + +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = " \ + git://gitlab.gnome.org/Archive/policykit-gnome.git;protocol=https;branch=master \ + file://0001-Select-the-current-user-to-authenticate-with-by-defa.patch \ + file://0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch \ + file://0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch \ + file://0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch \ + file://0005-configure.ac-disable-gnome-tools-that-are-not-provid.patch \ + file://polkit-gnome-authentication-agent-1.desktop \ +" +SRCREV = "a0763a246a81188f60b0f9810143e49224dc752f" +S = "${WORKDIR}/git" + + +do_install:append() { + install -d ${D}${datadir}/applications + install -m644 ${WORKDIR}/polkit-gnome-authentication-agent-1.desktop \ + ${D}${datadir}/applications +} diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb new file mode 100644 index 0000000000..e0685f781d --- /dev/null +++ b/meta-gnome/recipes-gimp/babl/babl_0.1.108.bb @@ -0,0 +1,17 @@ +SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" + +GIR_MESON_OPTION = "enable-gir" +VALA_MESON_OPTION = "enable-vapi" + +inherit setuptools3 gnomebase gobject-introspection vala + +DEPENDS += "lcms" + +SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" +SRC_URI[sha256sum] = "26defe9deaab7ac4d0e076cab49c2a0d6ebd0df0c31fd209925a5f07edee1475" + +FILES:${PN} += "${libdir}/${BPN}-${@gnome_verdir("${PV}")}" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb deleted file mode 100644 index 173d5aa74b..0000000000 --- a/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" -LICENSE = "LGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" - -GNOMEBASEBUILDCLASS = "meson" - -GIR_MESON_OPTION = "enable-gir" - -inherit setuptools3 gnomebase gobject-introspection vala - -DEPENDS += "lcms" - -# https://bugs.llvm.org/show_bug.cgi?id=45555 -CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " -CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " - -SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[md5sum] = "b1a85d1f3d710407164848708f1f49f1" -SRC_URI[sha256sum] = "17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch deleted file mode 100644 index 6a49f1d7ce..0000000000 --- a/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 8 Feb 2020 14:29:52 +0100 -Subject: [PATCH] meson.build: Give note if sdl2 was found -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Configure output confused me a bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 9d5b484..296b5f3 100644 ---- a/meson.build -+++ b/meson.build -@@ -374,6 +374,7 @@ message('\n'.join(['', - ' OpenEXR: @0@'.format(openexr.found()), - ' rsvg: @0@'.format(librsvg.found()), - ' SDL: @0@'.format(sdl1.found()), -+' SDL2: @0@'.format(sdl2.found()), - ' libraw: @0@'.format(libraw.found()), - ' Jasper: @0@'.format(jasper.found()), - ' av libs: @0@'.format(avlibs_found), --- -2.21.0 - diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb index 77c30f7de9..34e001a5f7 100644 --- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb +++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.48.bb @@ -1,12 +1,11 @@ SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f1a8bfcbc85304df454b65d378b299c7" DEPENDS = " \ intltool-native \ babl \ glib-2.0 \ - pango \ cairo \ expat \ zlib \ @@ -14,23 +13,23 @@ DEPENDS = " \ json-glib \ " -GNOMEBASEBUILDCLASS = "meson" +DEPENDS:append:toolchain-clang = " openmp" +DEPENDS:remove:toolchain-clang:riscv32 = "openmp" +DEPENDS:remove:toolchain-clang:powerpc = "openmp" -inherit features_check gnomebase vala gobject-introspection +VALA_MESON_OPTION = "" -REQUIRED_DISTRO_FEATURES = "x11" +inherit features_check gnomebase gobject-introspection vala + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = " \ - https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ - file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ -" -SRC_URI[md5sum] = "3a8062add20effb6f92b4b614facbbd5" -SRC_URI[sha256sum] = "7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a" +SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "418c26d94be8805d7d98f6de0c6825ca26bd74fcacb6c188da47533d9ee28247" -PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" -PACKAGECONFIG_class-native = "libpng librsvg" +PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2" +PACKAGECONFIG:class-native = "libpng librsvg" PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" PACKAGECONFIG[gexiv2] = "-Dgexiv2=enabled,-Dgexiv2=disabled,gexiv2" @@ -39,14 +38,17 @@ PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" +PACKAGECONFIG[libraw] = "-Dlibraw=enabled,-Dlibraw=disabled,libraw" PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" -PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" -PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[pango] = "-Dpango=enabled -Dpangocairo=enabled,-Dpango=disabled -Dpangocairo=disabled,pango" +PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" +PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,libsdl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,libsdl2" PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" # There are a couple of non-symlink .so files installed into libdir, which need to go into main package -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/*.so \ ${libdir}/gegl-${SHPV}/*.json \ ${libdir}/gegl-${SHPV}/*.so \ diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch new file mode 100644 index 0000000000..618b4cc7a7 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-configure-Keep-first-line-of-compiler-version-string.patch @@ -0,0 +1,30 @@ +From 5711ccfab40e304ced7f5be39a4083e3fcecff91 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 22:22:41 -0700 +Subject: [PATCH] configure: Keep first line of compiler version string + +Full output of cc -v may contain additional information which could +contain build path information, which is unnessasary + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/926] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c25415d..68707a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -599,7 +599,7 @@ fi + for CC_VERSION_OPT in $CC_VERSION_OPTS; do + # We run $CC, and escape and format its output, in a single step, + # since some shells expand escape sequences in "echo" arguments. +- CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" ++ CC_VERSION="`$CC $CC_VERSION_OPT 2>&1 | head -1 | sed -e 's/\\\\/\\\\\\\\\\\\\\\\/g;s/^/\\\\t/;s/$/\\\\n/' | tr -d '\n'`" + if test $? -eq 0; then + break + fi +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch new file mode 100644 index 0000000000..cec0055284 --- /dev/null +++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch @@ -0,0 +1,34 @@ +From c720df90dfe3a3e92e34bfb36a04cc792064a501 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 24 May 2023 22:39:02 -0700 +Subject: [PATCH] libtool: Do not add build time library paths to + LD_LIBRARY_PATH + +This does not serve much purpose on cross builds as it will add build +time paths which are only useful when trying to run these tools from +build area but when they are cross built this is not possible to run +them like this. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ltmain.sh b/ltmain.sh +index 134902c..068d74a 100644 +--- a/ltmain.sh ++++ b/ltmain.sh +@@ -5748,7 +5748,7 @@ func_exec_program () + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var +- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" ++ $shlibpath_var=\"$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed +-- +2.40.1 + diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb index 2923e6b0c4..4526839ad6 100644 --- a/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb +++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.36.bb @@ -1,10 +1,15 @@ SUMMARY = "The GIMP is the GNU Image Manipulation Program" HOMEPAGE = "http://www.gimp.org" SECTION = "x11/graphics" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" DEPENDS = " \ + alsa-lib \ + atk \ + cairo \ + fontconfig \ + freetype \ gdk-pixbuf-native \ intltool-native \ libxslt-native \ @@ -17,6 +22,7 @@ DEPENDS = " \ mypaint-brushes-1.0 \ gexiv2 \ jpeg \ + libmng \ libpng \ libexif \ tiff \ @@ -29,36 +35,38 @@ DEPENDS = " \ libmng \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \ " -DEPENDS_append_libc-musl = " libexecinfo" +DEPENDS:append:libc-musl = " libexecinfo" +GNOMEBASEBUILDCLASS = "autotools" inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" -SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "7479a4e90b28628d2948e6612fe44049" -SRC_URI[sha256sum] = "e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c" +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \ + file://0001-configure-Keep-first-line-of-compiler-version-string.patch \ + file://0001-libtool-Do-not-add-build-time-library-paths-to-LD_LI.patch" +SRC_URI[sha256sum] = "3d3bc3c69a4bdb3aea9ba2d5385ed98ea03953f3857aafd1d6976011ed7cdbb2" EXTRA_OECONF = "--disable-python \ --without-webkit \ + --disable-check-update \ --without-wmf" -EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons" -EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons" +EXTRA_OECONF += "${@oe.utils.conditional('SITEINFO_BITS', '32', ' --disable-vector-icons', '', d)}" -do_configure_append() { +do_configure:append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g } -do_compile_prepend() { +do_compile:prepend() { # Let native babl/gegl find their plugins export BABL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'babl-*'` export GEGL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'gegl-*'` } -FILES_${PN} += "${datadir}/metainfo" +FILES:${PN} += "${datadir}/metainfo" -RDEPENDS_${PN} += "mypaint-brushes-1.0" +RDEPENDS:${PN} += "mypaint-brushes-1.0" diff --git a/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch b/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch new file mode 100644 index 0000000000..28e279438a --- /dev/null +++ b/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch @@ -0,0 +1,32 @@ +From 712a101c9aa2eb8548e4d0100a4a2eaf76fad164 Mon Sep 17 00:00:00 2001 +From: Jesper Lloyd <jpl.lloyd@gmail.com> +Date: Wed, 20 Jan 2021 20:21:53 +0100 +Subject: [PATCH] make build compatible w. autoconf 2.7 + +Workaround for stricter behaviour (due to a bugfix) in 2.7, +which makes a failing intltoolize macro check fail the build. + +Fix provided by hosiet. + +Upstream-Status: Backport [https://github.com/mypaint/libmypaint/commit/a6bac154db018e1f1cc4dbddc34f6c8422c891fb] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 416d9fe..48b9d02 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -248,7 +248,7 @@ if test "x$enable_i18n" != "xno"; then + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", + [The prefix for our gettext translation domains.]) + AC_SUBST(GETTEXT_PACKAGE) +- IT_PROG_INTLTOOL ++IT_PROG_INTLTOOL + AM_GLIB_GNU_GETTEXT + + dnl Debian: stdlib +-- +2.30.0 + diff --git a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb index 37d41780d2..d509aa3dd0 100644 --- a/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb +++ b/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -10,14 +10,16 @@ DEPENDS = " \ json-c \ " -inherit autotools gobject-introspection gettext python3native +inherit autotools gobject-introspection gettext pkgconfig python3native -SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1" +SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1 \ + file://0001-make-build-compatible-w.-autoconf-2.7.patch \ + " SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0" PV = "1.6.1" S = "${WORKDIR}/git" -do_configure_append() { +do_configure:append() { # autogen uses python2 so generate headers ourselves cd ${S} python3 generate.py mypaint-brush-settings-gen.h brushsettings-gen.h diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb index 4ecc2fef8b..ca3912da88 100644 --- a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb +++ b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb @@ -9,4 +9,4 @@ SRCREV = "8a0124ac0675103eae8fa41fad533851768ae1ce" PV = "1.3.1" S = "${WORKDIR}/git" -FILES_${PN} += "${datadir}/mypaint-data" +FILES:${PN} += "${datadir}/mypaint-data" diff --git a/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb b/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb deleted file mode 100644 index 58713c35cf..0000000000 --- a/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Actions, Menus and Toolbars Kit" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ -" - -inherit gnomebase gettext features_check gobject-introspection - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.md5sum] = "f11c2e0cde10d5224a942b1e13d598b2" -SRC_URI[archive.sha256sum] = "f9656bdd4278aabfb8554f029049b9ffaf51b53faa463483a840365463355df1" diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb b/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb deleted file mode 100644 index 25f409c41a..0000000000 --- a/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Configuration editor for dconf" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = "dconf gtk+3" - -inherit gnomebase vala gettext gsettings bash-completion - -SRC_URI[archive.md5sum] = "78bd905ed3c770a00c850d8cffec88a4" -SRC_URI[archive.sha256sum] = "edcec8867f018589125f177407760c642bbbb52fe5122daac5905223d6b3e1c7" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" diff --git a/meta-gnome/recipes-gnome/dconf/dconf-editor_45.0.1.bb b/meta-gnome/recipes-gnome/dconf/dconf-editor_45.0.1.bb new file mode 100644 index 0000000000..32a69a0707 --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf-editor_45.0.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "Configuration editor for dconf" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + + +DEPENDS = " \ + dconf \ + desktop-file-utils-native \ + gtk+3 \ + glib-2.0 \ + libhandy\ +" + +inherit gnomebase vala gsettings bash-completion pkgconfig gtk-icon-cache + +SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/45/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" +SRC_URI[archive.sha256sum] = "1180297678eedae6217cc514a2638c187d2f1d1ef2720cb9079b740c429941dd" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb index 9146726884..c5c45a0264 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb @@ -1,24 +1,23 @@ SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "1a50c988d9f0206f74a44f7c6d09cead" -SRC_URI[archive.sha256sum] = "9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d" +SRC_URI[archive.sha256sum] = "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d6451e20f0bcb24533" DEPENDS = "dbus glib-2.0 intltool-native" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase bash-completion vala # I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl EXTRA_OEMESON = "-Dman=false" # no bash-completion for native -EXTRA_OEMESON_append_class-native = "-Dbash_completion=false" +EXTRA_OEMESON:append:class-native = " -Dbash_completion=false" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ + ${systemd_user_unitdir} \ ${libdir}/gio/modules/*.so \ " diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb index 69c23d562a..90c12efadf 100644 --- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.43.bb +++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb @@ -1,18 +1,21 @@ DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" HOMEPAGE = "http://www.gusnan.se/devilspie2" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "gtk+ glib-2.0 libwnck lua virtual/libx11" +DEPENDS = "gtk+ glib-2.0 libwnck libxinerama lua virtual/libx11" -SRC_URI = " \ - http://download.savannah.gnu.org/releases/${BPN}/${BPN}_${PV}-src.tar.gz \ +PV .= "+git" + +SRCREV = "b9d7ad9c09a5fb17a1562ee1d892798c646e9ec9" + +SRC_URI = "git://github.com/dsalt/devilspie2;branch=master;protocol=https \ file://default.lua \ file://devilspie2.desktop \ " -SRC_URI[md5sum] = "26eed0b5b4af5c7e13c551eceaeab832" -SRC_URI[sha256sum] = "ecffc17c62b41e196b72340192a90c4223329df041f135e74c0990860595f828" + +S = "${WORKDIR}/git" inherit features_check pkgconfig gettext diff --git a/meta-gnome/recipes-gnome/eog/eog_45.3.bb b/meta-gnome/recipes-gnome/eog/eog_45.3.bb new file mode 100644 index 0000000000..00fe266698 --- /dev/null +++ b/meta-gnome/recipes-gnome/eog/eog_45.3.bb @@ -0,0 +1,30 @@ +SUMMARY = "This is the Eye of GNOME, an image viewer program." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + librsvg \ + gnome-desktop \ + gsettings-desktop-schemas \ + gdk-pixbuf \ + gtk+3 \ + libhandy \ + libpeas \ + libportal \ + libexif \ + lcms \ +" + + +inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg features_check gtk-icon-cache + +# FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. +REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "8650f662d4921d83a7904f6bb9ca245baf735f717b47fac5b37f0d90e5e891a8" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dxmp=false" + +FILES:${PN} += "${datadir}" diff --git a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch b/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch deleted file mode 100644 index 32ca073f95..0000000000 --- a/meta-gnome/recipes-gnome/evince/evince/0001-Add-format-attribute-to-_synctex_malloc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3776fd0b42e473fe51d3678bf26cdaa37e1d8e0d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 8 Apr 2017 13:36:12 -0700 -Subject: [PATCH] Add format attribute to _synctex_malloc - -Helps in avoiding compile errors about formating with clang - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - cut-n-paste/synctex/synctex_parser_utils.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cut-n-paste/synctex/synctex_parser_utils.c b/cut-n-paste/synctex/synctex_parser_utils.c -index 08053f0..0519b38 100644 ---- a/cut-n-paste/synctex/synctex_parser_utils.c -+++ b/cut-n-paste/synctex/synctex_parser_utils.c -@@ -136,6 +136,7 @@ int _synctex_log(int level, const char * prompt, const char * reason,va_list arg - return result; - } - -+__attribute__((__format__ (__printf__, 1, 0))) - int _synctex_error(const char * reason,...) { - va_list arg; - int result; --- -2.20.1 - diff --git a/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch b/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch deleted file mode 100644 index 94794a5f92..0000000000 --- a/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch +++ /dev/null @@ -1,93 +0,0 @@ -From ef170dda7fbab53682c9bc287dec93fa86130bc9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Sep 2018 21:49:59 -0700 -Subject: [PATCH] add a formatting attribute check - -Tell Clang that parameter is a printf style format using the -attribute flag - -This helps in avoiding below warnings seen with clang - -unarr.c:106:22: error: format string is not a string literal -[-Werror,-Wformat-nonliteral] -| vfprintf(stderr, msg, args); -| ^~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - cut-n-paste/unarr/common/unarr.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/cut-n-paste/synctex/synctex_parser_utils.c -+++ b/cut-n-paste/synctex/synctex_parser_utils.c -@@ -87,11 +87,11 @@ void _synctex_free(void * ptr) { - # include <syslog.h> - #endif - --int _synctex_error(const char * reason, ...) __attribute__((__format__ (__printf__, 1, 2))); --int _synctex_log(int level, const char * prompt, const char * reason, va_list arg) __attribute__((__format__ (__printf__, 3, 0))); -- --int _synctex_log(int level, const char * prompt, const char * reason,va_list arg) { -+static int _synctex_log(int level, const char * prompt, const char * reason, ...) SYNCTEX_PRINTF_FORMAT(3, 0); -+static int _synctex_log(int level, const char * prompt, const char * reason, ...) { -+ va_list arg; - int result; -+ va_start(arg, reason); - # ifdef SYNCTEX_RECENT_WINDOWS - {/* This code is contributed by William Blum. - As it does not work on some older computers, -@@ -133,10 +133,10 @@ int _synctex_log(int level, const char * - result += vfprintf(where, reason, arg); - result += fprintf(where,"\n"); - # endif -+ va_end(arg); - return result; - } - --__attribute__((__format__ (__printf__, 1, 0))) - int _synctex_error(const char * reason,...) { - va_list arg; - int result; -@@ -355,6 +355,7 @@ char * _synctex_merge_strings(const char - size_t len = strlen(temp); - if(UINT_MAX-len<size) { - _synctex_error("! _synctex_merge_strings: Capacity exceeded."); -+ va_end(arg); - return NULL; - } - size+=len; -@@ -374,6 +375,7 @@ char * _synctex_merge_strings(const char - if(dest != strncpy(dest,temp,size)) { - _synctex_error("! _synctex_merge_strings: Copy problem"); - free(result); -+ va_end(arg); - result = NULL; - return NULL; - } ---- a/cut-n-paste/synctex/synctex_parser_utils.h -+++ b/cut-n-paste/synctex/synctex_parser_utils.h -@@ -85,7 +85,11 @@ extern "C" { - # else - # define SYNCTEX_ARE_PATH_CHARACTERS_EQUAL(left,right) (toupper(left) != toupper(right)) - # endif -- -+# ifdef __GNUC__ -+# define SYNCTEX_PRINTF_FORMAT(si, ftc) __attribute__ ((format (printf, si, ftc))) -+# else -+# define SYNCTEX_PRINTF_FORMAT(si, ftc) -+# endif - /* This custom malloc functions initializes to 0 the newly allocated memory. - * There is no bzero function on windows. */ - void *_synctex_malloc(size_t size); -@@ -97,8 +101,8 @@ void _synctex_free(void * ptr); - /* This is used to log some informational message to the standard error stream. - * On Windows, the stderr stream is not exposed and another method is used. - * The return value is the number of characters printed. */ -- int _synctex_error(const char * reason,...); -- int _synctex_debug(const char * reason,...); -+ int _synctex_error(const char * reason,...) SYNCTEX_PRINTF_FORMAT(1, 2); -+ int _synctex_debug(const char * reason,...) SYNCTEX_PRINTF_FORMAT(1, 2); - - /* strip the last extension of the given string, this string is modified! - * This function depends on the OS because the path separator may differ. diff --git a/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb b/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb deleted file mode 100644 index a82e44b02e..0000000000 --- a/meta-gnome/recipes-gnome/evince/evince_3.36.5.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" -SECTION = "x11/office" -DEPENDS = " \ - gnome-common-native \ - yelp-tools-native \ - appstream-glib \ - gtk+3 \ - gspell \ - libsecret \ - poppler \ - gstreamer1.0-plugins-base \ - orc \ - adwaita-icon-theme \ - ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc - -SRC_URI[archive.md5sum] = "5d68c81a3d4c5d27754b97405451f04e" -SRC_URI[archive.sha256sum] = "6f0dd6e30639eb620f201a6ae40f21c4b78c030f0d6437f9e309f7240195e97c" -SRC_URI += " \ - file://0001-Add-format-attribute-to-_synctex_malloc.patch \ - file://0002-add-a-formatting-attribute-check.patch \ -" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = " \ - -Dsystemduserunitdir=no \ -" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/libdocument/.libs" -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" -PACKAGECONFIG[browser-plugin] = "-Dbrowser_plugin=true,-Dbrowser_plugin=false" - -RDEPENDS_${PN} += "glib-2.0-utils" -RRECOMMMENDS_${PN} = "adwaita-icon-theme" - -PACKAGES =+ "${PN}-nautilus-extension" -PACKAGES =+ "${PN}-browser-plugin" - -FILES_${PN} += "${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ -" -FILES_${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" -FILES_${PN}-browser-plugin = "${libdir}/mozilla/*/*so" diff --git a/meta-gnome/recipes-gnome/evince/evince_46.0.bb b/meta-gnome/recipes-gnome/evince/evince_46.0.bb new file mode 100644 index 0000000000..57eb994e13 --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince_46.0.bb @@ -0,0 +1,58 @@ +SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" +SECTION = "x11/office" +DEPENDS = " \ + adwaita-icon-theme \ + appstream-glib \ + cairo \ + desktop-file-utils-native \ + dbus \ + gdk-pixbuf \ + glib-2.0 \ + gnome-common-native \ + gnome-desktop \ + gsettings-desktop-schemas \ + gspell \ + gstreamer1.0-plugins-base \ + gtk+3 \ + libarchive \ + libhandy \ + libsecret \ + libxml2 \ + poppler \ + yelp-tools-native \ + zlib \ +" + + +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gi-docgen features_check gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "aff6af69392c04956bfad976dec5d1583b41d5a334e937995f7c3ca0740de221" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" + +RDEPENDS:${PN} += "glib-2.0-utils" +RRECOMMENDS:${PN} = "adwaita-icon-theme" + +PACKAGES =+ "${PN}-nautilus-extension" + +do_install:prepend() { + sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/libview/ev-view-type-builtins.c + sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/libdocument/ev-document-type-builtins.c +} + +FILES:${PN} += "${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ + ${systemd_user_unitdir} \ +" +FILES:${PN}-nautilus-extension = "${libdir}/nautilus/*/*so" diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb index 681a61c33a..f2f41276a6 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server-native.bb @@ -1,10 +1,12 @@ require ${BPN}.inc -inherit native +inherit_defer native DEPENDS = "glib-2.0-native" # build native helpers +do_configure[noexec] = "1" + do_compile() { cd ${S}/src/camel sed -i 's:#include "evolution-data-server-config.h"::g' camel-gen-tables.c @@ -21,3 +23,4 @@ do_install() { install -d ${D}${bindir} install -m 755 ${B}/* ${D}${bindir} } + diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 7f267b4972..103bad1b68 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -1,16 +1,18 @@ require ${BPN}.inc DEPENDS = " \ - ${BPN}-native intltool-native gperf-native \ - glib-2.0 gtk+3 libgdata \ - dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \ + ${BPN}-native gperf-native \ + glib-2.0 json-glib gtk4 libxml2 icu \ + dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \ " -inherit gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative +inherit pkgconfig gsettings gobject-introspection features_check gtk-doc gettext perlnative vala -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI += " \ + file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ @@ -19,52 +21,52 @@ SRC_URI += " \ " LKSTRFTIME = "HAVE_LKSTRFTIME=ON" -LKSTRFTIME_libc-musl = "HAVE_LKSTRFTIME=OFF" - -# For arm qemu-arm runs at 100% CPU load and never returns - so disable introspection for now -GI_DATA_ENABLED="False" +LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF" EXTRA_OECMAKE = " \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \ - -DWITH_KRB5=OFF \ - -DENABLE_GOA=OFF \ - -DENABLE_UOA=OFF \ - -DENABLE_GOOGLE_AUTH=OFF \ - -DENABLE_WEATHER=OFF \ - -DENABLE_INTROSPECTION=${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'ON', 'OFF', d)} \ + -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ -D${LKSTRFTIME} \ -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ + -DENABLE_GTK=OFF \ + -DENABLE_GTK4=ON \ + -DENABLE_INSTALLED_TESTS=OFF \ + -DENABLE_EXAMPLES=OFF \ + -DENABLE_MAINTAINER_MODE=OFF \ " -PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" -PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib" +EXTRA_OECMAKE:append:class-target = " -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" +EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" + +PACKAGECONFIG ?= "goa oauth" +PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra" +PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK4=ON -DENABLE_OAUTH2_WEBKITGTK=OFF,-DENABLE_OAUTH2_WEBKITGTK4=OFF -DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib" +PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts" +PACKAGECONFIG[kerberos] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5" # BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when # searching for openldap-libs PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap" +PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather4" + # -ldb needs this on some platforms LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0" -do_configure_append () { - cp ${WORKDIR}/iconv-detect.h ${S}/src - - # fix native perl shebang - sed -i 's:${STAGING_BINDIR_NATIVE}/perl-native:${bindir}:' ${B}/src/tools/addressbook-export/csv2vcard +# invokes libraries from build host +GI_DATA_ENABLED:libc-musl="False" - # fix abs path for g-ir-scanner-wrapper - sed -i ${B}/build.ninja \ - -e 's: ${bindir}/g-ir-scanner-wrapper: ${STAGING_BINDIR}/g-ir-scanner-wrapper:g' -} - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/camel/.libs:${B}/libedataserver/.libs" +do_configure:append () { + cp ${WORKDIR}/iconv-detect.h ${S}/src + # avoid writing perl-native path into csv2vcard shebang + sed -i "s|@PERL@|${bindir}/perl|" ${S}/src/tools/addressbook-export/csv2vcard.in } -FILES_${PN} =+ " \ +FILES:${PN} =+ " \ ${datadir}/dbus-1 \ ${datadir}/evolution-data-server-*/ui/ \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 6150df1673..33190c461c 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -2,14 +2,13 @@ SUMMARY = "Evolution database backend server" HOMEPAGE = "http://www.gnome.org/projects/evolution/" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2 & LGPLv2+" +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543" +GNOMEBASEBUILDCLASS = "cmake" inherit gnomebase upstream-version-is-even -SRC_URI[archive.md5sum] = "4990dbdbf5850cbbfc46727367776058" -SRC_URI[archive.sha256sum] = "1f5f48173d0f288219d73d4f193cb921ae631932ba84030f05751c42bb003db2" -PV = "3.36.3" - +SRC_URI[archive.sha256sum] = "91f4ffc38a1b8d2fe8939834449ac541c0bff4a39b444edc2a9529344a28e98a" +PV = "3.50.1" diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch new file mode 100644 index 0000000000..118d93a72a --- /dev/null +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch @@ -0,0 +1,25 @@ +Use G_IR_SCANNER without passing additional environment + +Upstream-Status: Inappropriate [OE-specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/cmake/modules/GObjectIntrospection.cmake ++++ b/cmake/modules/GObjectIntrospection.cmake +@@ -122,9 +122,7 @@ macro(gir_add_introspection gir) + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}") + + add_custom_command( +- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS= +- ${INTROSPECTION_SCANNER_ENV} +- ${G_IR_SCANNER} ++ COMMAND ${G_IR_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} + --namespace=${_gir_namespace} + --nsversion=${_gir_version} +@@ -240,7 +238,6 @@ macro(gir_add_introspection_simple gir_l + ${_gir_identifies_prefixes} + ${_gir_deps} + --add-include-path=${SHARE_INSTALL_PREFIX}/gir-1.0 +- --library-path=${LIB_INSTALL_DIR} + ${_extra_library_path} + --pkg-export ${pkg_export_prefix}-${gir_library_version} + --c-include=${c_include} diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch index 23c3a96d43..51eaf7cfef 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch @@ -9,6 +9,7 @@ Content-Transfer-Encoding: 8bit * TRY_RUN: does not work for OE * HAVE_LKSTRFTIME is set by recipe as configure option +Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- CMakeLists.txt | 23 ----------------------- diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch index e320f6342d..82f6972501 100644 --- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch +++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0004-call-native-helpers.patch @@ -6,7 +6,7 @@ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Inappropriate[oe-specific] +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- diff --git a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb index 561b094a98..12d344bff5 100644 --- a/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb +++ b/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An icon theme for Gnome" SECTION = "x11/wm" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" HOMEPAGE = "http://code.google.com/p/faenza-icon-theme/" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" @@ -8,8 +8,7 @@ inherit allarch gtk-icon-cache S = "${WORKDIR}" -SRC_URI = "http://faenza-icon-theme.googlecode.com/files/${BPN}_${PV}.zip" -SRC_URI[md5sum] = "e9bd6106d13017ce06d24b586259ae9c" +SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BPN}_${PV}.zip" SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a" do_install() { @@ -23,4 +22,4 @@ do_install() { chown -R root:root ${D}${datadir} } -FILES_${PN} += "${datadir}/icons ${datadir}/themes" +FILES:${PN} += "${datadir}/icons ${datadir}/themes" diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb deleted file mode 100644 index bf5e6f6d13..0000000000 --- a/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "An archive manager utility for the GNOME Environment" -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - libarchive \ - libnotify \ -" - -inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg - -SRC_URI[archive.md5sum] = "caa0103ab34d237a9760fbf5e1c72bc1" -SRC_URI[archive.sha256sum] = "268f7fdad8d2a78dfed5e82eb8710bad389c311b720666d6f07a04ed51056bd2" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" - -PACKAGECONFIG[nautilus] = "-Dnautilus-actions=true,-Dnautilus-actions=false,nautilus" -PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false," - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${libdir}/nautilus \ -" diff --git a/meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb b/meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb new file mode 100644 index 0000000000..30760387f4 --- /dev/null +++ b/meta-gnome/recipes-gnome/file-roller/file-roller_44.1.bb @@ -0,0 +1,46 @@ +SUMMARY = "An archive manager utility for the GNOME Environment" +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + + +DEPENDS = " \ + desktop-file-utils-native \ + glib-2.0-native \ + glib-2.0 \ + json-glib \ + gtk4 \ + libadwaita \ + libarchive \ + libhandy \ + libportal \ +" + +inherit gnomebase gsettings itstool gobject-introspection gnome-help gettext upstream-version-is-even mime-xdg gtk-icon-cache features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +EXTRA_OEMESON += "-Dintrospection=enabled" + +SRC_URI = "git://gitlab.gnome.org/GNOME/file-roller.git;protocol=https;branch=master" +SRCREV = "299e86c77d8fe600ee6658357e209b15c674397e" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[nautilus] = "-Dnautilus-actions=enabled,-Dnautilus-actions=disabled,nautilus" +PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false,,packagekit" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${libdir}/nautilus \ +" + +EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross" + +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross <<EOF +[binaries] +cpio = '${bindir}/cpio' +EOF +} diff --git a/meta-gnome/recipes-gnome/gdm/gdm/0001-Ensure-pam-file-installation.patch b/meta-gnome/recipes-gnome/gdm/gdm/0001-Ensure-pam-file-installation.patch deleted file mode 100644 index 6362d5ee6a..0000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/0001-Ensure-pam-file-installation.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f7bba53adf8a26f900442a05bb98326747c392b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 3 Dec 2019 00:24:27 +0100 -Subject: [PATCH] Ensure pam-file installation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -All the detection magic does not work for us - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - data/Makefile.am | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index bda9160..dbc3ea3 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -296,22 +296,12 @@ endif - chown root:root $(DESTDIR)$(logdir) || : ; \ - fi - -- system=`uname`; \ -- if test -f /usr/include/security/pam_appl.h; then \ -- if test '!' -d $(DESTDIR)$(PAM_PREFIX)/pam.d; then \ - $(mkinstalldirs) $(DESTDIR)$(PAM_PREFIX)/pam.d; \ - chmod 755 $(DESTDIR)$(PAM_PREFIX)/pam.d; \ -- fi; \ -- if test $$system = Linux; then \ - for pamfile in $(pam_files); do \ - bn=$$(basename $$pamfile .pam); \ - $(INSTALL_DATA) $(srcdir)/$$pamfile $(DESTDIR)$(PAM_PREFIX)/pam.d/$$bn; \ -- done; \ -- fi; \ -- if test $$system = SunOS; then \ -- echo "Please add PAM authentication for gdm, gdm-autologin and gdm-welcome in $(PAM_PREFIX)/pam.conf!"; \ -- fi; \ -- fi -+ done; - - if test '!' -d $(DESTDIR)$(xauthdir); then \ - $(mkinstalldirs) $(DESTDIR)$(xauthdir); \ --- -2.21.0 - diff --git a/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb deleted file mode 100644 index fbf25a30cb..0000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "GNOME Display Manager" -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - dconf-native \ - gtk+3 \ - accountsservice \ - libcanberra \ - libpam \ -" - -REQUIRED_DISTRO_FEATURES = "x11 systemd pam" - -inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check - -SRC_URI[archive.md5sum] = "18384eb8345dbee5a8219916debf7e43" -SRC_URI[archive.sha256sum] = "3f561c10ae2e5942b03026f02c0aa7d8712e382708b17a0970874df8175b83a8" -SRC_URI += "file://0001-Ensure-pam-file-installation.patch" - -EXTRA_OECONF = " \ - --without-plymouth \ - --with-default-pam-config=openembedded \ - --with-pam-mod-dir=${base_libdir}/security \ -" - -do_install_append() { - rm -rf ${D}/run ${D}${localstatedir}/run -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" - -SYSTEMD_SERVICE_${PN} = "${BPN}.service" - -# Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm -# components. To allow gnome-images using different display-manager, split them -# out into a seperate package. -PACKAGE_BEFORE_PN = "${PN}-base" -FILES_${PN}-base = " \ - ${datadir}/glib-2.0 \ - ${datadir}/gnome-session \ - ${libdir}/lib*${SOLIBS} \ - ${libdir}/girepository-1.0 \ -" - -CONFFILES_${PN} += "${sysconfdir}/gdm/custom.conf" -FILES_${PN} += " \ - ${datadir}/dconf \ - ${base_libdir}/security/pam_gdm.so \ - ${localstatedir} \ - ${systemd_unitdir} \ -" - -RDEPENDS_${PN} += "${PN}-base" - diff --git a/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb new file mode 100644 index 0000000000..469281624c --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm_46.0.bb @@ -0,0 +1,66 @@ +SUMMARY = "GNOME Display Manager" +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + accountsservice \ + audit \ + dconf-native \ + gtk+3 \ + keyutils \ + libcanberra \ + libgudev \ + libpam \ + xserver-xorg \ +" + +REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit gobject-introspection-data" +GIR_MESON_OPTION = "" + + +inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check + +SRC_URI[archive.sha256sum] = "8d6cb52176eca48b6bbf1cfe2fdae08d9677b5a0f2bca600dee4604de0dd1efc" + +EXTRA_OEMESON = " \ + -Dplymouth=disabled \ + -Ddefault-pam-config=openembedded \ + -Dpam-mod-dir=${base_libdir}/security \ +" + +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-worker-enum-types.c + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-worker-enum-types.h + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-enum-types.c + sed -i -e 's|${B}/||g' ${B}/daemon/gdm-session-enum-types.h +} + +do_install:append() { + rm -rf ${D}/run ${D}${localstatedir}/run +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" + +SYSTEMD_SERVICE:${PN} = "${BPN}.service" + +# Some gnome components - as gnome-panel and gnome-shell (!!) - require gdm +# components. To allow gnome-images using different display-manager, split them +# out into a seperate package. +PACKAGE_BEFORE_PN = "${PN}-base" +FILES:${PN}-base = " \ + ${datadir}/glib-2.0 \ + ${datadir}/gnome-session \ + ${libdir}/lib*${SOLIBS} \ + ${libdir}/girepository-1.0 \ +" + +CONFFILES:${PN} += "${sysconfdir}/gdm/custom.conf" +FILES:${PN} += " \ + ${datadir}/dconf \ + ${base_libdir}/security/pam_gdm.so \ + ${localstatedir} \ + ${systemd_unitdir} ${systemd_user_unitdir} \ +" + +RDEPENDS:${PN} += "${PN}-base" diff --git a/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch b/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch new file mode 100644 index 0000000000..40fd93b984 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/gedit/0001-fix-for-clang-18.patch @@ -0,0 +1,32 @@ +Signed-off-by: Markus Volk <f_l_k@t-online.de> +Upstream-Status: Inappropriate [https://gitlab.gnome.org/GNOME/gedit/-/issues/588] + +Temporary workaround to fix build: +../plugins/quickhighlight/gedit-quick-highlight-plugin.c: In function ‘gedit_quick_highlight_plugin_load_style’: +../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: error: implicit declaration of function ‘gtk_source_style_copy’; did you mean ‘gtk_source_style_apply’? [-Wimplicit-function-declaration] + + 96 | plugin->priv->style = gtk_source_style_copy (style); + | ^~~~~~~~~~~~~~~~~~~~~ + | gtk_source_style_apply +../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:47: warning: nested extern declaration of ‘gtk_source_style_copy’ [-Wnested-externs] +../plugins/quickhighlight/gedit-quick-highlight-plugin.c:96:45: error: assignment to ‘GtkSourceStyle *’ {aka ‘struct _GtkSourceStyle *’} from ‘int’ makes pointer from integer without a cast [-Wint-conversion] + 96 | plugin->priv->style = gtk_source_style_copy (style); + | ^ + +--- a/plugins/quickhighlight/gedit-quick-highlight-plugin.c 2024-02-20 08:11:47.925749255 +0100 ++++ b/plugins/quickhighlight/gedit-quick-highlight-plugin.c 2024-02-20 08:12:16.218594067 +0100 +@@ -90,11 +90,12 @@ + if (style_scheme != NULL) + { + style = gtk_source_style_scheme_get_style (style_scheme, "quick-highlight-match"); +- ++#if 0 + if (style != NULL) + { + plugin->priv->style = gtk_source_style_copy (style); + } ++#endif + } + } + + diff --git a/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb deleted file mode 100644 index 75f1737c62..0000000000 --- a/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - gdk-pixbuf-native \ - gtk+3 \ - gsettings-desktop-schemas \ - libpeas \ - libsoup-2.4 \ - gspell \ - gtksourceview4 \ - tepl \ -" - -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "438217bbbcf92a17c4f259b4a5426b03" -SRC_URI[archive.sha256sum] = "6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGES += "${PN}-python" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" - -FILES_${PN}-python += " \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - diff --git a/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb new file mode 100644 index 0000000000..6cdc33c1cc --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/gedit_46.2.bb @@ -0,0 +1,53 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + + +DEPENDS = " \ + appstream-glib-native \ + desktop-file-utils-native \ + libgedit-amtk \ + libgedit-gtksourceview \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + libpeas \ + libsoup \ + gspell \ + tepl \ +" + +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc gettext features_check mime-xdg gtk-icon-cache python3targetconfig + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI += "file://0001-fix-for-clang-18.patch" +SRC_URI[archive.sha256sum] = "c0866412bad147ebace2d282ffcbb5a0e9a304b20fd55640bee21c81e6d501ef" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +do_install:prepend() { + sed -i -e 's|${B}||g' ${B}/plugins/filebrowser/gedit-file-browser-enum-types.c +} + +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGES += "${PN}-python" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES:${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" +RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb new file mode 100644 index 0000000000..11da836ff4 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "libgedit-amtk - Actions, Menus and Toolbars Kit for GTK applications" +SECTION = "gnome" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = "glib-2.0 gtk+3" + +inherit meson pkgconfig gobject-introspection features_check gtk-doc + +SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main" +S = "${WORKDIR}/git" +SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +GIR_MESON_OPTION = "gobject_introspection" +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb new file mode 100644 index 0000000000..0ebc22acbd --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.1.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "Gedit Technology - Source code editing widget" +SECTION = "gnome" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "glib-2.0 gtk+3 libxml2" + +inherit meson pkgconfig gobject-introspection features_check gtk-doc + +SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main" +S = "${WORKDIR}/git" +SRCREV = "b271a625ca057cc3fa7d5ac83285c5d4e038202e" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +GIR_MESON_OPTION = "gobject_introspection" +GTKDOC_MESON_OPTION = "gtk_doc" + +do_install:prepend() { + sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.c + sed -i -e 's|${B}||g' ${B}/gtksourceview/gtksource-enumtypes.h +} + +FILES:${PN} += "${datadir}" diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb index c0f3c27af4..a1495d6153 100644 --- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb @@ -1,9 +1,8 @@ SUMMARY = "A convenience library for the geocoding" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = "enable-introspection" GTKDOC_MESON_OPTION = "enable-gtk-doc" @@ -11,10 +10,9 @@ inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even DEPENDS = " \ json-glib \ - libsoup-2.4 \ + libsoup-3.0 \ " -SRC_URI[archive.md5sum] = "e1ef140a11a543643d170dc701009e39" -SRC_URI[archive.sha256sum] = "01fe84cfa0be50c6e401147a2bc5e2f1574326e2293b55c69879be3e82030fd1" +SRC_URI[archive.sha256sum] = "2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa" -EXTRA_OEMESON = "-Denable-installed-tests=false" +EXTRA_OEMESON = "-Denable-installed-tests=false -Dsoup2=false" diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb deleted file mode 100644 index 12ea5938c5..0000000000 --- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.12.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A GObject-based Exiv2 wrapper" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "exiv2" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" - -inherit gnomebase gobject-introspection gtk-doc - -SRC_URI[archive.md5sum] = "44a3cfeab1afd83a71e852835d24e656" -SRC_URI[archive.sha256sum] = "8aeafd59653ea88f6b78cb03780ee9fd61a2f993070c5f0d0976bed93ac2bd77" - -EXTRA_OEMESON = " \ - -Dvapi=false \ - -Dpython2_girdir=no \ - -Dpython3_girdir=no \ -" diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb new file mode 100644 index 0000000000..8fd6583104 --- /dev/null +++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb @@ -0,0 +1,34 @@ +SUMMARY = "A GObject-based Exiv2 wrapper" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "exiv2 python3-pygobject-native" + +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit gnomebase gobject-introspection gtk-doc python3native vala + +SRC_URI[archive.sha256sum] = "2a0c9cf48fbe8b3435008866ffd40b8eddb0667d2212b42396fdf688e93ce0be" + +EXTRA_OEMESON = " \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} \ +" + +PACKAGES =+ "${PN}-python3" +FILES:${PN}-python3 = "${PYTHON_SITEPACKAGES_DIR}" +RDEPENDS:${PN}-python3 = "${PN}" + +PACKAGE_PREPROCESS_FUNCS += "src_package_preprocess" +src_package_preprocess () { + # Trim build paths from comments in generated sources to ensure reproducibility + sed -i -e "s,${B}/../${BPN}-${PV}/${BPN}/,,g" \ + ${B}/gexiv2/gexiv2-enums.cpp +} + +do_install:append() { + # gexiv2 harcodes usr/lib as install path, so this corrects it to actual libdir + if [ "${prefix}/lib" != "${libdir}" ]; then + mv ${D}/${prefix}/lib/* ${D}/${libdir}/ + rm -rf ${D}/${prefix}/lib + fi +} diff --git a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb deleted file mode 100644 index 0414b0c7cf..0000000000 --- a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A GObject library for Facebook Graph API" -SECTION = "x11/gnome" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" - -DEPENDS = " \ - glib-2.0 \ - json-glib \ - rest \ - gnome-online-accounts \ -" - -inherit gnomebase gtk-doc gobject-introspection - -SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" -SRC_URI[archive.sha256sum] = "6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379" - -do_install_append() { - # they install all the autotools files (NEWS AUTHORS..) to /usr/doc which - # is not a standard path exactly - rm -rf ${D}${prefix}/doc -} diff --git a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb new file mode 100644 index 0000000000..9b1a02bb09 --- /dev/null +++ b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb @@ -0,0 +1,26 @@ +SUMMARY = "A GObject library for Facebook Graph API" +SECTION = "x11/gnome" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" + +DEPENDS = " \ + glib-2.0 \ + json-glib \ + librest \ + libsoup-2.4 \ + gnome-online-accounts \ +" +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check + +# for gnome-online-accounts +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +#SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" +SRC_URI[archive.sha256sum] = "9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3" + +do_install:append() { + # they install all the autotools files (NEWS AUTHORS..) to /usr/doc which + # is not a standard path exactly + rm -rf ${D}${prefix}/doc +} diff --git a/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb b/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb deleted file mode 100644 index cf33ebdfea..0000000000 --- a/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "GHex - a hex editor for GNOME" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ -" - -inherit gnomebase gsettings gtk-icon-cache gnome-help gettext upstream-version-is-even - -SRC_URI[archive.md5sum] = "7e6ed808766bc18285bdc6999bdf0f15" -SRC_URI[archive.sha256sum] = "c2d9c191ff5bce836618779865bee4059db81a3a0dff38bda3cc7a9e729637c0" - -FILES_${PN} += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/ghex/ghex_46.0.bb b/meta-gnome/recipes-gnome/ghex/ghex_46.0.bb new file mode 100644 index 0000000000..41d8391636 --- /dev/null +++ b/meta-gnome/recipes-gnome/ghex/ghex_46.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "GHex - a hex editor for GNOME" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + + +DEPENDS = " \ + desktop-file-utils-native \ + glib-2.0-native \ + gtk4 \ + libadwaita \ +" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspection vala gi-docgen + +SRC_URI[archive.sha256sum] = "a1c46f3020cb358b8323025db3a539c97d994a4c46f701f48edc6357f7fbcbd1" + +REQUIRED_DISTRO_FEATURES = "opengl" + +FILES:${PN} += "${libdir} ${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Disable-tests-on-host.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Disable-tests-on-host.patch deleted file mode 100644 index 0953214fbf..0000000000 --- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Disable-tests-on-host.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 95379de2132786f855e8caec1fd5869225774d02 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 18 May 2019 01:14:07 +0200 -Subject: [PATCH] Disable tests on host -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - configure.ac | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fa4e136..056e96e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -335,9 +335,7 @@ AS_IF([test "x$with_dbus_tests" != "xno"], [ - ]) - AM_CONDITIONAL([DBUS_TESTS], [test "x$with_dbus_tests" != "xno"]) - --AC_MSG_CHECKING([for a suitable UTF-8 locale to run the tests in]) --TESTS_LOCALE=$($srcdir/build/choose-tests-locale.sh) --AC_MSG_RESULT([$TESTS_LOCALE]) -+TESTS_LOCALE=C - AC_SUBST([TESTS_LOCALE]) - - AC_SUBST([gjsjsdir], [\${datadir}/gjs-1.0]) --- -2.20.1 - diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch new file mode 100644 index 0000000000..12b4b08c7e --- /dev/null +++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch @@ -0,0 +1,47 @@ +From 8a78a7996b01aba21377ceb7547da673fd30a391 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Wed, 27 Oct 2021 20:18:47 +0200 +Subject: [PATCH] Support cross builds a bit better +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* Do not build/run mozjs-linked program +* Do not try to run test applications + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index c9b26d6..3058e8c 100644 +--- a/meson.build ++++ b/meson.build +@@ -262,6 +262,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with + --disable-debug.''') + endif + ++if not meson.is_cross_build() + # Check if a minimal SpiderMonkey program compiles, links, and runs. If not, + # it's most likely the case that SpiderMonkey was configured incorrectly, for + # example by building mozglue as a shared library. +@@ -292,6 +293,7 @@ elif minimal_program.returncode() != 0 + failed to execute. Most likely you should build it with a different + configuration.''' + recommended_configuration) + endif ++endif # not meson.is_cross_build() + + have_printf_alternative_int = cc.compiles(''' + #include <stdio.h> +@@ -690,7 +692,7 @@ subdir('installed-tests') + + # Note: The test program in test/ needs to be ported + # to Windows before we can build it on Windows. +-if host_machine.system() != 'windows' ++if host_machine.system() != 'windows' and not meson.is_cross_build() + subdir('test') + endif + diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch new file mode 100644 index 0000000000..e932f06d27 --- /dev/null +++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch @@ -0,0 +1,35 @@ +From 29221ae42e424c6100b8c313d2b61801430c872d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?= + <schnitzeltony@gmail.com> +Date: Wed, 27 Oct 2021 20:04:02 +0200 +Subject: [PATCH] meson.build: Do not add dir installed-tests when +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3058e8c..06cf8da 100644 +--- a/meson.build ++++ b/meson.build +@@ -688,7 +688,9 @@ endif + + ### Tests and test setups ###################################################### + +-subdir('installed-tests') ++if get_option('installed_tests') ++ subdir('installed-tests') ++endif + + # Note: The test program in test/ needs to be ported + # to Windows before we can build it on Windows. diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb deleted file mode 100644 index 58342b6c22..0000000000 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.58.7.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Javascript bindings for GNOME" -LICENSE = "MIT & LGPLv2+" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \ - file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7 \ -" - -GNOMEBASEBUILDCLASS = "autotools" - -DEPENDS = "mozjs gtk+3" - -inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even - -SRC_URI[archive.md5sum] = "c8c530d4593133f496ae69098273a675" -SRC_URI[archive.sha256sum] = "2014509019ea4e7a8ab8e0dd0c472bbcf0ad3067928af88c29f5e2879c58c7a9" -SRC_URI += "file://0001-Disable-tests-on-host.patch" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" - -EXTRA_OECONF = " \ - --without-dbus-tests \ - --disable-installed-tests \ -" - -do_configure_prepend() { - # make configure find gobject-introspection test code. Although we set - # --disable-installed-tests gjs builds them - sed -i 's|:$GI_DATADIR|:${STAGING_DIR_NATIVE}$GI_DATADIR|g' ${S}/configure.ac -} - -FILES_${PN} += "${datadir}/gjs-1.0/lsan" - -PACKAGES =+ "${PN}-valgrind" -FILES_${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" -RSEPENDS_${PN}-valgrind += "valgrind" diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.80.2.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.80.2.bb new file mode 100644 index 0000000000..1d781d078c --- /dev/null +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.80.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "Javascript bindings for GNOME" +LICENSE = "MIT & LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" + + +DEPENDS = "mozjs-115 cairo" + +inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even pkgconfig + +SRC_URI[archive.sha256sum] = "135e39c5ac591096233e557cfe577d64093f5054411d47cb2e214bad7d4199bd" +SRC_URI += " \ + file://0001-Support-cross-builds-a-bit-better.patch \ + file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ +" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +EXTRA_OEMESON = " \ + -Dinstalled_tests=false \ + -Dskip_dbus_tests=true \ + -Dskip_gtk_tests=true \ +" + +LDFLAGS:append:mipsarch = " -latomic" +LDFLAGS:append:powerpc = " -latomic" +LDFLAGS:append:powerpc64 = " -latomic" +LDFLAGS:append:riscv32 = " -latomic" + +FILES:${PN} += "${datadir}/gjs-1.0/lsan" + +PACKAGES =+ "${PN}-valgrind" +FILES:${PN}-valgrind = "${datadir}/gjs-1.0/valgrind" +RDEPENDS:${PN}-valgrind += "valgrind" + +# Valgrind not yet available on rv32/rv64 +RDEPENDS:${PN}-valgrind:remove:riscv32 = "valgrind" +RDEPENDS:${PN}-valgrind:remove:riscv64 = "valgrind" diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb index afeda3e931..8d602eee44 100644 --- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.4.bb +++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME archive library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ @@ -7,11 +7,14 @@ DEPENDS = " \ libarchive \ " +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "gtk_doc" + inherit gnomebase gobject-introspection gtk-doc vala -SRC_URI[archive.md5sum] = "36ab263f477eeee3c95c9381766eb3c2" -SRC_URI[archive.sha256sum] = "0a34c377f8841abbf4c29bc848b301fbd8e4e20c03d7318c777c58432033657a" +SRC_URI[archive.sha256sum] = "c0afbe333bcf3cb1441a1f574cc8ec7b1b8197779145d4edeee2896fdacfc3c2" -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" } diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.36.0.bb deleted file mode 100644 index 6a765bd8b6..0000000000 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.36.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "GNOME wallpapers" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -SECTION = "x11/gnome" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase allarch gettext upstream-version-is-even allarch - -SRC_URI[archive.md5sum] = "1330dd3895b0cf054668a7c0db1c8487" -SRC_URI[archive.sha256sum] = "b8cb81e4cf9d085fbb23540635b492d5c124a1f8611c2aa9ac6384111d77bb0b" - -FILES_${PN} += " \ - ${datadir}/backgrounds \ - ${datadir}/gnome-background-properties \ -" diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb new file mode 100644 index 0000000000..d938ae94cb --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "GNOME wallpapers" +LICENSE = "CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b52fb0a6df395efb7047cb6fc56bfd7e" + +SECTION = "x11/gnome" + +inherit gnomebase gettext allarch + +SRC_URI[archive.sha256sum] = "4ddd3ac439a4a067876805921bb75f4d3c8b85a218d47c276dddde8928443c2e" + +FILES:${PN} += " \ + ${datadir}/backgrounds \ + ${datadir}/gnome-background-properties \ +" + +RDEPENDS:${PN} += "libjxl" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch new file mode 100644 index 0000000000..16c87b6a63 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch @@ -0,0 +1,25 @@ +From 7355664f671bec7852e3c4523d75c27fc77a2eb2 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Fri, 7 Jan 2022 12:51:22 +0100 +Subject: [PATCH] build: Fix build for newer versions of meson + +sendto/meson.build:24:5: ERROR: Function does not take positional arguments. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + sendto/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sendto/meson.build b/sendto/meson.build +index 24a4e39..3e233a0 100644 +--- a/sendto/meson.build ++++ b/sendto/meson.build +@@ -22,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb new file mode 100644 index 0000000000..2a97263125 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb @@ -0,0 +1,39 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" + +GNOMEBN = "gnome-bluetooth" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +# gtk-icon-cache bbclass will take care of this for us. +EXTRA_OEMESON = "-Dicon_update=false" + +SRC_URI += " file://0001-build-Fix-build-for-newer-versions-of-meson.patch" +SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" +SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" + +# avoid clashes with gnome-bluetooth +do_install:append() { + # just bluetooth-sendto / bluetooth-sendto.desktop only + rm -rf ${D}${bindir} + rm -rf ${D}${datadir}/applications +} + +FILES:${PN} += "${datadir}/gnome-bluetooth" + +# offer alternate bluetooth-sendto +RRECOMMENS:${PN} += "gnome-bluetooth" + +RDEPENDS:${PN} += "bluez5" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.1.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.1.bb deleted file mode 100644 index 77c89d95c2..0000000000 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.1.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -SECTION = "x11/gnome" - -DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" - -inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even - -REQUIRED_DISTRO_FEATURES = "x11" - -# gtk-icon-cache bbclass will take care of this for us. -EXTRA_OEMESON = "-Dicon_update=false" - -SRC_URI[archive.md5sum] = "09b6bab7ceaafb35da766a5476fbc466" -SRC_URI[archive.sha256sum] = "3ec91076c2822cd1f9abdc8e27663c3bda4c9c8a7a9773f9e92bfbf2b745d386" - -RDEPENDS_${PN} += "bluez5" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb new file mode 100644 index 0000000000..1b29e52c75 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb @@ -0,0 +1,43 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = " \ + udev \ + libnotify \ + libcanberra \ + bluez5 \ + upower \ + gtk4 \ + gsound \ + libadwaita \ +" + +GTKDOC_MESON_OPTION = "gtk_doc" +GTKIC_VERSION = "4" + +inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +SRC_URI[archive.sha256sum] = "13fe1e75f317acdbdf5e80c9029d2e0632d60a9ccf72a43ae36eb7545021fbef" + +BT_PULSE_PACKS = " \ + pulseaudio-lib-bluez5-util \ + pulseaudio-module-bluetooth-discover \ + pulseaudio-module-bluetooth-policy \ + pulseaudio-module-bluez5-device \ + pulseaudio-module-bluez5-discover \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" +PACKAGECONFIG[pulseaudio] = ",,,${BT_PULSE_PACKS}" + +FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" + +RDEPENDS:${PN} += "bluez5" diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.0.bb index c250981c42..5c7e27378c 100644 --- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb +++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_46.0.bb @@ -1,32 +1,37 @@ SUMMARY = "GNOME calculator" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "x11/gnome" DEPENDS = " \ yelp-tools-native \ - gtk+3 \ - libsoup-2.4 \ + gtk4 \ + libsoup-3.0 \ libgee \ + libxml2 \ libmpc \ - gtksourceview4 \ + gtksourceview5 \ + libadwaita \ " GIR_MESON_OPTION = 'disable-introspection' GIR_MESON_ENABLE_FLAG = 'false' GIR_MESON_DISABLE_FLAG = 'true' +VALA_MESON_OPTION = '' -GNOMEBASEBUILDCLASS = "meson" +GTKIC_VERSION = '4' -inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check upstream-version-is-even +inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext features_check -REQUIRED_DISTRO_FEATURES = "x11" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) -SRC_URI[archive.md5sum] = "71854fb58671b4a88ac990e2f2439e4f" -SRC_URI[archive.sha256sum] = "a2e830f9c9856fad65dad1d6c0ae6abad0f0b496c9984ac005315c5cc4220db3" +REQUIRED_DISTRO_FEATURES = "x11 opengl" -FILES_${PN} += " \ +SRC_URI[archive.sha256sum] = "44694fda6b6233923f5c10a48d02d2cf5724e011a8a85789074c953101f33bf1" + +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ ${datadir}/gnome-shell \ diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb new file mode 100644 index 0000000000..707c4b583f --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_46.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "GNOME calendar" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk4 \ + libical \ + gsettings-desktop-schemas \ + evolution-data-server \ + libsoup \ + libdazzle \ + libadwaita \ + libgweather4 \ + geoclue \ + geocode-glib \ +" + +GTKIC_VERSION = '4' +inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +SRC_URI[archive.sha256sum] = "5e21960c174bd8606d9089bf79c70f31070ab4837919878b00db2f14af9fe718" + +do_install:prepend() { + sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.h + sed -i -e 's|${S}/src|${TARGET_DBGSRC_DIR}/src|g' ${B}/src/gcal-enum-types.c +} + +FILES:${PN} += " \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" + diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb new file mode 100644 index 0000000000..bb53b58df7 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "GNOME Chess is a 2D chess game, where games can be played between a combination of human and computer players." +HOMEPAGE = "https://wiki.gnome.org/Apps/Chess" +LICENSE = "GPL-3.0-only" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" + +GTKIC_VERSION = "4" + +DEPENDS = " \ + appstream-glib-native \ + cairo \ + desktop-file-utils-native \ + glib-2.0 \ + glib-2.0 \ + gtk4 \ + libadwaita \ + librsvg \ + pango \ +" + +RRECOMMENDS:${PN} = "gnuchess" + +SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=master" + +inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings + +GIR_MESON_OPTION = "" + +S = "${WORKDIR}/git" +SRCREV = "c3625ee59ab3acfd7566ef04300b15ddbadaaac3" + +FILES:${PN} += "${datadir}" diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch b/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch new file mode 100644 index 0000000000..69237fd57a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-chess/gnuchess/0001-Remove-register-storage-class-classifier.patch @@ -0,0 +1,149 @@ +From 321eb9b1ca1b230063259dc43be8a2ab2f3bfee9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Jan 2023 22:16:36 -0800 +Subject: [PATCH] Remove 'register' storage class classifier + +This is gone with c++17 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/frontend/atak.cc | 4 ++-- + src/frontend/lexpgn.cc | 34 +++++++++++++++++----------------- + src/frontend/util.cc | 2 +- + 3 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/src/frontend/atak.cc b/src/frontend/atak.cc +index ef19d87..640e150 100644 +--- a/src/frontend/atak.cc ++++ b/src/frontend/atak.cc +@@ -37,7 +37,7 @@ short SqAtakd (short sq, short side) + * + **************************************************************************/ + { +- register BitBoard *a, b, *c, d, blocker; ++ BitBoard *a, b, *c, d, blocker; + int t; + + a = board.b[side]; +@@ -89,7 +89,7 @@ BitBoard AttackTo (int sq, int side) + * + ***************************************************************************/ + { +- register BitBoard *a, b, *c, e, blocker; ++ BitBoard *a, b, *c, e, blocker; + int t; + + a = board.b[side]; +diff --git a/src/frontend/lexpgn.cc b/src/frontend/lexpgn.cc +index 475899d..971aa13 100644 +--- a/src/frontend/lexpgn.cc ++++ b/src/frontend/lexpgn.cc +@@ -2431,9 +2431,9 @@ extern int yylex (void); + */ + YY_DECL + { +- register yy_state_type yy_current_state; +- register char *yy_cp, *yy_bp; +- register int yy_act; ++ yy_state_type yy_current_state; ++ char *yy_cp, *yy_bp; ++ int yy_act; + + #line 153 "lexpgn.ll" + +@@ -3118,9 +3118,9 @@ case YY_STATE_EOF(RAV): + */ + static int yy_get_next_buffer (void) + { +- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; +- register char *source = (yytext_ptr); +- register int number_to_move, i; ++ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; ++ char *source = (yytext_ptr); ++ int number_to_move, i; + int ret_val; + + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) +@@ -3252,8 +3252,8 @@ static int yy_get_next_buffer (void) + + static yy_state_type yy_get_previous_state (void) + { +- register yy_state_type yy_current_state; +- register char *yy_cp; ++ yy_state_type yy_current_state; ++ char *yy_cp; + + yy_current_state = (yy_start); + yy_current_state += YY_AT_BOL(); +@@ -3278,8 +3278,8 @@ static int yy_get_next_buffer (void) + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) + { +- register int yy_is_jam; +- register char *yy_cp = (yy_c_buf_p); ++ int yy_is_jam; ++ char *yy_cp = (yy_c_buf_p); + + yy_current_state = yy_nxt[yy_current_state][1]; + yy_is_jam = (yy_current_state <= 0); +@@ -3296,9 +3296,9 @@ static int yy_get_next_buffer (void) + return yy_is_jam ? 0 : yy_current_state; + } + +- static void yyunput (int c, register char * yy_bp ) ++ static void yyunput (int c, char * yy_bp ) + { +- register char *yy_cp; ++ char *yy_cp; + + yy_cp = (yy_c_buf_p); + +@@ -3308,10 +3308,10 @@ static int yy_get_next_buffer (void) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ +- register yy_size_t number_to_move = (yy_n_chars) + 2; +- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ ++ yy_size_t number_to_move = (yy_n_chars) + 2; ++ char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; +- register char *source = ++ char *source = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; + + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) +@@ -3925,7 +3925,7 @@ int yylex_destroy (void) + #ifndef yytext_ptr + static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + { +- register int i; ++ int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +@@ -3934,7 +3934,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) + #ifdef YY_NEED_STRLEN + static int yy_flex_strlen (yyconst char * s ) + { +- register int n; ++ int n; + for ( n = 0; s[n]; ++n ) + ; + +diff --git a/src/frontend/util.cc b/src/frontend/util.cc +index 5d3efe2..f7f7f1d 100644 +--- a/src/frontend/util.cc ++++ b/src/frontend/util.cc +@@ -75,7 +75,7 @@ void UpdateFriends (void) + * + ***************************************************************************/ + { +- register BitBoard *w, *b; ++ BitBoard *w, *b; + + w = board.b[white]; + b = board.b[black]; +-- +2.39.1 + diff --git a/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb b/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb new file mode 100644 index 0000000000..78606b8a2a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-chess/gnuchess_6.2.9.bb @@ -0,0 +1,20 @@ +SUMMARY = "GNU Chess is a chess-playing program." +HOMEPAGE = "http://www.gnu.org/software/chess/" +LICENSE = "GPL-3.0-only" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.gz \ + file://0001-Remove-register-storage-class-classifier.patch" +SRC_URI[sha256sum] = "03f9e844ccdd48d20ee49314174404f8b643d83bb8ce9ec9d2e6a21f1b6fb9f5" + +S = "${WORKDIR}/chess-${PV}" + +inherit autotools gettext + +do_configure:prepend() { + touch ${S}/ABOUT-NLS + touch ${S}/man/gnuchess.1 +} + +FILES:${PN} += "${datadir}" diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch new file mode 100644 index 0000000000..8f6920c2cc --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander/0001-Build-fix-needed-with-taglib-2.0.patch @@ -0,0 +1,37 @@ +From dc3aa0ff5a41114b17816f1f36f6bb5631c6ab5c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Mar 2024 17:17:29 -0800 +Subject: [PATCH] Build fix needed with taglib 2.0 + +Fixes +| ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:153:29: error: no member named 'sampleWidth' in 'TagLib::FLAC::Properties' +| 153 | if (flacProperties->sampleWidth()) +| | ~~~~~~~~~~~~~~ ^ +| ../gnome-commander-1.16.1/src/tags/gnome-cmd-tags-taglib.cc:154:67: error: no member named 'sampleWidth' in 'TagLib::FLAC::Properties' +| 154 | cout << "Audio.FLAC.SampleWidth " << flacProperties->sampleWidth()<< endl; +| | ~~~~~~~~~~~~~~ ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/tags/gnome-cmd-tags-taglib.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tags/gnome-cmd-tags-taglib.cc b/src/tags/gnome-cmd-tags-taglib.cc +index 9e65836..573f5eb 100644 +--- a/src/tags/gnome-cmd-tags-taglib.cc ++++ b/src/tags/gnome-cmd-tags-taglib.cc +@@ -150,8 +150,8 @@ bool getAudioProperties(GnomeCmdFileMetadata &metadata, const TagLib::AudioPrope + if (flacProperties) + { + metadata.add(TAG_AUDIO_CODEC,"FLAC"); +- if (flacProperties->sampleWidth()) +- cout << "Audio.FLAC.SampleWidth " << flacProperties->sampleWidth()<< endl; ++ if (flacProperties->bitsPerSample()) ++ cout << "Audio.FLAC.BitsPerSample " << flacProperties->bitsPerSample()<< endl; + + return true; + } +-- +2.44.0 + diff --git a/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb new file mode 100644 index 0000000000..bb36d59e56 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-commander/gnome-commander_1.16.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "A light and fast file manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +DEPENDS += " \ + desktop-file-utils-native \ + glib-2.0-native \ + gtk+ \ +" + +CXXFLAGS += "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" + +inherit gnomebase itstool gettext gnome-help features_check meson gtk-icon-cache mime-xdg +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +SRC_URI += "file://0001-Build-fix-needed-with-taglib-2.0.patch" +SRC_URI[archive.sha256sum] = "3f1d00c4a650fe7902167648286b32c9ca4ef86e31a5d8ccca0139f12d10d0b3" + +PACKAGECONFIG ??= "exiv2 taglib libgsf poppler" +PACKAGECONFIG[exiv2] = "-Dexiv2=enabled,-Dexiv2=disabled,exiv2" +PACKAGECONFIG[taglib] = "-Dtaglib=enabled,-Dtaglib=disabled,taglib" +PACKAGECONFIG[libgsf] = "-Dlibgsf=enabled,-Dlibgsf=disabled,libgsf" +PACKAGECONFIG[poppler] = "-Dpoppler=enabled,-Dpoppler=disabled,poppler" +PACKAGECONFIG[samba] = "-Dsamba=enabled,-Dsamba=disabled,samba" +PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled," + +FILES:${PN} += "${datadir}/metainfo" +FILES:${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb b/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb new file mode 100644 index 0000000000..d03b5fe04d --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "GNOME Console" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +GTKIC_VERSION = "4" +inherit gnomebase gsettings pkgconfig gtk-icon-cache +REQUIRED_DISTRO_FEATURES = "opengl" + +DEPENDS = " \ + desktop-file-utils-native \ + gtk4-native \ + glib-2.0 \ + gsettings-desktop-schemas \ + hicolor-icon-theme \ + libadwaita \ + libgtop \ + pcre2 \ + vte \ +" + +SRC_URI[archive.sha256sum] = "e7462128d2df2324a1d748062c40429cd0504af09e407067b33f3a9d0c59c8e1" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" +PACKAGECONFIG[devel] = "-Ddevel=true,-Ddevel=false" + +FILES:${PN} += "${datadir}" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 8170f514ed..4ae923f876 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -1,45 +1,52 @@ -From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 21 May 2019 16:07:46 +0200 +From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 18 Mar 2024 05:50:21 +0100 Subject: [PATCH] Add meson option to pass sysroot -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -We need to pass this to meson to help it finding gdesktop-enums.h: - -| panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist. +Signed-off-by: Markus Volk <f_l_k@t-online.de> Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- meson_options.txt | 1 + panels/background/meson.build | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + panels/system/meson.build | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index a347168..2cd8121 100644 +index e53d6e3f3..8fae4c824 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') - option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') + option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') option('documentation', type: 'boolean', value: false, description: 'build documentation') option('ibus', type: 'boolean', value: true, description: 'build with IBus support') diff --git a/panels/background/meson.build b/panels/background/meson.build -index bb34b69..f22722e 100644 +index 6ced050f9..df1f80896 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build -@@ -36,7 +36,7 @@ common_sources = [] +@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( enums = 'gdesktop-enums-types' enums_header = files( -- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', -+ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', - 'cc-background-item.h' +- gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h' ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h' + ) + + common_sources += gnome.mkenums( +diff --git a/panels/system/meson.build b/panels/system/meson.build +index 4fee82210..979332a0e 100644 +--- a/panels/system/meson.build ++++ b/panels/system/meson.build +@@ -73,7 +73,7 @@ sources += gnome.compile_resources( + ) + + enums_header = files( +- gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + 'datetime/cc-datetime-page.h' ) -- -2.20.1 +2.44.0 diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb deleted file mode 100644 index 81f42438e3..0000000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.3.bb +++ /dev/null @@ -1,55 +0,0 @@ -SUMMARY = "GNOME Settings" -DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check - -DEPENDS = " \ - gdk-pixbuf-native \ - colord-gtk \ - udisks2 \ - upower \ - polkit \ - pulseaudio \ - accountsservice \ - samba \ - gsettings-desktop-schemas \ - gnome-settings-daemon \ - gnome-desktop3 \ - gnome-online-accounts \ - libnma \ - gnome-bluetooth \ - grilo \ - libgtop \ - gsound \ - libpwquality \ -" - -REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" - -SRC_URI[archive.md5sum] = "fd99a8df0cc656e971415f2a1b310019" -SRC_URI[archive.sha256sum] = "bc174d970dbeca3ee19c26019de31e9edf78dc9c4abde16e763566ee38c3691c" -SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" - -PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" -PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" -PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" - -# Once we have (lib)cheese we can make cheese a PACKAGECONFIG -EXTRA_OEMESON = " \ - -Doe_sysroot=${STAGING_DIR_HOST} \ - -Dcheese=false \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gnome-shell \ - ${datadir}/metainfo \ -" - -FILES_${PN}-dev += "${datadir}/gettext" - -RDEPENDS_${PN} += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb new file mode 100644 index 0000000000..de11239ed5 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.1.bb @@ -0,0 +1,75 @@ +SUMMARY = "GNOME Settings" +DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GTKIC_VERSION = "4" + +DEPENDS = " \ + accountsservice \ + colord-gtk \ + gcr \ + gdk-pixbuf \ + glib-2.0 \ + gnome-bluetooth \ + gnome-desktop \ + gnome-online-accounts \ + gnome-settings-daemon \ + gsettings-desktop-schemas \ + gtk4 \ + libadwaita \ + libepoxy \ + libgtop \ + libgudev \ + libnma \ + libpwquality \ + libxml2 \ + polkit \ + pulseaudio \ + samba \ + setxkbmap-native \ + tecla \ + udisks2 \ + upower \ +" + +inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd + +REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" + +SRC_URI = "gitsm://gitlab.gnome.org/GNOME/gnome-control-center.git;protocol=https;nobranch=1" +SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" + +S = "${WORKDIR}/git" +SRCREV = "005f40dcfa464f113a1c95f97673bc5505fc15ad" + +PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[cups] = ",,cups,cups" +PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" +PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" + +EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" + +export XDG_DATA_DIRS = "${STAGING_DATADIR}" + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" + +do_install:append() { + if [ -d ${D}${datadir}/polkit-1/rules.d ]; then + chmod 700 ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}${datadir}/polkit-1/rules.d + fi +} + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-shell \ + ${datadir}/metainfo \ +" + +FILES:${PN}-dev += "${datadir}/gettext" + +RDEPENDS:${PN} += "gsettings-desktop-schemas tecla system-config-printer cups-pk-helper ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'gnome-user-share', '' , d)}" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch new file mode 100644 index 0000000000..65e06dafcb --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch @@ -0,0 +1,29 @@ +From 6937685426aff8059b68b2941a0fe549eca21ce5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 3 Mar 2023 23:04:56 -0800 +Subject: [PATCH] meson: Add riscv32 to seccomp unsupported list + +rv32 needs to upstream the libseccomp support + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6a888b8..a87c419 100644 +--- a/meson.build ++++ b/meson.build +@@ -65,7 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) + host_os = host_machine.system() + host_cpu = host_machine.cpu() + supported_os = ['linux'] +-unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64'] ++unsupported_cpus = ['alpha', 'ia64', 'm68k', 'riscv32', 'sh4', 'sparc', 'sparc64'] + if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) + seccomp_dep = dependency('libseccomp') + else +-- +2.39.2 + diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch deleted file mode 100644 index 4b3894f055..0000000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch +++ /dev/null @@ -1,40 +0,0 @@ -From de0d33b068a5d8e61cc0c82d88d15b9a8aa97977 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sat, 6 Apr 2019 18:07:17 +0200 -Subject: [PATCH] meson.build: Disable libseccomp for all archs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It does not seem mandatory and can cause unsatisfied dependency [1]. - -[1] https://errors.yoctoproject.org/Errors/Details/235565/ - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - meson.build | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index 2e7160d..f83677d 100644 ---- a/meson.build -+++ b/meson.build -@@ -58,12 +58,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) - host_os = host_machine.system() - host_cpu = host_machine.cpu() - supported_os = ['linux'] --unsupported_cpus = ['alpha', 'ia64', 'm68k', 'riscv64', 'sh4', 'sparc', 'sparc64'] --if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) -- seccomp_dep = dependency('libseccomp') --else -- seccomp_dep = dependency('', required: false) --endif -+seccomp_dep = dependency('', required: false) - fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir') - - xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') --- -2.20.1 - diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb deleted file mode 100644 index b7ef7545ae..0000000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.3.1.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ -" - -BPN = "gnome-desktop" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.md5sum] = "75e828342e51c88c866dcdd46c021d26" -SRC_URI[archive.sha256sum] = "4bed119fa25ea0ff7880928142365c3c8726585fc072bc147157e66b63e96b7e" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -inherit features_check gtk-doc -REQUIRED_DISTRO_FEATURES += "x11" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb new file mode 100644 index 0000000000..19bae74ce2 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb @@ -0,0 +1,48 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ +" + + +inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc + +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +GIR_MESON_OPTION = "" + +SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch" +SRC_URI[archive.sha256sum] = "42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42" + +DEPENDS += " \ + fontconfig \ + gdk-pixbuf \ + glib-2.0 \ + gsettings-desktop-schemas \ + gtk+3 \ + gtk4 \ + iso-codes \ + xext \ + libseccomp \ + libxkbcommon \ + xkeyboard-config \ + xrandr \ +" + +DEPENDS:remove:riscv32 = "libseccomp" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop" +RDEPENDS:${PN} += "libgnome-desktop" +FILES:libgnome-desktop = " \ + ${libdir}/lib*${SOLIBS} \ + ${datadir}/libgnome-desktop*/pnp.ids \ + ${datadir}/gnome/*xml \ +" + +RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch new file mode 100644 index 0000000000..675f4635ba --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch @@ -0,0 +1,135 @@ +From 36cbdd82f21e4ef37da9f05c1c5e770b6cd66df2 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sun, 29 May 2022 06:35:26 +0200 +Subject: [PATCH] gnome-disk-utility: remove libcanberra dependency + +libcanberra-gtk3 module isn't buildable for wayland. +Remove its dpendency. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Inappropriate +--- + meson.build | 1 - + src/disks/gducreatediskimagedialog.c | 27 ++------------------------- + src/disks/gdurestorediskimagedialog.c | 20 +------------------- + src/disks/meson.build | 1 - + 4 files changed, 3 insertions(+), 46 deletions(-) + +diff --git a/meson.build b/meson.build +index 0daf7f82..cba6c74b 100644 +--- a/meson.build ++++ b/meson.build +@@ -72,7 +72,6 @@ dvdread_dep = dependency('dvdread', version: '>= 4.2.0') + gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.31.0') + gmodule_dep = dependency('gmodule-2.0') + gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0') +-libcanberra_dep = dependency('libcanberra-gtk3', version: '>= 0.1') + # Keep the version here synchronised with subprojects/libhandy.wrap + libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0', fallback: ['libhandy', 'libhandy_dep']) + liblzma_dep = dependency('liblzma', version: '>= 5.0.5') +diff --git a/src/disks/gducreatediskimagedialog.c b/src/disks/gducreatediskimagedialog.c +index 181b2892..a22004cf 100644 +--- a/src/disks/gducreatediskimagedialog.c ++++ b/src/disks/gducreatediskimagedialog.c +@@ -21,8 +21,6 @@ + #include <sys/ioctl.h> + #include <linux/fs.h> + +-#include <canberra-gtk.h> +- + #include "gduapplication.h" + #include "gduwindow.h" + #include "gducreatediskimagedialog.h" +@@ -297,19 +295,7 @@ create_disk_image_populate (DialogData *data) + + static void + play_read_error_sound (DialogData *data) +-{ +- const gchar *sound_message; +- +- /* Translators: A descriptive string for the sound played when +- * there's a read error that's being ignored, see +- * CA_PROP_EVENT_DESCRIPTION +- */ +- sound_message = _("Disk image read error"); +- ca_gtk_play_for_widget (GTK_WIDGET (data->window), 0, +- CA_PROP_EVENT_ID, "dialog-warning", +- CA_PROP_EVENT_DESCRIPTION, sound_message, +- NULL); +-} ++{} + + /* ---------------------------------------------------------------------------------------------------- */ + +@@ -403,16 +389,7 @@ update_job (DialogData *data, + + static void + play_complete_sound (DialogData *data) +-{ +- const gchar *sound_message; +- +- /* Translators: A descriptive string for the 'complete' sound, see CA_PROP_EVENT_DESCRIPTION */ +- sound_message = _("Disk image copying complete"); +- ca_gtk_play_for_widget (GTK_WIDGET (data->window), 0, +- CA_PROP_EVENT_ID, "complete", +- CA_PROP_EVENT_DESCRIPTION, sound_message, +- NULL); +-} ++{} + + /* ---------------------------------------------------------------------------------------------------- */ + +diff --git a/src/disks/gdurestorediskimagedialog.c b/src/disks/gdurestorediskimagedialog.c +index bccf97e9..e7ec81cb 100644 +--- a/src/disks/gdurestorediskimagedialog.c ++++ b/src/disks/gdurestorediskimagedialog.c +@@ -17,8 +17,6 @@ + #include <sys/ioctl.h> + #include <linux/fs.h> + +-#include <canberra-gtk.h> +- + #include "gduapplication.h" + #include "gduwindow.h" + #include "gdurestorediskimagedialog.h" +@@ -606,23 +604,7 @@ update_job (DialogData *data, + + static void + play_complete_sound (DialogData *data) +-{ +- const gchar *sound_message; +- +- /* Translators: A descriptive string for the 'complete' sound, see CA_PROP_EVENT_DESCRIPTION */ +- sound_message = _("Disk image copying complete"); +- ca_gtk_play_for_widget (GTK_WIDGET (data->dialog), 0, +- CA_PROP_EVENT_ID, "complete", +- CA_PROP_EVENT_DESCRIPTION, sound_message, +- NULL); +- +- if (data->inhibit_cookie > 0) +- { +- gtk_application_uninhibit (GTK_APPLICATION (gdu_window_get_application (data->window)), +- data->inhibit_cookie); +- data->inhibit_cookie = 0; +- } +-} ++{} + + /* ---------------------------------------------------------------------------------------------------- */ + +diff --git a/src/disks/meson.build b/src/disks/meson.build +index 35b2f103..6fc367b4 100644 +--- a/src/disks/meson.build ++++ b/src/disks/meson.build +@@ -85,7 +85,6 @@ deps = [ + dvdread_dep, + gio_unix_dep, + gmodule_dep, +- libcanberra_dep, + libgdu_dep, + libhandy_dep, + liblzma_dep, +-- +2.25.1 + diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb new file mode 100644 index 0000000000..e4998f6276 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "GNOME disk utility" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SECTION = "x11/gnome" + +DEPENDS = " \ + desktop-file-utils-native \ + gtk+3 \ + libdvdread \ + libnotify \ + libsecret \ + libpwquality \ + udisks2 \ + libhandy \ + xz \ +" + + +inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "polkit" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}" + +# As soon as elogind is of interest this needs rework: meson option is combo +PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" +PACKAGECONFIG[x11] = ",,libcanberra" + +SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}" +SRC_URI[archive.sha256sum] = "464649148c6d6771f1ac2ebfe43a4e519205b11c2d914a09f2a001821d06957d" + +EXTRA_OEMESON = "-Dman=false" + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" diff --git a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.36.3.bb b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb index 6dd9894158..cf1122714f 100644 --- a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.36.3.bb +++ b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.46.0.bb @@ -1,7 +1,8 @@ SUMMARY = "GNOME Flashback (GNOME 2) session" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gsettings gtk-icon-cache gettext upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" @@ -13,21 +14,21 @@ DEPENDS += " \ polkit \ metacity \ gdm \ - gnome-desktop3 \ + gnome-desktop \ gnome-bluetooth \ gnome-panel \ " -SRC_URI[archive.md5sum] = "690b0d78c7d9265183ef18387b12fa50" -SRC_URI[archive.sha256sum] = "2dba9ea40f2da81c22954a8ccc29f8f1fa4ca8395a6bb552506635832751c1a7" +SRC_URI[archive.sha256sum] = "7a8d5c03310e4dfadd18a65e00a37741032afeea5418dd6804a975c4b0980045" -do_install_append() { +do_install:append() { # no oe-layer has compiz -> remove dead session rm -f ${D}${datadir}/xsessions/gnome-flashback-compiz.desktop } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/desktop-directories \ + ${datadir}/gnome-control-center \ ${datadir}/gnome-panel \ ${datadir}/gnome-session \ ${datadir}/xsessions \ @@ -35,4 +36,4 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} += "metacity" +RDEPENDS:${PN} += "metacity" diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb deleted file mode 100644 index cf202256b5..0000000000 --- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_3.34.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "GNOME font viewer" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SECTION = "x11/gnome" - -DEPENDS = " \ - gtk+3 \ - gnome-desktop3 \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "76004a8986ea622b09c408b01a6f42e5" -SRC_URI[archive.sha256sum] = "aa6f0583e5f93aec095e537f0638b29de3d02491f0131ef584a7c55d39d6b98b" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/thumbnailers \ -" diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb new file mode 100644 index 0000000000..dbce71d121 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "GNOME font viewer" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk4 \ + gnome-desktop \ + libadwaita \ +" + + +inherit gnomebase gtk-icon-cache gettext features_check mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/thumbnailers \ +" diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch index 32eecf8fb7..c3c3050924 100644 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring/0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch @@ -1,4 +1,4 @@ -From e6464e01bc1cdf5496be2942d1bac41aa609f47e Mon Sep 17 00:00:00 2001 +From 647f3d946ec3fe4800b2bec89371f85a1a4b15cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Thu, 23 May 2019 23:44:06 +0200 Subject: [PATCH] Set paths to ssh-agent and ssh-add by configure options @@ -11,15 +11,16 @@ We have no executables in our sysroot so configuration won't find them. Upstream-Status: Inappropriate [OE specific] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + --- configure.ac | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 4b83664..eda0c96 100644 +index f4f793c..5194e5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -351,8 +351,15 @@ if test "$enable_ssh_agent" = "no"; then +@@ -356,8 +356,15 @@ if test "$enable_ssh_agent" = "no"; then SSH_AGENT=false SSH_ADD=false else @@ -37,6 +38,3 @@ index 4b83664..eda0c96 100644 if test "$SSH_AGENT" = "no" -o "$SSH_ADD" = "no"; then AC_MSG_ERROR([the ssh-agent and ssh-add commands were not found]) else --- -2.20.1 - diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb index 8f318bb157..8df3710e6a 100644 --- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb +++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnome.org/" BUGTRACKER = "https://bugzilla.gnome.org/" SECTION = "x11/gnome" -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ @@ -12,17 +12,17 @@ LIC_FILES_CHKSUM = " \ DEPENDS = " \ glib-2.0-native \ gtk+3 \ - gcr \ + gcr3 \ libgcrypt \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ " -inherit gnomebase gsettings features_check remove-libtool gettext upstream-version-is-even +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gsettings features_check gettext -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.md5sum] = "38f0732845a510a8dff4f154c3406f65" -SRC_URI[archive.sha256sum] = "a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87" +SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6" SRC_URI += " \ file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ file://musl.patch \ @@ -36,17 +36,16 @@ EXTRA_OECONF = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)} \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1/services \ ${datadir}/p11-kit \ ${datadir}/xdg-desktop-portal \ ${base_libdir}/security/*${SOLIBSDEV} \ ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ + ${systemd_user_unitdir} \ " - # fix | gnome-keyring-daemon: insufficient process capabilities, unsecure memory might get used -# This does not make it through pseudo so perform on-target - sigh -pkg_postinst_ontarget_${PN} () { - setcap cap_ipc_lock+ep `which gnome-keyring-daemon` +pkg_postinst:${PN} () { + setcap cap_ipc_lock+ep $D/${bindir}/gnome-keyring-daemon } -RDEPENDS_${PN} += "libcap-bin" +PACKAGE_WRITE_DEPS += "libcap-native" diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb index 845b314788..47b6733e48 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.36.0.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb @@ -1,18 +1,15 @@ SUMMARY = "GNOME menus" SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -DEPENDS = "python3 libxml2 popt gtk+3 gnome-common-native" +DEPENDS = "glib-2.0" -inherit features_check gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even - -REQUIRED_DISTRO_FEATURES = "x11" - -BPN = "gnome-menus" +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gettext pkgconfig gobject-introspection upstream-version-is-even SRC_URI[archive.md5sum] = "a8fd71fcf31a87fc799d80396a526829" SRC_URI[archive.sha256sum] = "d9348f38bde956fc32753b28c1cde19c175bfdbf1f4d5b06003b3aa09153bb1f" -FILES_${PN} += "${datadir}/desktop-directories/" +FILES:${PN} += "${datadir}/desktop-directories/" diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb deleted file mode 100644 index c3142ad9f9..0000000000 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" - -GNOMEBASEBUILDCLASS = "autotools" - -inherit gnomebase gsettings gobject-introspection gsettings gtk-doc vala gettext upstream-version-is-even features_check - -# for webkitgtk -REQUIRED_DISTRO_FEATURES = "x11" - -DEPENDS = "glib-2.0" - -SRC_URI[archive.md5sum] = "44a37e1f8d4cac1dca0c41b57b49c2d0" -SRC_URI[archive.sha256sum] = "1c8f62990833ca41188dbb80c5e99d99b57a62608ca675bbcd37bc2244742f2e" - -# backend is required for gnome-control-center -PACKAGECONFIG = "backend other" - -PACKAGECONFIG[backend] = "--enable-backend,--disable-backend,gtk+3 webkitgtk libsoup-2.4 json-glib libsecret rest libxml2" -PACKAGECONFIG[krb5] = "--enable-kerberos, --disable-kerberos , krb5 gcr" - -# no extra dependencies! -PACKAGECONFIG[other] = " \ - --enable-facebook --enable-foursquare --enable-exchange --enable-flickr --enable-google --enable-imap-smtp --enable-owncloud --enable-windows-live,\ - --disable-facebook --disable-foursquare --disable-exchange --disable-flickr --disable-google --disable-imap-smtp --disable-owncloud --disable-windows-live, \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/goa-1.0/web-extensions/*.so \ -" - -# looked into pkg-config file: it is not a bug - they mean it -FILES_${PN}-dev += "${libdir}/goa-1.0/include" diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb new file mode 100644 index 0000000000..66df8902fa --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.50.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" + +GTKIC_VERSION = "4" +inherit gnomebase gsettings gobject-introspection gtk-icon-cache mime-xdg vala features_check +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend', 'opengl', '', d)}" + +DEPENDS += "gdk-pixbuf dbus glib-2.0 gcr" + +SRC_URI[archive.sha256sum] = "42ee43fd1e2942b9ff6106252ccdc834602815508bf7a3a52c0bdfffa56eaf40" + +PACKAGECONFIG ?= "goabackend kerberos owncloud google windows_live" + +PACKAGECONFIG[goabackend] = "-Dgoabackend=true,-Dgoabackend=false,gtk4 libadwaita json-glib libxml2 libsoup rest libsecret webkitgtk" +PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5" +PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false" +PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false" +PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false" +PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/goa-1.0/web-extensions/*.so \ +" + +# looked into pkg-config file: it is not a bug - they mean it +FILES:${PN}-dev += "${libdir}/goa-1.0/include" diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.36.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.36.1.bb deleted file mode 100644 index 8fe4e1311b..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.36.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "GNOME flashback panel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -inherit gnomebase gsettings itstool gnome-help gtk-icon-cache gtk-doc gettext upstream-version-is-even features_check - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" - -DEPENDS += " \ - yelp-tools-native \ - libwnck3 \ - polkit \ - dconf \ - libgweather \ - gnome-menus3 \ - gnome-desktop3 \ - gdm \ -" - -SRC_URI[archive.md5sum] = "b6bb185ce1724f4b19699042d90282a6" -SRC_URI[archive.sha256sum] = "1e21b726dd397523ae79d29eb538bcae09e3427e23ccd63f28eb25ef3552abd3" - -PACKAGECONFIG[eds] = "--enable-eds,--disable-eds,evolution-data-server" - -RDEPENDS_${PN} += "gdm-base" diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.47.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.47.1.bb new file mode 100644 index 0000000000..02a8b01b26 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.47.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "GNOME flashback panel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gsettings itstool gnome-help gtk-icon-cache gettext upstream-version-is-even features_check + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" + +DEPENDS += " \ + yelp-tools-native \ + libwnck3 \ + polkit \ + dconf \ + libgweather4 \ + gnome-menus \ + gnome-desktop \ + gdm \ +" + +SRC_URI[archive.sha256sum] = "d8f6e2c659668c77df82c3dd95ba04fcef8c40c228e2c22605f9a17a9161ec83" + +PACKAGECONFIG[eds] = "--enable-eds,--disable-eds,evolution-data-server" + +RDEPENDS:${PN} += "gdm-base" diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb deleted file mode 100644 index bb70ae7a89..0000000000 --- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Access, organize and share your photos on GNOME" -SECTION = "x11/gnome" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" - -DEPENDS = " \ - glib-2.0-native \ - gdk-pixbuf-native \ - librsvg-native \ - gtk+3 \ - babl \ - gegl \ - geocode-glib \ - gnome-online-accounts \ - grilo \ - gsettings-desktop-schemas \ - libdazzle \ - libgdata \ - gfbgraph \ - tracker \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext upstream-version-is-even gnome-help features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "1dd0d477eac4707e8cfe9f35e26d1f29" -SRC_URI[archive.sha256sum] = "3c59c76ef28618ec055a1799d1040287b90a0b021feb0a02b1eac28e9c2eb41a" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ -" diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb new file mode 100644 index 0000000000..4b05e52ca0 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_44.0.bb @@ -0,0 +1,59 @@ +SUMMARY = "Access, organize and share your photos on GNOME" +SECTION = "x11/gnome" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = " \ + cairo \ + glib-2.0-native \ + gdk-pixbuf-native \ + librsvg-native \ + gtk+3 \ + babl \ + dbus \ + gegl \ + geocode-glib \ + gexiv2 \ + gnome-online-accounts \ + gsettings-desktop-schemas \ + libdazzle \ + tracker \ + libhandy \ + libportal \ +" + +RDEPENDS:${PN} = "tracker-miners" + + +inherit gnomebase gettext gnome-help features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[doc] = "-Dmanuals=true,-Dmanuals=false,libxslt-native docbook-xsl-stylesheets-native" + +SRC_URI[archive.sha256sum] = "e78e210397d3c62809c6cd5521da6eccb4a11ddea5bf2af8632a47f4da5c829e" + +do_install:append() { + # make gnome-photos available on all desktops + sed -i 's:OnlyShowIn=:#OnlyShowIn=:g' ${D}${datadir}/applications/org.gnome.Photos.desktop +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ +" + +do_compile:append() { + # glib-mkenums is embedding full paths into this file. There's no + # option to it to use a sysroot style variable. So to avoid QA + # errors, we sed WORKDIR out and make its includes relative + sed -i "s|${B}||" src/photos-enums.h + sed -i "s|${B}||" src/photos-enums.c + sed -i "s|${B}||" src/photos-enums-gegl.c + sed -i "s|${B}||" src/photos-enums-gegl.h +} diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch new file mode 100644 index 0000000000..c80fda63a3 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot/0001-meson-remove-extraneous-positional-argument.patch @@ -0,0 +1,36 @@ +From c38c604b06a63f690d67318d4ef97ac556264876 Mon Sep 17 00:00:00 2001 +From: Jack Hill <jackhill@jackhill.us> +Date: Thu, 18 Nov 2021 00:46:58 -0500 +Subject: [PATCH] meson: remove extraneous positional argument + +* data/meson.build (desktop_file) + (metainfo_file): Remove extraneous positional argument. + +Closes #186 + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd570b3..4e2e2e8 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,7 +1,6 @@ + gnome = import('gnome') + + desktop_file = i18n.merge_file( +- 'desktop', + type: 'desktop', + input: 'org.gnome.Screenshot.desktop.in', + output: 'org.gnome.Screenshot.desktop', +@@ -23,7 +22,6 @@ if desktop_file_validate.found() + endif + + metainfo_file = i18n.merge_file( +- 'appdata', + input: 'org.gnome.Screenshot.metainfo.xml.in', + output: 'org.gnome.Screenshot.metainfo.xml', + po_dir: join_paths(meson.current_source_dir(), '../po'), diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb new file mode 100644 index 0000000000..4f82492e61 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "GNOME Screenshot" +DESCRIPTION = "GNOME Screenshot is a small utility that takes a screenshot \ +of the whole desktop, the currently focused window, or an area of the screen." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +SECTION = "x11/gnome" + +inherit features_check gnomebase gettext upstream-version-is-even pkgconfig + +SRC_URI += " file://0001-meson-remove-extraneous-positional-argument.patch" +SRC_URI[archive.sha256sum] = "4adb7dec926428f74263d5796673cf142e4720b6e768f5468a8d0933f98c9597" + +DEPENDS += "glib-2.0 glib-2.0-native gtk+3 libhandy xext" + +REQUIRED_DISTRO_FEATURES = "x11" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb deleted file mode 100644 index 29a2e1ee2f..0000000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "GNOME session" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = " \ - glib-2.0-native \ - libxslt-native \ - xmlto-native \ - xtrans \ - libice \ - libsm \ - virtual/libx11 \ - gtk+3 \ - gnome-desktop3 \ - gsettings-desktop-schemas \ - json-glib \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext gsettings upstream-version-is-even features_check - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" - -SRC_URI[archive.md5sum] = "cd23e30c4991ca1f477020c67ea3a540" -SRC_URI[archive.sha256sum] = "d54b38b818c812f64b82cc6a1279e3ca5a6e391ee662793322a38cab5670bb7a" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}" - -PACKAGECONFIG[consolekit] = "-Dconsolekit=true, -Dconsolekit=false, consolekit" -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dsystemd_journal=true, -Dsystemd=false -Dsystemd_journal=false, systemd" - -FILES_${PN} += " \ - ${datadir}/xsessions \ - ${datadir}/wayland-sessions \ - ${systemd_user_unitdir} \ -" - -RDEPENDS_${PN} += "gnome-shell gnome-settings-daemon gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb new file mode 100644 index 0000000000..94e639456f --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb @@ -0,0 +1,34 @@ +SUMMARY = "GNOME session" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = " \ + glib-2.0-native \ + xtrans \ + libice \ + libsm \ + virtual/libx11 \ + gtk+3 \ + gnome-desktop \ + json-glib \ + systemd \ +" + + +inherit gnomebase gettext gsettings upstream-version-is-even features_check + +REQUIRED_DISTRO_FEATURES = "polkit systemd pam gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "c6e1624af6090bc4e1a191fe2268abfa7a8de07831ca7a57f217e679bf7b9a54" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[docbook] = "-Ddocbook=true, -Ddocbook=false" +PACKAGECONFIG[man] = "-Dman=true, -Dman=false,xmlto-native libxslt-native" + +FILES:${PN} += " \ + ${datadir}/xdg-desktop-portal \ + ${datadir}/xsessions \ + ${datadir}/wayland-sessions \ + ${systemd_user_unitdir} \ +" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb index a9f5274092..d409e77eae 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb @@ -1,20 +1,16 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even -SRC_URI[archive.md5sum] = "528b0b7cc2dd22c6026a9c8739c71fa7" -SRC_URI[archive.sha256sum] = "7ce4979817866911a94ecb75b36db56797e038c0c524c5c1a81aefccafc17337" - DEPENDS = " \ colord \ geocode-glib \ gcr \ - gnome-desktop3 \ - libgweather \ + gnome-desktop \ + libgweather4 \ lcms \ libcanberra \ geoclue \ @@ -26,34 +22,29 @@ DEPENDS = " \ # all these are mandatory REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.md5sum] = "102dc488a6a726e4050cf5ab7e967e8d" -SRC_URI[archive.sha256sum] = "3e33dbd319b562a5ab602dcab6de3ca81b85f8346672e90ec632b36bbf15ee4b" +GIR_MESON_OPTION = "" -# allow cross build mixed with build of native tools -do_write_config_append() { - cat >${WORKDIR}/meson.native <<EOF -[binaries] -pkgconfig = 'pkg-config-native' -EOF -} -EXTRA_OEMESON = "--native-file ${WORKDIR}/meson.native" +SRC_URI[archive.sha256sum] = "0b9a0f64fa18a8e7e09b4c95a3f754fa033c2cdbd2dc35701f0618572c1cb3d7" PACKAGECONFIG ??= " \ cups nm \ alsa gudev \ + smartcard \ ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ " PACKAGECONFIG[alsa] = "-Dalsa=true,-Dalsa=false,alsa-lib" PACKAGECONFIG[cups] = "-Dcups=true,-Dcups=false,cups" PACKAGECONFIG[gudev] = "-Dgudev=true,-Dgudev=false,libgudev" PACKAGECONFIG[nm] = "-Dnetwork_manager=true,-Dnetwork_manager=false,networkmanager" +PACKAGECONFIG[smartcard] = "-Dsmartcard=true,-Dsmartcard=false,nss" PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" -FILES_${PN} += " \ +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES:${PN} += " \ ${systemd_user_unitdir} \ - ${libdir}/gnome-settings-daemon-3.0/libgsd.so \ + ${libdir}/gnome-settings-daemon-${@gnome_verdir("${PV}")}/libgsd.so \ " - -RDEPEND_${PN} += "gdbus" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_3.34.2.bb deleted file mode 100644 index 52e50705e8..0000000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_3.34.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GNOME Shell Extensions" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext gsettings features_check upstream-version-is-even - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" - -SRC_URI[archive.md5sum] = "d3a69cde0c3e3dc0b0c243af026c4b7a" -SRC_URI[archive.sha256sum] = "a1e16e75a06ea511435a6f7478de92aff21d02d4e1d59ec8ce7fb6396819b4b8" - -DEPENDS += " \ - sassc-native \ -" - -EXTRA_OEMESON += " \ - -Dextension_set=all \ - -Dclassic_mode=true \ -" - -RDEPENDS_${PN} += "gnome-shell" - -FILES_${PN} += " \ - ${datadir}/gnome-shell \ - ${datadir}/gnome-session \ - ${datadir}/xsessions \ -" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb new file mode 100644 index 0000000000..eff5fecffe --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_46.0.bb @@ -0,0 +1,23 @@ +SUMMARY = "GNOME Shell Extensions" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101" + +inherit gnomebase gettext gsettings features_check + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "d8138f88cd92df9f932309149c236fbdd77c1bc095445036ab7eb0ecda53c01a" + +EXTRA_OEMESON += " \ + -Dextension_set=all \ + -Dclassic_mode=true \ +" + +RDEPENDS:${PN} += "gnome-shell" + +FILES:${PN} += " \ + ${datadir}/gnome-shell \ + ${datadir}/gnome-session \ + ${datadir}/wayland-sessions \ + ${datadir}/xsessions \ +" diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch new file mode 100644 index 0000000000..8ef0da16fe --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch @@ -0,0 +1,124 @@ +From e9835f650d70bf22ad0e5d8c2179aa01b2d18955 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 28 Oct 2021 18:57:24 +0200 +Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + js/dbusServices/meson.build | 2 +- + meson.build | 6 +++++- + meson_options.txt | 6 ++++++ + subprojects/extensions-app/js/meson.build | 2 +- + subprojects/extensions-app/meson.build | 7 ++++++- + subprojects/extensions-app/meson_options.txt | 6 ++++++ + 6 files changed, 25 insertions(+), 4 deletions(-) + +diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build +index 48b7f89..700b590 100644 +--- a/js/dbusServices/meson.build ++++ b/js/dbusServices/meson.build +@@ -22,7 +22,7 @@ foreach service, dir : dbus_services + + serviceconf = configuration_data() + serviceconf.set('service', service) +- serviceconf.set('gjs', gjs.full_path()) ++ serviceconf.set('gjs', gjs) + serviceconf.set('pkgdatadir', pkgdatadir) + + configure_file( +diff --git a/meson.build b/meson.build +index a6d83b1..2c612a8 100644 +--- a/meson.build ++++ b/meson.build +@@ -134,7 +134,11 @@ endif + + mutter_typelibdir = mutter_dep.get_variable('typelibdir') + python = find_program('python3') +-gjs = find_program('gjs') ++if get_option('gjs_path') == '' ++ gjs = find_program('gjs') ++else ++ gjs = get_option('gjs_path') ++endif + + cc = meson.get_compiler('c') + +diff --git a/meson_options.txt b/meson_options.txt +index 6e83d92..1bf0ecb 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -45,3 +45,9 @@ option('systemd', + value: true, + description: 'Enable systemd integration' + ) ++ ++option('gjs_path', ++ type: 'string', ++ value: '', ++ description: 'Instead of searching gjs executable, configure path' ++) +diff --git a/subprojects/extensions-app/js/meson.build b/subprojects/extensions-app/js/meson.build +index c9a67f8..91ae887 100644 +--- a/subprojects/extensions-app/js/meson.build ++++ b/subprojects/extensions-app/js/meson.build +@@ -9,7 +9,7 @@ endif + launcherconf.set('prefix', prefix) + launcherconf.set('libdir', libdir) + launcherconf.set('pkgdatadir', pkgdatadir) +-launcherconf.set('gjs', gjs.full_path()) ++launcherconf.set('gjs', gjs) + + configure_file( + input: prgname + '.in', +diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build +index 45f391b..d581408 100644 +--- a/subprojects/extensions-app/meson.build ++++ b/subprojects/extensions-app/meson.build +@@ -47,7 +47,12 @@ metainfodir = join_paths(datadir, 'metainfo') + schemadir = join_paths(datadir, 'glib-2.0', 'schemas') + servicedir = join_paths(datadir, 'dbus-1', 'services') + +-gjs = find_program('gjs') ++if get_option('gjs_path') == '' ++ gjs = find_program('gjs') ++else ++ gjs = get_option('gjs_path') ++endif ++ + appstream_util = find_program('appstream-util', required: false) + appstreamcli = find_program('appstreamcli', required: false) + desktop_file_validate = find_program('desktop-file-validate', required: false) +diff --git a/subprojects/extensions-app/meson_options.txt b/subprojects/extensions-app/meson_options.txt +index ca2eb41..2787785 100644 +--- a/subprojects/extensions-app/meson_options.txt ++++ b/subprojects/extensions-app/meson_options.txt +@@ -10,3 +10,9 @@ option('profile', + ], + value: 'default' + ) ++ ++option('gjs_path', ++ type: 'string', ++ value: '', ++ description: 'Instead of searching gjs executable, configure path' ++) diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb deleted file mode 100644 index 9619628c81..0000000000 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.34.5.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gettext gobject-introspection features_check upstream-version-is-even bash-completion - -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" - -DEPENDS = " \ - libxml2-native \ - sassc-native \ - gtk+3 \ - mutter \ - evolution-data-server \ - gcr \ - gjs \ - gnome-autoar \ - polkit \ - libcroco \ - startup-notification \ - ibus \ - gsettings-desktop-schemas \ -" - -GTKDOC_MESON_OPTION = "gtk_doc" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -SRC_URI[archive.md5sum] = "4bd27c8a91d30fde78cb69b94677cf1f" -SRC_URI[archive.sha256sum] = "d296f318a74a6d7883358a6ce1c4d8808b7903dbbb4f9c61ab4230f18e6d7550" - -PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" -PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false, networkmanager" -PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" - -EXTRA_OEMESON = " \ - -Dman=false \ -" - -do_install_append() { - # fix shebangs - for tool in `find ${D}${bindir} -name '*-tool'`; do - sed -i 's:#!${PYTHON}:#!${bindir}/${PYTHON_PN}:' $tool - done -} - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gnome-control-center \ - ${datadir}/xdg-desktop-portal \ - ${systemd_user_unitdir} \ -" - -RDEPENDS_${PN} += "gsettings-desktop-schemas gdm-base librsvg-gtk" - -PACKAGES =+ "${PN}-tools" -FILES_${PN}-tools = "${bindir}/*-tool" -RDEPENDS_${PN}-tools = "python3-core" - diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb new file mode 100644 index 0000000000..907cfdf678 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb @@ -0,0 +1,86 @@ +SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + + +DEPENDS = " \ + libxml2-native \ + gtk4 \ + mutter \ + evolution-data-server \ + gcr \ + geocode-glib \ + gjs \ + gnome-autoar \ + gnome-desktop \ + polkit \ + pipewire \ + libsoup-3.0 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'startup-notification', d)} \ + ibus \ + gsettings-desktop-schemas \ +" + +inherit gnomebase gsettings gettext gobject-introspection gtk-icon-cache features_check bash-completion + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" + +GTKIC_VERSION = "4" +GTKDOC_MESON_OPTION = "gtk_doc" +GIR_MESON_OPTION = "" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" + +SRC_URI[archive.sha256sum] = "6bc41340b6de05774e97cfe20feba86e2b3cc9c8139118f24bd84ac63e82b53e" +SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" + +PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" +PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false,networkmanager libsecret,networkmanager" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +EXTRA_OEMESON = " \ + -Dgjs_path=${bindir}/gjs \ + -Dextensions-app:gjs_path=${bindir}/gjs \ + -Dtests=false \ + -Dman=false \ +" + +do_install:append() { + # fix shebangs + for tool in `find ${D}${bindir} -name '*-tool'`; do + sed -i 's:#!${PYTHON}:#!${bindir}/python3:' $tool + done +} + +GSETTINGS_PACKAGE = "${PN}-gsettings" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ + ${datadir}/gnome-control-center \ + ${datadir}/xdg-desktop-portal \ + ${systemd_user_unitdir} \ +" + +RDEPENDS:${PN} += " \ + accountsservice \ + adwaita-icon-theme \ + adwaita-icon-theme-cursors \ + gdm-base \ + gnome-control-center \ + gnome-backgrounds \ + gnome-bluetooth \ + gnome-desktop \ + gnome-session \ + gnome-settings-daemon \ + gnome-shell-gsettings \ + gsettings-desktop-schemas \ + librsvg-gtk \ +" + +PACKAGES =+ "${PN}-tools ${PN}-gsettings" +FILES:${PN}-tools = "${bindir}/*-tool" +RDEPENDS:${PN}-tools = "python3-core" + diff --git a/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb b/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb new file mode 100644 index 0000000000..40a7141fca --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-software/gnome-software_46.0.bb @@ -0,0 +1,43 @@ +SUMMARY = "GNOME Software allows users to easily find, discover and install apps." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GTKDOC_MESON_OPTION ?= "gtk_doc" + +inherit gnomebase gsettings itstool gnome-help gtk-icon-cache gtk-doc mime mime-xdg gettext upstream-version-is-even features_check + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" + +DEPENDS += " \ + appstream \ + gdk-pixbuf \ + glib-2.0 \ + glib-2.0-native \ + gsettings-desktop-schemas \ + gtk4 \ + iso-codes \ + json-glib \ + libadwaita \ + libgudev \ + libsoup-3.0 \ + libxmlb-native \ + polkit \ +" + +RDEPENDS:${PN} = "iso-codes" + +EXTRA_OEMESON += "-Dtests=false -Dsoup2=false" + +SRC_URI[archive.sha256sum] = "11893002bbb54082896683707bc3991ae55a2f3040811a760e3a92c96544f86e" + +PACKAGECONFIG ?= "flatpak" +PACKAGECONFIG[flatpak] = "-Dflatpak=true,-Dflatpak=false,flatpak ostree" +PACKAGECONFIG[snap] = "-Dsnap=true,-Dsnap=false,snapd-glib" +PACKAGECONFIG[gtk_doc] = "-Dgtk_doc=true,-Dgtk_doc=false,libxslt-native docbook-xsl-stylesheets" +PACKAGECONFIG[man] = "-Dman=true,-Dman=false,libxslt-native docbook-xsl-stylesheets" +PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false,gnome-packagekit,gnome-packagekit" +PACKAGECONFIG[fwupd] = "-Dfwupd=true,-Dfwupd=false,fwupd,fwupd" +PACKAGECONFIG[malcontent] = "-Dmalcontent=true,-Dmalcontent=false,malcontent" + +FILES:${PN} += "${datadir}" +FILES:${PN}-dev += "${libdir}/gnome-software/libgnomesoftware.so" diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb index ddd11201b1..eaeaa2cb0f 100644 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb @@ -1,32 +1,38 @@ SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = " \ gnome-common-native \ libxml2-native \ glib-2.0-native \ - gtkmm3 \ + glibmm-2.68 \ + gtkmm4 \ + gtk4 \ + libadwaita \ libgtop \ librsvg \ polkit \ + libhandy \ " -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext upstream-version-is-even +inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext -REQUIRED_DISTRO_FEATURES = "x11 polkit" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "polkit" -SRC_URI[archive.md5sum] = "b1443ab12c3b7bcca940d28754e5b948" -SRC_URI[archive.sha256sum] = "866b47ab0f4c75b0ec57d6300337a7373463aaad5df95eddfe5354c22be7bca1" +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "5376248158c686c308255472e8c2a9e4c17255642c149fc7198c6d034e547599" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" -RRECOMMENDS_${PN} = "adwaita-icon-theme" +RRECOMMENDS:${PN} = "adwaita-icon-theme" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/metainfo \ " diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch index a69390eb2b..ef722a0e7d 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -1,6 +1,6 @@ From f231cecc151930fd5b6309da317a8c5bc6001f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 17 Nov 2019 15:55:54 +0100 +Date: Sat, 30 Oct 2021 15:10:28 +0200 Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -10,14 +10,14 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- - src/terminal.c | 6 ++++++ - 1 file changed, 6 insertions(+) + src/terminal.cc | 5 +++++ + 1 file changed, 5 insertions(+) -diff --git a/src/terminal.c b/src/terminal.c -index d06ce35..6284e4c 100644 ---- a/src/terminal.c -+++ b/src/terminal.c -@@ -47,6 +47,12 @@ +diff --git a/src/terminal.cc b/src/terminal.cc +index 27ee91e..5f4d880 100644 +--- a/src/terminal.cc ++++ b/src/terminal.cc +@@ -47,6 +47,11 @@ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) @@ -26,10 +26,9 @@ index d06ce35..6284e4c 100644 +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +#endif + -+ /* Wait-for-exit helper */ typedef struct { -- -2.21.0 +2.31.1 diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch new file mode 100644 index 0000000000..9f8475bdd2 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch @@ -0,0 +1,63 @@ +From 61668e1eb86a316d4ad9a6b9cacf8c8cc74a0c33 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Sun, 7 Jan 2024 10:40:31 +0100 +Subject: [PATCH] meson: add an option to set dbus_interface_dir + +Add an option that allows to set the dbus_interface_dir path manually. +This will help to cross-compile gnome-terminal on host systems that +don't have gnome-shell installed. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/8046] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson_options.txt | 7 +++++++ + src/meson.build | 7 ++++++- + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/meson_options.txt b/meson_options.txt +index b555ab66..8fece058 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -13,6 +13,13 @@ + # You should have received a copy of the GNU General Public License + # along with this programme. If not, see <https://www.gnu.org/licenses/>. + ++option( ++ 'dbus_interface_dir', ++ type: 'string', ++ value: '', ++ description: 'directory for D-Bus session interface files [$datadir/dbus-1/interfaces]', ++) ++ + option( + 'dbg', + type: 'boolean', +diff --git a/src/meson.build b/src/meson.build +index 27ecd893..420ad45c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -185,6 +185,11 @@ server_sources = app_sources + client_util_sources + debug_sources + dbus_source + + if get_option('search_provider') + ++ dbus_interface_dir = get_option('dbus_interface_dir') ++ if dbus_interface_dir == '' ++ dbus_interface_dir = gt_prefix / gt_dbusinterfacedir ++ endif ++ + server_sources += files( + 'terminal-search-provider.cc', + 'terminal-search-provider.hh', +@@ -192,7 +197,7 @@ if get_option('search_provider') + + server_sources += gnome.gdbus_codegen( + 'terminal-search-provider-gdbus-generated', +- gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml', ++ dbus_interface_dir / 'org.gnome.ShellSearchProvider2.xml', + autocleanup: 'none', + install_header: false, + interface_prefix: 'org.gnome.Shell', +-- +2.43.0 + diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb deleted file mode 100644 index ce54faab2c..0000000000 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "GNOME terminal" -LICENSE = "GPLv3 & GFDL-1.3" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ -" - -inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even - -DEPENDS = " \ - glib-2.0-native \ - intltool-native \ - yelp-tools-native \ - desktop-file-utils-native \ - gtk+3 \ - gsettings-desktop-schemas \ - vte \ - dconf \ - libpcre2 \ -" - -SRC_URI[archive.md5sum] = "08150cbf2e23dd4f60f959a6eca8ef0c" -SRC_URI[archive.sha256sum] = "41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46" -SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" - -EXTRA_OECONF += " \ - --disable-search-provider \ - --without-nautilus-extension \ -" - -FILES_${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/dbus-1 \ - ${systemd_user_unitdir} \ -" - -RRECOMMENDS_${PN} += "vte-prompt gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb new file mode 100644 index 0000000000..3bbfe9ece0 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb @@ -0,0 +1,42 @@ +SUMMARY = "GNOME terminal" +LICENSE = "GPL-3.0-only & GFDL-1.3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ +" + +inherit gnomebase pkgconfig gsettings gnome-help gettext itstool upstream-version-is-even + +DEPENDS = " \ + glib-2.0 \ + docbook-xsl-stylesheets-native libxslt-native \ + desktop-file-utils-native \ + gtk+3 \ + gsettings-desktop-schemas \ + vte \ + dconf \ + libhandy \ + libpcre2 \ +" + +SRC_URI = " \ + git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1 \ + file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ + file://0001-meson-add-option-to-set-dbus_interfacedir.patch \ +" +SRCREV = "5ac3b8e4bd6fa02651b3c23cedb0a7e1cd769655" +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus" +PACKAGECONFIG[search_provider] = "-Dsearch_provider=true -Ddbus_interface_dir=${STAGING_DATADIR}/dbus-1/interfaces,-Dsearch_provider=false,gnome-shell" + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES:${PN} += " \ + ${datadir} \ + ${libdir}/nautilus/extensions-4 \ + ${systemd_user_unitdir} \ +" + +RRECOMMENDS:${PN} += "vte-prompt gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb new file mode 100644 index 0000000000..f37eb71952 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_46.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "A simple text editor" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + + +DEPENDS = " \ + desktop-file-utils-native \ + libadwaita \ + gtk4 \ + gtksourceview5 \ + editorconfig-core-c \ + enchant2 \ +" + +GTKIC_VERSION = "4" + +inherit gnomebase gtk-icon-cache itstool gnome-help mime-xdg features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI[archive.sha256sum] = "8ebfa0bea12e75f5efeacc721be3b8ae65027b024aa81db9ecab8c312257a2eb" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch index 8129f85a4d..733249c7e6 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0001-Make-python-path-configurable.patch @@ -16,14 +16,14 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> create mode 100644 meson_options.txt diff --git a/meson.build b/meson.build -index b7da518..d58fb5b 100644 +index 5b824e9..a673d9c 100644 --- a/meson.build +++ b/meson.build -@@ -13,7 +13,7 @@ bindir = join_paths(prefix, get_option('bindir')) +@@ -18,7 +18,7 @@ bindir = join_paths(prefix, get_option('bindir')) datadir = join_paths(prefix, get_option('datadir')) libexecdir = join_paths(prefix, get_option('libexecdir')) localedir = join_paths(prefix, get_option('localedir')) --pythondir = join_paths(prefix, python3.sysconfig_path('purelib')) +-pythondir = join_paths(prefix, python3.get_path('purelib')) +pythondir = get_option('python_site_dir') pkgdatadir = join_paths(datadir, meson.project_name()) diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch new file mode 100644 index 0000000000..d921ff3308 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -0,0 +1,33 @@ +From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 +From: Mae Dartmann <hello@maedartmann.name> +Date: Wed, 16 Feb 2022 06:08:41 +0000 +Subject: [PATCH] meson: fix invalid positional argument + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd6d5da..74f7e82 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + appdata_file = 'org.gnome.tweaks.appdata.xml' +-i18n.merge_file(appdata_file, ++i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, + ) + + desktop_file = 'org.gnome.tweaks.desktop' +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: desktop_file + '.in', + output: desktop_file, + po_dir: '../po', +-- +GitLab + diff --git a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.34.0.bb b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb index af4c8c6418..a8d6a2ad69 100644 --- a/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_3.34.0.bb +++ b/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME tweaks: Advanced options for GNOME 3 session" -LICENSE = "GPLv3 & CC0-1.0" +LICENSE = "GPL-3.0-only & CC0-1.0" LIC_FILES_CHKSUM = " \ file://LICENSES/CC0-1.0;md5=65d3616852dbf7b1a6d4b53b00626032 \ file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746 \ @@ -7,26 +7,27 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "libhandy" -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gtk-icon-cache gobject-introspection features_check upstream-version-is-even +inherit gnomebase gtk-icon-cache gobject-introspection features_check # same as gnome-shell REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" +GIR_MESON_OPTION = "" -SRC_URI[archive.md5sum] = "a625d8b167c5549c68e1c6ac7a87d369" -SRC_URI[archive.sha256sum] = "003326fab46e6faad9485924bca503f0c583e3b4553d6f673406eda396205250" -SRC_URI += "file://0001-Make-python-path-configurable.patch" +SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" +SRC_URI += " \ + file://0001-Make-python-path-configurable.patch \ + file://0002-meson-fix-invalid-positional-argument.patch \ +" EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/metainfo \ ${PYTHON_SITEPACKAGES_DIR} \ " -RDEPENDS_${PN} += "gnome-shell python3-core python3-logging libhandy" +RDEPENDS:${PN} += "gnome-shell python3-core python3-logging libhandy" diff --git a/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb new file mode 100644 index 0000000000..6fc78dd296 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-user-share/gnome-user-share_43.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "This is gnome-user-share 43.0, a system for easy sharing of user files." +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + + +DEPENDS = " \ + glib-2.0-native \ + glib-2.0 \ + systemd \ +" + +inherit gnomebase gsettings features_check + +REQUIRED_DISTRO_FEATURES = "systemd" + +SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-user-share.git;protocol=https;branch=master" +SRCREV = "a0e790aa9494db9d1b1f48b4fc0d2f78e112044d" +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "modules" +PACKAGECONFIG[httpd] = "-Dhttpd=${sbindir}/httpd,,,apache2 mod-dnssd" +PACKAGECONFIG[modules] = "-Dmodules_path=${libexecdir}/apache2/modules" + +FILES:${PN} += "${systemd_user_unitdir}" diff --git a/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb b/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb deleted file mode 100644 index f715dd23d3..0000000000 --- a/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "A thin layer of graphic data types" -HOMEPAGE = "http://ebassi.github.io/graphene/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" - -#DEPENDS = "gtk+3 iso-codes enchant2" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gobject-introspection gtk-doc - -SRC_URI[archive.md5sum] = "07f72436bc7a85d12f5edd9fcedd0184" -SRC_URI[archive.sha256sum] = "406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499" - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = "-Dinstalled_tests=false" - -FILES_${PN} += "${libdir}/graphene-1.0" diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch new file mode 100644 index 0000000000..6e565e60d5 --- /dev/null +++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins/0001-Avoid-running-trackertestutils.patch @@ -0,0 +1,32 @@ +From a76c5c40f95b2961bed8f6427080f0fcf6ec00d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 15 May 2021 23:25:09 +0200 +Subject: [PATCH] Avoid running trackertestutils +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It breaks configuration: +| ../grilo-plugins-0.3.13/tests/tracker3/meson.build:5:0: ERROR: Program '/usr/lib/tracker-3.0/trackertestutils/tracker-sandbox' not found + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index fca5f98..3c1aa06 100644 +--- a/meson.build ++++ b/meson.build +@@ -98,7 +98,7 @@ totem_plparser_dep = dependency('totem-plparser', version: '>= 3.4.1', required: + totem_plparser_mini_dep = dependency('totem-plparser-mini', version: '>= 3.4.1', required: false) + tracker_sparql_dep = dependency('tracker-sparql-2.0', version: '>= 2.3.0', required: false) + tracker3_dep = dependency('tracker-sparql-3.0', required: false) +-tracker3_testutils_dep = dependency('tracker-testutils-3.0', required: false) ++tracker3_testutils_dep = dependency('tracker-testutils-3.0-avoid-find', required: false) + + lua_pkg = [ + 'lua', diff --git a/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb new file mode 100644 index 0000000000..40603993f3 --- /dev/null +++ b/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.16.bb @@ -0,0 +1,23 @@ +SUMMARY = "Grilo is a framework forsearching media content from various sources" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = " \ + glib-2.0-native \ + gperf-native \ + itstool-native \ + grilo \ + lua \ + liboauth \ +" + + +inherit gnomebase gnome-help vala + +SRC_URI += "file://0001-Avoid-running-trackertestutils.patch" +SRC_URI[archive.sha256sum] = "fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'tracker', '', d)}" +PACKAGECONFIG[tracker] = "-Denable-tracker3=yes,-Denable-tracker3=no,tracker" + +FILES:${PN} += "${libdir}/grilo-0.3" diff --git a/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb index 0338455bcf..14e1ca9fe1 100644 --- a/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb +++ b/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb @@ -1,5 +1,5 @@ SUMMARY = "Grilo is a framework forsearching media content from various sources" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ @@ -7,12 +7,10 @@ DEPENDS = " \ glib-2.0 \ " -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc gettext vala -SRC_URI[archive.md5sum] = "b464ce84db6f9354996a1d47b3c613da" -SRC_URI[archive.sha256sum] = "dbfbd6082103288592af97568180b9cc81a336a274ed5160412f87675ec11a71" +SRC_URI[archive.sha256sum] = "884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96" GIR_MESON_OPTION = "enable-introspection" GTKDOC_MESON_OPTION = "enable-gtk-doc" @@ -21,9 +19,12 @@ GTKDOC_MESON_OPTION = "enable-gtk-doc" # | bindings/vala/meson.build:15:0: ERROR: Unknown variable "grlnet_gir". PACKAGECONFIG ??= "net" -PACKAGECONFIG[net] = "-Denable-grl-net=true, -Denable-grl-net=false, libsoup-2.4" +PACKAGECONFIG[net] = "-Denable-grl-net=true, -Denable-grl-net=false, libsoup-3.0" PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 liboauth" # Once we have a recipe for 'totem-plparser' this can turn into a PACKAGECONFIG EXTRA_OEMESON = "-Denable-grl-pls=false" +do_compile:append() { + sed -i -e 's,${B}/../,,' ${B}/src/grl-type-builtins.h +} diff --git a/meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb index e4478e14a3..6a50c22c73 100644 --- a/meta-gnome/recipes-gnome/gsound/gsound_1.0.2.bb +++ b/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Small gobject library for playing system sounds" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=447b837ae57f08b7060593ac6256163f" DEPENDS = " \ @@ -7,7 +7,9 @@ DEPENDS = " \ libcanberra \ " + +VALA_MESON_OPTION = "enable_vala" + inherit gnomebase gettext gobject-introspection vala -SRC_URI[archive.md5sum] = "c26fd21c21b9ef6533a202a73fab21db" -SRC_URI[archive.sha256sum] = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53" +SRC_URI[archive.sha256sum] = "ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a" diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.12.2.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.12.2.bb new file mode 100644 index 0000000000..2668fc009f --- /dev/null +++ b/meta-gnome/recipes-gnome/gspell/gspell_1.12.2.bb @@ -0,0 +1,11 @@ +SUMMARY = "gspell adds spell-checking to a GTK+ applications" +HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" + +DEPENDS = "gtk+3 icu enchant2" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gettext gobject-introspection vala gtk-doc + +SRC_URI[archive.sha256sum] = "b4e993bd827e4ceb6a770b1b5e8950fce3be9c8b2b0cbeb22fdf992808dd2139" diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb deleted file mode 100644 index 44cdefc33f..0000000000 --- a/meta-gnome/recipes-gnome/gspell/gspell_1.8.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "gspell adds spell-checking to a GTK+ applications" -HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" - -DEPENDS = "gtk+3 iso-codes enchant2" - -inherit gnomebase gettext gobject-introspection - -SRC_URI[archive.md5sum] = "d0892000d944e87fd74e8611ef400cdb" -SRC_URI[archive.sha256sum] = "5ae514dd0216be069176accf6d0049d6a01cfa6a50df4bc06be85f7080b62de8" diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.4.bb new file mode 100644 index 0000000000..79db8b7d75 --- /dev/null +++ b/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.4.bb @@ -0,0 +1,30 @@ +SUMMARY = "Image viewer and browser" +LICENSE="GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + + +REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" + +DEPENDS = " \ + glib-2.0-native \ + bison-native \ + yelp-tools-native \ + gtk+3 \ + gsettings-desktop-schemas \ + zlib \ + jpeg \ + exiv2 \ + colord \ + lcms \ + libraw \ + librsvg \ + libsoup \ + json-glib \ + libsecret \ +" + +inherit features_check gnomebase gnome-help gsettings itstool mime-xdg + +SRC_URI[archive.sha256sum] = "add693ac0aeb9a30d829ba03a06208289d3f6868dc3b02573549e88190c794e8" + +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch b/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch new file mode 100644 index 0000000000..8230bbbd16 --- /dev/null +++ b/meta-gnome/recipes-gnome/gtksourceview/files/0001-remove-pointless-check.patch @@ -0,0 +1,38 @@ +From 397751846130f79d5fbe8d617b788f3bcbb36816 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 9 Jan 2024 22:20:03 +0000 +Subject: [PATCH] meson: remove pointless gtk-doc check + +There's no point explicitly checking for gtk-doc, for two reasons: + +1) In cross-compiled environments this looks for a target gtk-doc, not a + native gtk-doc, so it should set native:true. + +2) The gnome.gtkdoc() function checks for gtk-doc itself. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtksourceview/-/merge_requests/351] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + meson.build | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/meson.build b/meson.build +index ba07da70..1109daea 100644 +--- a/meson.build ++++ b/meson.build +@@ -107,12 +107,6 @@ else + vapigen_dep = [] + endif + +-if build_gtk_doc +- gtk_doc_dep = dependency('gtk-doc', version: gtk_doc_req) +-else +- gtk_doc_dep = [] +-endif +- + # Look for the libxml2 library manually on Visual Studio if + # its pkg-config file could not be found, as the NMake + # Makefiles of libxml2 do not generate the pkg-config files +-- +2.34.1 + diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb index bcc3106d96..4e1e434314 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Gtksourceview Classic-Light theme" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://classic-light.xml;beginline=6;endline=23;md5=2b4f75364fad00a4d752214dcbd7d7c3" inherit allarch @@ -15,7 +15,7 @@ do_install() { install -m 0644 ${WORKDIR}/classic-light.xml ${D}${datadir}/gtksourceview-4/styles/ } -FILES_${PN} = " \ +FILES:${PN} = " \ ${datadir}/gtksourceview-3.0/styles \ ${datadir}/gtksourceview-4/styles \ " diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index 13f81b4c90..e504186b82 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -1,15 +1,16 @@ SUMMARY = "Portable C library for multiline text editing" HOMEPAGE = "http://projects.gnome.org/gtksourceview/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" +DEPENDS = "gtk+3 libxml2 glib-2.0-native" PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection upstream-version-is-even REQUIRED_DISTRO_FEATURES = "x11" @@ -18,4 +19,4 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/${PNAME}-${ SRC_URI[md5sum] = "b748da426a7d64e1304f0c532b0f2a67" SRC_URI[sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd" -FILES_${PN} += " ${datadir}/gtksourceview-3.0" +FILES:${PN} += " ${datadir}/gtksourceview-3.0" diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb deleted file mode 100644 index bc7f4b05e9..0000000000 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Portable C library for multiline text editing" -HOMEPAGE = "http://projects.gnome.org/gtksourceview/" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" - -PNAME = "gtksourceview" - -S = "${WORKDIR}/${PNAME}-${PV}" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.6/${PNAME}-${PV}.tar.xz" -SRC_URI[md5sum] = "51558b386cd12602b7bb1c460c09bc62" -SRC_URI[sha256sum] = "4c13e30ab2e602abdc56f55d35f43c1142a79b1cd77aa8839d2fc85e966d9a85" - -GIR_MESON_OPTION = 'gir' -GTKDOC_MESON_OPTION = "gtk_doc" - -FILES_${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb new file mode 100644 index 0000000000..38ca4a39e6 --- /dev/null +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb @@ -0,0 +1,24 @@ +SUMMARY = "Portable C library for multiline text editing" +HOMEPAGE = "http://projects.gnome.org/gtksourceview/" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "gtk+3 libxml2 glib-2.0-native" + +PNAME = "gtksourceview" + +S = "${WORKDIR}/${PNAME}-${PV}" + +inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI = "https://download.gnome.org/sources/gtksourceview/4.8/${PNAME}-${PV}.tar.xz \ + file://0001-remove-pointless-check.patch" +SRC_URI[sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d" + +GIR_MESON_OPTION = 'gir' +GTKDOC_MESON_OPTION = "gtk_doc" + +FILES:${PN} += "${datadir}/gtksourceview-4" diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.12.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.12.0.bb new file mode 100644 index 0000000000..f3267acbeb --- /dev/null +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.12.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "Portable C library for multiline text editing" +HOMEPAGE = "http://projects.gnome.org/gtksourceview/" + +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = " \ + fribidi \ + glib-2.0-native \ + fontconfig \ + gtk4 \ + libxml2 \ + libpcre2 \ + pango \ +" + +PNAME = "gtksourceview" + +S = "${WORKDIR}/${PNAME}-${PV}" + + +inherit gnomebase lib_package gettext features_check gi-docgen gtk-icon-cache gobject-introspection vala + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.12/${PNAME}-${PV}.tar.xz" +SRC_URI[sha256sum] = "daf32ff5d3150d6385917d3503a85b9e047ba158b2b03079314c9c00813fa01f" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GIDOCGEN_MESON_OPTION = "documentation" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}" +PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers" + +FILES:${PN} += "${datadir}/gtksourceview-5" diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb index ec0ac2b296..01cdb4eef5 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb @@ -1,30 +1,35 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd -DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ - gsettings-desktop-schemas dbus" +DEPENDS += "\ + dbus \ + glib-2.0 \ + glib-2.0-native \ + gsettings-desktop-schemas \ + libgudev \ + libsecret \ + libxml2 \ + shadow-native \ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974" -SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46" -# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 -REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI[archive.sha256sum] = "f53d81df86c2e86cdd25182c2d8a669a22371e83623ded1b9d5416dcfc6de366" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OEMESON = " \ -Dbluray=false \ - -Dgoa=false \ - -Dgoogle=false \ - -Dnfs=false \ " PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/glib-2.0 \ ${datadir}/GConf \ ${datadir}/dbus-1/services \ @@ -33,14 +38,14 @@ FILES_${PN} += " \ ${systemd_user_unitdir} \ " -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" -FILES_${PN}-dev += "${libdir}/gio/modules/*.la" +FILES:${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES:${PN}-dev += "${libdir}/gio/modules/*.la" -FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" -FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" -FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" +FILES:gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" +FILES:gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" +FILES:gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" -RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" +RRECOMMENDS:gvfsd-ftp += "openssh-sftp openssh-ssh" PACKAGECONFIG ?= "libgphoto2 \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ @@ -54,27 +59,32 @@ PACKAGECONFIG[afc] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" -PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" +PACKAGECONFIG[gcrypt] = "-Dgcrypt=true, -Dgcrypt=false, libgcrypt" +PACKAGECONFIG[goa] = "-Dgoa=true, -Dgoa=false, gnome-online-accounts" +PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false, libgdata" +PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-3.0" PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" +PACKAGECONFIG[nfs] = "-Dnfs=true, -Dnfs=false,libnfs" +PACKAGECONFIG[onedrive] = "-Donedrive=true, -Donedrive=false, msgraph" PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" # needs meta-filesystems -PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3" # libcdio-paranoia recipe doesn't exist yet PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/${BPN}-1 polkitd" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + chmod 700 ${D}${datadir}/polkit-1/rules.d + chown polkitd:root ${D}${datadir}/polkit-1/rules.d fi # After rebuilds (not from scracth) it can happen that the executables in diff --git a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb deleted file mode 100644 index 90e5533015..0000000000 --- a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" - -inherit meson gobject-introspection - -SRCREV = "145e417f32e507b63c21ad4e915b808a6174099e" -SRC_URI = "git://github.com/gnome/libchamplain.git" - -S = "${WORKDIR}/git" - diff --git a/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb new file mode 100644 index 0000000000..a89ab8cc74 --- /dev/null +++ b/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.21.bb @@ -0,0 +1,14 @@ +SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +DEPENDS = "glib-2.0 gtk+3 clutter-1.0 clutter-gtk-1.0 libsoup-3.0 cairo sqlite3" + +inherit features_check gobject-introspection meson pkgconfig vala + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRCREV = "941560af497148588783db991e8135f52a82574d" +SRC_URI = "git://github.com/gnome/libchamplain.git;branch=master;protocol=https" + +S = "${WORKDIR}/git" + diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb index 9ce8bb8e95..a65fc61feb 100644 --- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb +++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb @@ -2,27 +2,26 @@ SUMMARY = "GLib-based library for accessing online service APIs using the GData HOMEPAGE = "http://live.gnome.org/libgdata" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" -DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib" +DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr3 json-glib" GTKDOC_MESON_OPTION = "gtk_doc" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages features_check -# gcr -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goa', 'opengl', '', d)}" -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" } # goa is required for gnome-photos -PACKAGECONFIG ??= "goa gtk" +PACKAGECONFIG ??= "goa gtk vala" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" PACKAGECONFIG[goa] = "-Dgoa=enabled,-Dgoa=disabled,gnome-online-accounts" PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" @@ -30,5 +29,4 @@ PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" EXTRA_OEMESON = "-Dalways_build_tests=false" -SRC_URI[archive.md5sum] = "9d5692a2308bb949af801be66989e164" -SRC_URI[archive.sha256sum] = "a0fd6f8820e8bae019c1f6ffab5af7fcd6d7f147915bb968b56df3ad61b42318" +SRC_URI[archive.sha256sum] = "dd8592eeb6512ad0a8cf5c8be8c72e76f74bfe6b23e4dd93f0756ee0716804c7" diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.47.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.47.bb deleted file mode 100644 index 6d82b35eb9..0000000000 --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.47.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "GNOME Structured File Library" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ - file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63" - -SECTION = "libs" - -DEPENDS= "libxml2 bzip2 glib-2.0 zlib gnome-common-native" - -inherit gnomebase gobject-introspection gettext gtk-doc - -SRC_URI[archive.md5sum] = "20bf9933128210d7a9f920a34198d22f" -SRC_URI[archive.sha256sum] = "d188ebd3787b5375a8fd38ee6f761a2007de5e98fa0cf5623f271daa67ba774d" -SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" - -EXTRA_OECONF = "\ - --with-bz2 \ -" - -FILES_${PN} += "${datadir}/thumbnailers" diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb new file mode 100644 index 0000000000..7e1842b1ac --- /dev/null +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb @@ -0,0 +1,22 @@ +SUMMARY = "GNOME Structured File Library" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=61464cfe342798eeced82efe9ae55f63" + +SECTION = "libs" + +DEPENDS= "libxml2 bzip2 glib-2.0 zlib" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gobject-introspection gettext gtk-doc + +SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0" +SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" + +EXTRA_OECONF = "\ + --with-bz2 \ +" + +FILES:${PN} += "${datadir}/thumbnailers" diff --git a/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh b/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh deleted file mode 100644 index b1302ede0e..0000000000 --- a/meta-gnome/recipes-gnome/libgtkstylus/files/gtkstylus.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -GTK_MODULES=libgtkstylus.so - -export GTK_MODULES diff --git a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb deleted file mode 100644 index a990bfcfd9..0000000000 --- a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GTK plugin for stylus based systems" -SECTION = "libs" -DEPENDS = "gtk+" -LICENSE = "LGPL-2.0+" -LIC_FILES_CHKSUM = "file://tap.c;beginline=1;endline=20;md5=71756eeb144e9eeb177c69aa672b1635" -PR = "r4" - -inherit features_check autotools pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://burtonini.com/temp/${BP}.tar.gz \ - file://gtkstylus.sh" -SRC_URI[md5sum] = "fa1c82cd9fd2fafd7ff10d78eb5781c5" -SRC_URI[sha256sum] = "383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c" - -do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus -} - -# Horrible but rpm falls over if you use '*' -GTKVER = "2.10.0" - -FILES_${PN} = "${sysconfdir} \ - ${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so.*" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/${GTKVER}/modules/.debug" -FILES_${PN}-dev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.so" -FILES_${PN}-staticdev += "${libdir}/gtk-2.0/${GTKVER}/modules/libgtkstylus.*a" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch b/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch deleted file mode 100644 index c4f7da4bf6..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop/0001-netload-Include-libc-net-headers-unconditionally.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3c6f70e50cb586ac4add4dea627c316242691040 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 09:17:29 -0700 -Subject: [PATCH] netload: Include libc net headers unconditionally - -This fixes compile with musl, and this conditional -is not needed now a days if we are still using glibc < 1.0 -we have other bigger problems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sysdeps/linux/netload.c | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c -index c275db2..446bddd 100644 ---- a/sysdeps/linux/netload.c -+++ b/sysdeps/linux/netload.c -@@ -34,8 +34,6 @@ - #include <sys/socket.h> - #include <sys/ioctl.h> - --#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 --/* GNU LibC */ - #include <net/if.h> - #include <netinet/ip_icmp.h> - #include <netinet/in.h> -@@ -43,15 +41,6 @@ - #include <netinet/tcp.h> - #include <netinet/udp.h> - #include <net/if.h> --#else /* Libc 5 */ --#include <linux/if.h> --#include <linux/in.h> --#include <linux/ip.h> --#include <linux/icmp.h> --#include <linux/tcp.h> --#include <linux/udp.h> --#endif -- - - #ifdef HAVE_IFADDRS_H - /* needed for IPV6 support */ --- -2.13.2 - diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb deleted file mode 100644 index f0c9cdb0e2..0000000000 --- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "LibGTop2" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even - -# depends on libxau -inherit features_check -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "c6d67325cd97b2208b41e07e6cc7b947" -SRC_URI[archive.sha256sum] = "78f3274c0c79c434c03655c1b35edf7b95ec0421430897fb1345a98a265ed2d4" - -DEPENDS = "glib-2.0 libxau" - -EXTRA_OEMAKE += "LIBGTOP_LIBS=" diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb new file mode 100644 index 0000000000..5587baa0f7 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.41.3.bb @@ -0,0 +1,12 @@ +SUMMARY = "A library for collecting system monitoring data" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.sha256sum] = "775676df958e2ea2452f7568f28b2ea581063d312773dd5c0b7624c1b9b2da8c" + +DEPENDS = "glib-2.0 libxau" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch new file mode 100644 index 0000000000..3a075de651 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch @@ -0,0 +1,26 @@ +From 179102310e9a3729fb5b00f2a7bf24b12f4a7a83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 16 Apr 2022 20:04:14 +0200 +Subject: [PATCH] Allow building gir in cross environments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For us this works perfectly fine + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +--- a/meson.build 2022-09-18 14:48:53.000000000 +0200 ++++ b/meson.build 2022-11-26 14:05:13.302487232 +0100 +@@ -51,7 +51,7 @@ + gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py') + + g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) +-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() ++build_gir = get_option('introspection') and g_ir_scanner.found() + build_docs = get_option('gtk_doc') and build_gir + + schemas_srcdir = meson.project_source_root() / 'schemas' diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb new file mode 100644 index 0000000000..acf2885281 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb @@ -0,0 +1,30 @@ +SUMMARY = "A library to access weather information from online services" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +GNOMEBN = "libgweather" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +inherit gnomebase gsettings gobject-introspection gettext gi-docgen vala features_check + +REQUIRED_DISTRO_FEATURES = "opengl" + +SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch" +SRC_URI[archive.sha256sum] = "a6e427b4770ada48945f3aa906af710fc833cff0d42df91f1828302740d794ec" + +GTKDOC_MESON_OPTION = "gtk_doc" +VALA_MESON_OPTION = "enable_vala" + +DEPENDS = " \ + geocode-glib \ + gtk4 \ + json-glib \ + libsoup-3.0 \ + python3-pygobject-native \ +" + +FILES:${PN} += " \ + ${datadir}/libgweather-4 \ + ${libdir}/libgweather-4 \ +" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.0.bb deleted file mode 100644 index 914010b21c..0000000000 --- a/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "A library to access weather information from online services" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even - -SRC_URI[archive.md5sum] = "32e43c6b35bec88a5549ab62c71913cb" -SRC_URI[archive.sha256sum] = "d2ffeec01788d03d1bbf35113fc2f054c6c3600721088f827bcc31e5c603a32d" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -GTKDOC_MESON_OPTION = "gtk_doc" - -DEPENDS = " \ - gtk+3 \ - json-glib \ - libsoup-2.4 \ - geocode-glib \ -" diff --git a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb index a0874521ef..bafe7af040 100644 --- a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb +++ b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb @@ -1,11 +1,10 @@ DESCRIPTION = "Time zone map widget for Gtk+" HOMEPAGE = "https://launchpad.net/timezonemap" SECTION = "devel/lib" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/libt/${BPN}/${BPN}_${PV}.tar.gz" -SRC_URI[md5sum] = "f85a21994a397fb1ff2d3ec404bdd592" +SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[sha256sum] = "0d634cc2476d8f57d1ee1864bd4f442180ae4bf040a9ae4bf73b66bbd85d7195" DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native" @@ -16,6 +15,6 @@ inherit features_check autotools pkgconfig gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" -do_configure_prepend() { +do_configure:prepend() { (cd ${S}; NOCONFIGURE="yes" . ${S}/autogen.sh) } diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb deleted file mode 100644 index 8bca93f6d1..0000000000 --- a/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "libwnck" - -SECTION = "x11/libs" -DEPENDS = "intltool-native gnome-common-native gtk+3 gdk-pixbuf-native libxres" - -PACKAGECONFIG ??= "startup-notification" -PACKAGECONFIG[startup-notification] = "-Dstartup_notification=enabled,-Dstartup_notification=disabled,startup-notification" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -inherit gnomebase gobject-introspection gtk-doc gettext features_check - -SRC_URI[archive.md5sum] = "00bb40dc6fab76af0da33e88a34b6378" -SRC_URI[archive.sha256sum] = "bc508150b3ed5d22354b0e6774ad4eee465381ebc0ace45eb0e2d3a4186c925f" - -# libxres means x11 only -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb new file mode 100644 index 0000000000..c7f7989115 --- /dev/null +++ b/meta-gnome/recipes-gnome/libwnck/libwnck3_43.0.bb @@ -0,0 +1,26 @@ +SUMMARY = "Window navigation construction toolkit" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +BPN = "libwnck" + +SECTION = "x11/libs" +DEPENDS = "cairo glib-2.0 gtk+3" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG[x11] = "-Dstartup_notification=enabled,-Dstartup_notification=disabled,startup-notification libxres" + +GTKDOC_MESON_OPTION = "gtk_doc" +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +inherit gnomebase gobject-introspection gtk-doc gettext features_check + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +SRC_URI[archive.sha256sum] = "905bcdb85847d6b8f8861e56b30cd6dc61eae67ecef4cd994a9f925a26a2c1fe" + +# gtk+3 and libepoxy need to be built with x11 PACKAGECONFIG. +# cairo would at least needed to be built with xlib. +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index 9eb041c27f..d7f47002f8 100644 --- a/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "x11/libs" @@ -8,13 +8,14 @@ DEPENDS = "intltool-native gnome-common-native gtk+ gdk-pixbuf-native libxres" PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -inherit gnomebase gobject-introspection features_check +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" -do_install_append() { +do_install:append() { # to avoid conflicts with libwnck3 remove cmdline tools # if the tools are requrired add libwnck3 to your image rm ${D}${bindir}/wnckprop diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch index 29eeef3d50..6c32bfa14f 100644 --- a/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch @@ -12,7 +12,7 @@ libxklavier.vapi': No such file or directory | 21 make[3]: *** [install-vapiDATA] Error 1 | 22 make[3]: *** Waiting for unfinished jobs.... -Upstream-Stauts: Pending +Upstream-Status: Pending Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index 3cef0d2e50..f52c210ed4 100644 --- a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb @@ -1,14 +1,14 @@ SUMMARY = "Helper lib for keyboard management" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" -inherit autotools pkgconfig gettext gobject-introspection features_check +inherit autotools pkgconfig gettext gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11" -RDEPENDS_${PN} += "iso-codes xkbcomp" +RDEPENDS:${PN} += "iso-codes xkbcomp" SRC_URI = " \ http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/${BPN}-${PV}.tar.bz2 \ @@ -18,16 +18,16 @@ SRC_URI = " \ SRC_URI[md5sum] = "13af74dcb6011ecedf1e3ed122bd31fa" SRC_URI[sha256sum] = "17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320" -FILES_${PN} += "${datadir}/*" +FILES:${PN} += "${datadir}/*" EXTRA_OECONF = "--with-xkb-bin-base=${bindir}" -do_configure_append() { +do_configure:append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g } -do_compile_append() { +do_compile:append() { sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ libxklavier.pc diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch index 3493e511be..cd46824c39 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch +++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-drop-zenity-detection.patch @@ -1,11 +1,11 @@ -From ec0e52b49c9b6869413c9544c2ed44710ab91141 Mon Sep 17 00:00:00 2001 +From d36e65f3e31c882f62d5cfeb7b0e1441d5fdc821 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Sat, 14 Apr 2018 16:15:59 +0800 Subject: [PATCH] drop zenity detection OE does not support zenity -Upstream-Status: inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- @@ -13,10 +13,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac -index 5f9e7e9..80b32c7 100644 +index bbb4db8..2010d78 100644 --- a/configure.ac +++ b/configure.ac -@@ -359,11 +359,6 @@ fi +@@ -336,11 +336,6 @@ fi AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes") @@ -25,9 +25,6 @@ index 5f9e7e9..80b32c7 100644 - AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) -fi - - dnl ************************************************************************** - dnl Check for Vulkan support - dnl ************************************************************************** --- -1.8.3.1 - + AC_SEARCH_LIBS([dlsym], [dl], [], [ + AC_MSG_ERROR([unable to find the dlsym() function]) + ]) diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.36.1.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb index 0cb59cdc9a..32f0801706 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity_3.36.1.bb +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.52.0.bb @@ -1,6 +1,6 @@ SECTION = "x11/wm" SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" @@ -13,26 +13,28 @@ DEPENDS = " \ startup-notification \ libcanberra \ libgtop \ + libxres \ + libxpresent \ " # depends on startup-notification which depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gsettings gettext upstream-version-is-even features_check -SRC_URI[archive.md5sum] = "d1171705829bbebd42ac08ec49a9a90a" -SRC_URI[archive.sha256sum] = "11f07693e2b266840759063a4bc807346070e8e7fec8f53cd0757f6662c1b323" +SRC_URI[archive.sha256sum] = "a72438ace6d5903ae79338c6098b1b35ab91c8a97c4323701d3bef1f3eeb191c" SRC_URI += "file://0001-drop-zenity-detection.patch" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" # enable as neccessary until new warnings are dealt with PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/themes \ ${datadir}/gnome-control-center \ ${datadir}/gnome\ " -RDEPENDS_${PN} += "gsettings-desktop-schemas" +RDEPENDS:${PN} += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb new file mode 100644 index 0000000000..4c11a8d136 --- /dev/null +++ b/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "libmsgraph is a GLib-based library for accessing online serive APIs using MS Graph protocol." +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" + +inherit gnomebase gobject-introspection gi-docgen + +SRC_URI[archive.sha256sum] = "e0e59eaa8ae3e0a48ec0a6c2fed0470856a709248e9212b6a1d037de5792ecbb" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dtests=false" + +DEPENDS = " \ + glib-2.0\ + json-glib \ + rest \ + gnome-online-accounts \ +" diff --git a/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch deleted file mode 100644 index b4fd039834..0000000000 --- a/meta-gnome/recipes-gnome/mutter/mutter/0001-EGL-Include-EGL-eglmesaext.h.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sun, 20 Oct 2019 12:04:31 +0200 -Subject: [PATCH] EGL: Include EGL/eglmesaext.h - -The eglext.h shipped by libglvnd does not include the Mesa extensions, -unlike the header shipped in Mesa. - -Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 - -Upstream-Status: Applied [1] - -[1] https://gitlab.gnome.org/GNOME/mutter/-/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 ---- - cogl/cogl/meson.build | 2 +- - src/backends/meta-egl-ext.h | 1 + - src/backends/meta-egl.c | 1 + - src/backends/meta-egl.h | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build -index 261955796..b0e66bff3 100644 ---- a/cogl/cogl/meson.build -+++ b/cogl/cogl/meson.build -@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( - built_headers += [cogl_gl_header_h] - - if have_egl -- cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>' -+ cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>' - else - cogl_egl_includes_string = '' - endif -diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h -index 8705e7d5b..db0b74f76 100644 ---- a/src/backends/meta-egl-ext.h -+++ b/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c -index 6554be935..fdeff4f77 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -27,6 +27,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <gio/gio.h> - #include <glib.h> - #include <glib-object.h> -diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h -index f2a816445..4591e7d85 100644 ---- a/src/backends/meta-egl.h -+++ b/src/backends/meta-egl.h -@@ -28,6 +28,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <glib-object.h> - - #define META_EGL_ERROR meta_egl_error_quark () --- -2.21.1 - diff --git a/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb b/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb index 29b9fc62fc..d14f161f14 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_3.34.6.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb @@ -1,33 +1,33 @@ SUMMARY = "Window and compositing manager based on Clutter" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ xserver-xorg-cvt-native \ + wayland-native \ virtual/libx11 \ - gtk+3 \ + colord \ + graphene \ + gtk4 \ gdk-pixbuf \ cairo \ pango \ gsettings-desktop-schemas \ json-glib \ - gnome-desktop3 \ - gnome-settings-daemon \ + libei \ libxtst \ libxkbfile \ - xinerama \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \ + xwayland \ " -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check +inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.md5sum] = "20913c458406e6efa3df005a3ce48c8e" -SRC_URI[archive.sha256sum] = "23bde87d33b8981358831cec8915bb5ff1eaf9c1de74c90cd1660b1b95883526" -SRC_URI += "file://0001-EGL-Include-EGL-eglmesaext.h.patch" +SRC_URI[archive.sha256sum] = "bb3f7d77aebdea9d317d3f5ef03868e4e7969da423ac495e33a16d61db2c9373" # x11 is still manadatory - see meson.build -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" # systemd can be replaced by libelogind (not available atow - make systemd # mandatory distro feature) @@ -40,10 +40,12 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl glx', '', d)} \ sm \ startup-notification \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'wayland', '', d)} \ + gnome-desktop \ " EXTRA_OEMESON += " \ + -Dtests=false \ + -Dnative_tests=false \ -Dxwayland_path=${bindir}/Xwayland \ " @@ -51,18 +53,26 @@ EXTRA_OEMESON += " \ PACKAGECONFIG[native-backend] = "-Dnative_backend=true -Dudev=true, -Dnative_backend=false -Dudev=false, libdrm virtual/libgbm libinput ${LOGIND} virtual/egl virtual/libgles2 udev" PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=true, virtual/libgl" PACKAGECONFIG[glx] = "-Dglx=true, -Dglx=false" +PACKAGECONFIG[libdisplay-info] = "-Dlibdisplay_info=true, -Dlibdisplay_info=false, libdisplay-info" PACKAGECONFIG[libwacom] = "-Dlibwacom=true, -Dlibwacom=false, libwacom" -PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire-0.2" +# Remove depending on pipewire-0.2 when mutter is upgraded to 3.36+ +PACKAGECONFIG[remote-desktop] = "-Dremote_desktop=true, -Dremote_desktop=false, pipewire" +PACKAGECONFIG[gnome-desktop] = "-Dlibgnome_desktop=true, -Dlibgnome_desktop=false, gnome-desktop gnome-settings-daemon" PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm" +PACKAGECONFIG[sound-player] = "-Dsound_player=true, -Dsound_player=false, libcanberra" PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof" PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification" -PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland wayland-native, xserver-xorg-xwayland" -PACKAGECONFIG[wayland-eglstream] = "-Dwayland_eglstream=true,-Dwayland_eglstream=false" -# yes they changed from mutter-4 -> mutter-5 recently so be perpared -MUTTER_API_NAME = "mutter-5" +MUTTER_API_NAME = "mutter-14" -do_install_append() { +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/cogl/cogl/cogl-enum-types.c + sed -i -e 's|${B}/||g' ${B}/clutter/clutter/clutter-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta-private-enum-types.c + sed -i -e 's|${B}/||g' ${B}/src/meta/meta-enum-types.c +} + +do_install:append() { # Add gir links in standard paths. That makes dependents life much easier # to find them install -d ${D}${datadir}/gir-1.0 @@ -72,25 +82,28 @@ do_install_append() { done } -PACKAGES =+ "${PN}-tests" +GSETTINGS_PACKAGE = "${PN}-gsettings" + +PACKAGES =+ "${PN}-tests ${PN}-gsettings" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/gnome-control-center \ + ${datadir}/gir-1.0 \ ${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \ ${libdir}/${MUTTER_API_NAME}/*.typelib \ ${libdir}/${MUTTER_API_NAME}/plugins \ " -FILES_${PN}-tests += " \ +FILES:${PN}-tests += " \ ${datadir}/installed-tests \ ${datadir}/${MUTTER_API_NAME}/tests \ ${libexecdir}/installed-tests/${MUTTER_API_NAME} \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${libdir}/${MUTTER_API_NAME}/*.gir \ ${libdir}/${MUTTER_API_NAME}/lib*.so \ " -RDEPENDS_${PN} += "zenity" +RDEPENDS:${PN} += "${PN}-gsettings gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb deleted file mode 100644 index fc9ab379d8..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "File manager for GNOME" -SECTION = "x11/gnome" - -LICENSE="GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - fontconfig \ - gtk+3 \ - gnome-desktop3 \ - gsettings-desktop-schemas \ - gnome-autoar \ - tracker \ -" - -inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg - -SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395" -SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8" - -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG = "extensions" -PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ - ${datadir}/gnome-shell \ -" - -# mandatory - not checked during configuration: -# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed -RDEPENDS_${PN} += "tracker-miners" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb new file mode 100644 index 0000000000..9c0d154ec8 --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_45.1.bb @@ -0,0 +1,54 @@ +SUMMARY = "File manager for GNOME" +SECTION = "x11/gnome" + +LICENSE="GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" + + +DEPENDS = " \ + appstream-glib-native \ + desktop-file-utils-native \ + glib-2.0 \ + gnome-autoar \ + gnome-desktop \ + gtk4 \ + libadwaita \ + libcloudproviders \ + libhandy \ + libportal \ + libxml2 \ + tracker \ +" + +inherit gnomebase gsettings gobject-introspection gi-docgen gettext features_check mime-xdg gtk-icon-cache + +SRC_URI[archive.sha256sum] = "23bdaa9a85466c5937a89daddd080ed03bcc2b49e8b64af607206353bde82fe3" + +REQUIRED_DISTRO_FEATURES = "x11 opengl gobject-introspection-data" + +GIDOCGEN_MESON_OPTION = "docs" +GIDOCGEN_MESON_ENABLE_FLAG = 'true' +GIDOCGEN_MESON_DISABLE_FLAG = 'false' + +EXTRA_OEMESON += " \ + -Dtests=none \ +" + +PACKAGECONFIG = "extensions" +PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base gdk-pixbuf" +PACKAGECONFIG[packagekit] = "-Dpackagekit=true,-Dpackagekit=false,packagekit" + +do_install:prepend() { + sed -i -e 's|${B}/||g' ${B}/src/nautilus-enum-types.c +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ + ${datadir}/tracker3 \ +" + +# mandatory - not checked during configuration: +# | (org.gnome.Nautilus:863): GLib-GIO-ERROR **: 21:03:52.326: Settings schema 'org.freedesktop.Tracker.Miner.Files' is not installed +RDEPENDS:${PN} += "tracker-miners bubblewrap" diff --git a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb b/meta-gnome/recipes-gnome/rest/librest_0.8.1.bb index e875f7a7d0..63372afa5d 100644 --- a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb +++ b/meta-gnome/recipes-gnome/rest/librest_0.8.1.bb @@ -1,33 +1,33 @@ SUMMARY = "library to access web services that claim to be "RESTful"" HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -GNOMEBASEBUILDCLASS = "autotools" - DEPENDS = " \ - libxml2-native \ - glib-2.0-native \ glib-2.0 \ + glib-2.0-native \ libsoup-2.4 \ + libxml2 \ " -inherit gnomebase gobject-introspection gtk-doc vala +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gobject-introspection vala pkgconfig gtk-doc + +GNOMEBN = "rest" -SRC_URI[archive.md5sum] = "ece4547298a81105f307369d73c21b9d" SRC_URI[archive.sha256sum] = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9" +S = "${WORKDIR}/${GNOMEBN}-${PV}" # * gnome environment requires libsoup build with in gnome PACKAGECONFIG # * libsoup-gnome support was removed upstream three years ago [1] # [1] https://gitlab.gnome.org/GNOME/librest/commit/8f904a8e2bb38a7bf72245cdf2f1ecad17e9a720 EXTRA_OECONF = "--without-gnome" -do_configure_prepend() { +do_configure:prepend() { # rest expects introspection.m4 at custom location (see aclocal.m4). cp -f ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/build } -do_compile_prepend() { +do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/rest/.libs" } - diff --git a/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb b/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb new file mode 100644 index 0000000000..3b22fdfea2 --- /dev/null +++ b/meta-gnome/recipes-gnome/rest/rest_0.9.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "library to access web services that claim to be "RESTful"" +HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + + +DEPENDS = " \ + glib-2.0 \ + glib-2.0-native \ + gtksourceview5 \ + json-glib \ + libadwaita \ + libsoup-3.0 \ + libxml2-native \ +" + +inherit gnomebase gobject-introspection vala pkgconfig gi-docgen features_check +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +SRC_URI[archive.sha256sum] = "9266a5c10ece383e193dfb7ffb07b509cc1f51521ab8dad76af96ed14212c2e3" diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch new file mode 100644 index 0000000000..dc702a0e37 --- /dev/null +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch @@ -0,0 +1,30 @@ +From 19188367bee87b0084ab34869455155da5cb1731 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 08:47:39 -0700 +Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic + +This helps it to use llvm unwinder since libunwind-generic is specific +to nongnu libunwind. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2835782..0fdb39a 100644 +--- a/meson.build ++++ b/meson.build +@@ -81,7 +81,7 @@ config_h.set10('HAVE_POLKIT_AGENT', polkit_agent_dep.found()) + config_h.set10('HAVE_POLKIT', polkit_dep.found()) + + if get_option('libunwind') +- libunwind_dep = dependency('libunwind-generic') ++ libunwind_dep = dependency('libunwind') + config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found()) + config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep])) + endif +-- +2.35.2 + diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch deleted file mode 100644 index 75aa86cdbf..0000000000 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 18 Jul 2011 16:00:17 -0700 -Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined - -On uclibc elf.h does not have GNU extentions but we need this define -so we define it locally if its not getting it from elf.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -%% original patch: define-NT_GNU_BUILD_ID.patch ---- - src/libsysprof/elfparser.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h -index 160e4c9..94fa5c0 100644 ---- a/src/libsysprof/elfparser.h -+++ b/src/libsysprof/elfparser.h -@@ -18,6 +18,10 @@ - - #include <glib.h> - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif -+ - typedef struct ElfSym ElfSym; - typedef struct ElfParser ElfParser; - --- -2.17.1 - diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch deleted file mode 100644 index d8fffbb7e9..0000000000 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen <oss@cogitri.dev> -Date: Sat, 7 Mar 2020 10:44:16 +0100 -Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for - gsize - -This fixes the build on 32-bit platforms with -Werror-format - -fixes #32 - -Upstream-Status: Applied[https://gitlab.gnome.org/GNOME/sysprof/-/commit/5dea152c7728f5a37370ad8a229115833e36b4f6] ---- - src/tests/allocs-by-size.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c -index 666113a..6260d4b 100644 ---- a/src/tests/allocs-by-size.c -+++ b/src/tests/allocs-by-size.c -@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader) - { - const Item *item = &g_array_index (ar, Item, i); - -- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", -+ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", - item->size, item->cmp, item->count); - } - } --- -2.21.3 - diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb b/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb index 275fbaa699..3523bad3e2 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb +++ b/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb @@ -1,10 +1,9 @@ SUMMARY = "System-wide Performance Profiler for Linux" HOMEPAGE = "http://www.sysprof.com" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gnome-help gettext systemd upstream-version-is-even gsettings mime mime-xdg DEPENDS += " \ @@ -12,28 +11,31 @@ DEPENDS += " \ yelp-tools-native \ libxml2-native \ glib-2.0 \ + json-glib \ " -SRC_URI[archive.md5sum] = "3956e82b8744715006dde59e0ce8910b" -SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108" -SRC_URI += " \ - file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ - file://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ -" +SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch" +SRC_URI[archive.sha256sum] = "ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd libsysprof', '', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ + libunwind" +# nongnu libunwind needs porting to RV32 +PACKAGECONFIG:remove:riscv32 = "libunwind" -PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" +PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system" SOLIBS = ".so" FILES_SOLIBSDEV = "" -SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service sysprof3.service', '', d)}" +SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service sysprof3.service', '', d)}" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1/system-services \ ${datadir}/dbus-1/system.d \ ${datadir}/dbus-1/interfaces \ diff --git a/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb b/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb new file mode 100644 index 0000000000..62b3aa3e3e --- /dev/null +++ b/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Tecla is a keyboard layout viewer that uses GTK/Libadwaita for UI, and libxkbcommon to deal with keyboard maps." +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=75859989545e37968a99b631ef42722e" + +DEPENDS = " \ + libxkbcommon \ + libadwaita \ + wayland \ + gtk4 \ +" + +REQUIRED_DISTRO_FEATURES = "wayland" + +inherit gnomebase pkgconfig features_check + +SRC_URI[archive.sha256sum] = "4a081eab867a5a8b09758991cad7645920f323aabca954408290fb6f44591b0f" diff --git a/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb deleted file mode 100644 index 4120c6260a..0000000000 --- a/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - gtksourceview4 \ - amtk \ - libxml2 \ - uchardet \ -" - -inherit gnomebase gobject-introspection gettext - -SRC_URI[archive.md5sum] = "013ee8aae178f75cc74e05fac70786b3" -SRC_URI[archive.sha256sum] = "e6f6673a8a27e8f280725db8fbacec79b20676ae0558755239d15a9808faa256" diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb new file mode 100644 index 0000000000..6c9c36f3ed --- /dev/null +++ b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" +LICENSE = "LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" + +DEPENDS = " \ + gsettings-desktop-schemas \ + glib-2.0 \ + gtk+3 \ + libgedit-amtk \ + libgedit-gtksourceview \ + libxml2 \ + uchardet \ + gtk-doc-native \ + libxslt-native \ + docbook-xsl-stylesheets-native \ + python3-pygments-native \ +" + +inherit meson gobject-introspection gettext features_check pkgconfig + + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main" +SRCREV = "16ab2567257a053bd957699f89080fafd0999035" +S = "${WORKDIR}/git" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch new file mode 100644 index 0000000000..7a40ae338c --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch @@ -0,0 +1,27 @@ +From 6f6d7e3995c370b8121206a7f9cc0d234553bbfe Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Thu, 15 Sep 2022 16:35:39 +0900 +Subject: [PATCH] Set header file to a fixed path instead of a host path. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + src/libtracker-miners-common/tracker-miner-enum-types.c.template | 1 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libtracker-miners-common/tracker-miners-enum-types.c.template b/src/libtracker-miners-common/tracker-miners-enum-types.c.template +index c712dda..cb449e2 100644 +--- a/src/libtracker-miners-common/tracker-miners-enum-types.c.template ++++ b/src/libtracker-miners-common/tracker-miners-enum-types.c.template +@@ -7,7 +7,7 @@ + + /*** BEGIN file-production ***/ + /* enumerations from "@basename@" */ +-#include "@filename@" ++#include "tracker-enums.h" + /*** END file-production ***/ + + +-- +2.25.1 diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch new file mode 100644 index 0000000000..98618e5d3e --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-fix-reproducibility.patch @@ -0,0 +1,118 @@ +From 2bbd07843e8ec34311cafab35f21b40c86e0dd7f Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 12 Sep 2023 17:00:41 +0200 +Subject: [PATCH] meson: fix reproducibility + +Tracker's design seems to be strictly for non-cross builds and leaks buildpaths into the +binaries at various places. Avoid this to improve binary reproducibility. + +todo: Some of these paths may need to be adjusted to make the test environment work + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 20 ++++++++++---------- + src/tracker-extract/meson.build | 2 +- + tests/tracker-miner-fs/meson.build | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/meson.build b/meson.build +index 935584185..aa6126081 100644 +--- a/meson.build ++++ b/meson.build +@@ -380,7 +380,7 @@ conf.set('PACKAGE_VERSION', '"@0@"'.format(meson.project_version())) + conf.set('TRACKER_VERSION', '"@0@"'.format(meson.project_version())) + + # Config that goes in some other generated files (.desktop, .pc, etc) +-conf.set('abs_top_builddir', meson.current_build_dir()) ++conf.set('abs_top_builddir', '') + conf.set('exec_prefix', get_option('prefix')) + conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) + conf.set('datadir', datadir) +@@ -409,7 +409,7 @@ tracker_c_args = [ + configinc = include_directories('./') + srcinc = include_directories('src/') + +-build_root = meson.current_build_dir() ++build_root = '' + + # We use tracker-miners-3.0 rather than tracker3-miners inside the lib64 + # directory, following the existing convention in that directory. +@@ -438,8 +438,8 @@ subdir('data') + subdir('docs') + + test_c_args = tracker_c_args + [ +- '-DTOP_BUILDDIR="@0@/"'.format(meson.build_root()), +- '-DTOP_SRCDIR="@0@/"'.format(meson.source_root()), ++ '-DTOP_BUILDDIR="@0@/"'.format(''), ++ '-DTOP_SRCDIR="@0@/"'.format('/usr/src/debug/tracker'), + ] + + if get_option('tests_tap_protocol') +diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build +index 4aaad5c41..d17cce221 100644 +--- a/src/tracker-extract/meson.build ++++ b/src/tracker-extract/meson.build +@@ -159,7 +159,7 @@ endif + executable('tracker-extract-@0@'.format(tracker_api_major), + tracker_extract_sources, + # Manually add the root dir to work around https://github.com/mesonbuild/meson/issues/1387 +- c_args: tracker_c_args + ['-I' + meson.build_root()], ++ c_args: tracker_c_args, + export_dynamic: true, + dependencies: tracker_extract_dependencies, + install: true, +diff --git a/tests/tracker-miner-fs/meson.build b/tests/tracker-miner-fs/meson.build +index e131b85ad..59e509fa6 100644 +--- a/tests/tracker-miner-fs/meson.build ++++ b/tests/tracker-miner-fs/meson.build +@@ -19,7 +19,7 @@ libtracker_miner_test_c_args = [ + ] + + libtracker_miner_test_environment = environment() +-libtracker_miner_test_environment.set('GSETTINGS_SCHEMA_DIR', join_paths(meson.build_root(), 'data')) ++libtracker_miner_test_environment.set('GSETTINGS_SCHEMA_DIR', '/usr/src/debug/tracker-miners/data') + + libtracker_miner_test_deps = [tracker_miners_common_dep, tracker_miner_dep, tracker_sparql] + + +diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build +index 6e5883288..04750f82b 100644 +--- a/src/miners/fs/meson.build ++++ b/src/miners/fs/meson.build +@@ -67,8 +67,8 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major), + dependencies: tracker_miner_fs_deps, + c_args: [ + tracker_c_args, +- '-DBUILDROOT="@0@"'.format(meson.global_build_root()), +- '-DBUILD_EXTRACTDIR="@0@"'.format(meson.build_root() / 'src' / 'tracker-extract'), ++ '-DBUILDROOT="@0@"'.format(get_option('prefix') / 'src'), ++ '-DBUILD_EXTRACTDIR="@0@"'.format(get_option('prefix') / 'src' / 'tracker-extract'), + '-DLIBEXECDIR="@0@"'.format(get_option('prefix') / get_option('libexecdir')), + ], + install: true, +diff --git a/src/libtracker-miners-common/tracker-landlock.c b/src/libtracker-miners-common/tracker-landlock.c +index 27e7db65b..3021343eb 100644 +--- a/src/libtracker-miners-common/tracker-landlock.c ++++ b/src/libtracker-miners-common/tracker-landlock.c +@@ -276,7 +276,7 @@ + LANDLOCK_ACCESS_FS_READ_DIR); + } + } +- ++#if 0 + current_dir = g_get_current_dir (); + + /* Detect running in-tree */ +@@ -296,7 +296,7 @@ + in_tree_rules[i].flags); + } + } +- ++#endif + /* Add user cache for readonly databases */ + #ifdef MINER_FS_CACHE_LOCATION + add_rule (landlock_fd, MINER_FS_CACHE_LOCATION, +-- +2.41.0 diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch b/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch deleted file mode 100644 index c9eb7994e6..0000000000 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners/0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 54ea2cabf85ad1bd5695cdbd1935115c9495e80c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 1 Dec 2019 17:06:59 +0100 -Subject: [PATCH] meson.build: Just warn if we build without libseccomp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libseccomp lives in meta-security currently and we cannot make it a mandatory -dependency. Once somebody moves libseccomp to meta-oe and adjusts all the -target specific knobs this patch can go. For discussion see [1]. - -[1] http://lists.openembedded.org/pipermail/openembedded-devel/2019-November/203234.html - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 71a9df4..1eaa1a0 100644 ---- a/meson.build -+++ b/meson.build -@@ -279,7 +279,7 @@ cpu_supports_seccomp = not unsupported_cpus.contains(host_cpu) - seccomp_required = system_supports_seccomp and cpu_supports_seccomp - - if not libseccomp.found() and seccomp_required -- error('Libseccomp is mandatory for sandboxed metadata extraction') -+ warning('Building without Libseccomp might cause security issues!') - endif - - #################################################################### --- -2.21.0 - diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb deleted file mode 100644 index e2ced395c1..0000000000 --- a/meta-gnome/recipes-gnome/tracker/tracker-miners_2.3.3.bb +++ /dev/null @@ -1,72 +0,0 @@ -SUMMARY = "Tracker miners and metadata extractors" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" - -DEPENDS = " \ - intltool-native \ - tracker \ - zlib \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check - -SRC_URI[archive.md5sum] = "a317bc50c5e63dd0746a48af478fb92b" -SRC_URI[archive.sha256sum] = "7472aa28d7862620d3ca2bbec3b103df547d7319c12e95a7f7aa9f9f6dee4b19" -SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.patch" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -PACKAGECONFIG ??= " \ - ffmpeg \ - flac \ - gexiv2 \ - gstreamer \ - icu \ - libexif \ - libgsf \ - jpeg \ - png \ - tiff \ - xml \ - pdf \ -" - -PACKAGECONFIG[ffmpeg] = ",,ffmpeg" -PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" -PACKAGECONFIG[gexiv2] = ",,gexiv2" -PACKAGECONFIG[gstreamer] = ",,gstreamer1.0 gstreamer1.0-plugins-base" -PACKAGECONFIG[gupnp] = ",,gupnp-dlna" -PACKAGECONFIG[icu] = ",,icu" -PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" -PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" -PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" -PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" -PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" -PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" -PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis" -PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" -PACKAGECONFIG[upower] = ",,upower" - -# For security reasons it is strongly recommended to set add meta-security in -# your layers and 'libseccomp' to PACKAGECONFIG". -PACKAGECONFIG[libseccomp] = ",,libseccomp" -# not yet in meta-gnome -PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" - -EXTRA_OEMESON += " \ - -Dsystemd_user_services=${systemd_user_unitdir} \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/tracker \ - ${libdir}/tracker-miners-2.0 \ - ${systemd_user_unitdir} \ -" diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb new file mode 100644 index 0000000000..7bbee2a885 --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.7.1.bb @@ -0,0 +1,86 @@ +SUMMARY = "Tracker miners and metadata extractors" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + intltool-native \ + tracker \ + zlib \ +" + + +inherit gnomebase gsettings gobject-introspection vala bash-completion features_check + +SRC_URI:append = " \ + file://0001-fix-reproducibility.patch \ + file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \ +" +SRC_URI[archive.sha256sum] = "50a3abe40cfb0b35ced43ec716dbf1368992e444ef7a0babf202c7ac6ab2f6f4" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" +VALA_MESON_OPTION = "" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "ffmpeg", "", d)} \ + gexiv2 \ + gstreamer \ + icu \ + libexif \ + libgsf \ + jpeg \ + pdf \ + png \ + tiff \ + raw \ + xml \ + ${@bb.utils.filter('DISTRO_FEATURES', 'seccomp', d)} \ + battery \ + networkmanager \ +" +# Needs tgkill API which musl does not support +# see https://www.openwall.com/lists/musl/2019/08/02/1 +PACKAGECONFIG:remove:libc-musl = "seccomp" + +PACKAGECONFIG[battery] = "-Dbattery_detection=upower,-Dbattery_detection=none,upower" +PACKAGECONFIG[cue] = "-Dcue=enabled,-Dcue=disabled,libcue" +PACKAGECONFIG[ffmpeg] = "-Dgeneric_media_extractor=libav,,ffmpeg" +PACKAGECONFIG[gexiv2] = ",,gexiv2" +PACKAGECONFIG[gstreamer] = "-Dgeneric_media_extractor=gstreamer,,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[gupnp] = "-Dgstreamer_backend=gupnp,,gupnp-dlna" +PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" +PACKAGECONFIG[icu] = "-Dcharset_detection=icu,,icu" +PACKAGECONFIG[iso] = "-Diso=enabled,-Diso=disabled,libosinfo" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" +PACKAGECONFIG[libexif] = "-Dexif=enabled,-Dexif=disabled,libexif" +PACKAGECONFIG[libgsf] = "-Dgsf=enabled,-Dgsf=disabled,libgsf" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[raw] = "-Draw=enabled,-Draw=disabled,libraw" +PACKAGECONFIG[xml] = "-Dxml=enabled,-Dxml=disabled,libxml2" +PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanager" +PACKAGECONFIG[landlock] = "-Dlandlock=enabled,-Dlandlock=disabled" + +# For security reasons it is strongly recommended to set add meta-security in +# your layers and 'libseccomp' to PACKAGECONFIG". +PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp" +# not yet in meta-gnome +PACKAGECONFIG[rss] = "-Dminer_rss=true,-Dminer_rss=false,libgrss" + +EXTRA_OEMESON += " \ + -Dman=false \ + -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ + -Dsystemd_user_services_dir=${systemd_user_unitdir} \ +" + + +FILES:${PN} += " \ + ${datadir} \ + ${libdir}/tracker-miners-3.0 \ + ${systemd_user_unitdir} \ +" diff --git a/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch b/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch new file mode 100644 index 0000000000..4527f9efa3 --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker/0001-fix-reproducibility.patch @@ -0,0 +1,77 @@ +From ae34fb111e1f2498f37b21c0c32ace6c9928ad66 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 18 Sep 2023 02:47:55 +0200 +Subject: [PATCH] tracker: fix reproducibility issue + +Tracker's design seems to be strictly for non-cross builds and leaks buildpaths into the +binaries at various places. Avoid this to improve binary reproducibility. + +todo: Some of these paths may need to be adjusted to make the test environment work + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + meson.build | 6 +++--- + src/libtracker-common/meson.build | 4 ++-- + src/libtracker-sparql/meson.build | 4 ++-- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index bc9f93a..6c86e5a 100644 +--- a/meson.build ++++ b/meson.build +@@ -357,7 +357,7 @@ have_rtld_noload = cc.has_header_symbol('dlfcn.h', 'RTLD_NOLOAD') + conf.set('HAVE_RTLD_NOLOAD', have_rtld_noload) + + # Config that goes in some other generated files (.desktop, .service, etc) +-conf.set('abs_top_builddir', meson.current_build_dir()) ++conf.set('abs_top_builddir', '/usr/src/debug/tracker') + conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) + + configure_file(input: 'config.h.meson.in', +@@ -396,8 +396,8 @@ subdir('docs') + subdir('utils') + + test_c_args = tracker_c_args + [ +- '-DTOP_BUILDDIR="@0@"'.format(build_root), +- '-DTOP_SRCDIR="@0@"'.format(source_root), ++ '-DTOP_BUILDDIR="@0@/"'.format('/usr/src/debug/tracker'), ++ '-DTOP_SRCDIR="@0@/"'.format('/usr/src/debug/tracker'), + ] + + tracker_uninstalled_cli_dir = join_paths(meson.current_build_dir(), 'src', 'tracker') +diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build +index 9355d1c..cdbc05f 100644 +--- a/src/libtracker-common/meson.build ++++ b/src/libtracker-common/meson.build +@@ -51,10 +51,10 @@ libtracker_common = static_library('tracker-common', + dependencies: [tracker_common_dependencies, gmodule], + c_args: [ + '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir), +- '-DBUILD_LIBDIR="@0@"'.format(meson.current_build_dir()), ++ '-DBUILD_LIBDIR="@0@"'.format('/usr/src/debug/tracker'), + # Global build root is required to detect noinst situations (tests/introspection), + # event when built as a subproject +- '-DBUILDROOT="@0@"'.format(meson.global_build_root()), ++ '-DBUILDROOT="@0@"'.format('/usr/src/debug/tracker'), + ] + tracker_c_args, + include_directories: [configinc, srcinc], + gnu_symbol_visibility: 'hidden', +diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build +index 4143eac..b73f1c9 100644 +--- a/src/libtracker-sparql/meson.build ++++ b/src/libtracker-sparql/meson.build +@@ -98,10 +98,10 @@ libtracker_sparql_private = static_library('tracker-sparql-private', + c_args: [ + '-include', 'libtracker-sparql/tracker-private.h', + '-DPRIVATE_LIBDIR="@0@"'.format(tracker_internal_libs_dir), +- '-DBUILD_LIBDIR="@0@"'.format(meson.current_build_dir()), ++ '-DBUILD_LIBDIR="@0@"'.format('/usr/src/debug/tracker'), + # Global build root is required to detect noinst situations (tests/introspection), + # event when built as a subproject +- '-DBUILDROOT="@0@"'.format(meson.global_build_root()), ++ '-DBUILDROOT="@0@"'.format('/usr/src/debug/tracker'), + ] + tracker_c_args, + + dependencies: [libtracker_sparql_dependencies, gvdb_dep], diff --git a/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb b/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb deleted file mode 100644 index b36e66b452..0000000000 --- a/meta-gnome/recipes-gnome/tracker/tracker_2.3.4.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Tracker is a file search engine" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ - file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" - -DEPENDS = " \ - libxml2-native \ - dbus-native \ - glib-2.0 \ - sqlite3 \ - libarchive \ - dbus \ - icu \ - json-glib \ - libsoup-2.4 \ - libstemmer \ -" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check - -SRC_URI[archive.md5sum] = "9937cf4812ca85078907324c7cdf7dd8" -SRC_URI[archive.sha256sum] = "577952244ab977c78b0b88e2f63c4197eaba16e4d66bff692b7f58993e06516d" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" - -PACKAGECONFIG ??= "fts" -PACKAGECONFIG[networkmanager] = "-Dnetwork_manager=enabled,-Dnetwork_manager=disabled,networkmanger" -# full text search requires sqlite3 build with PACKAGECONFIG[fts5] set -PACKAGECONFIG[fts] = "-Dfts=true,-Dfts=false" - -# set required cross property sqlite3_has_fts5 -do_write_config[vardeps] += "PACKAGECONFIG" -do_write_config_append() { - echo "[properties]" > ${WORKDIR}/meson-tracker.cross - echo "sqlite3_has_fts5 = '${@bb.utils.contains('PACKAGECONFIG', 'fts', 'true', 'false', d)}'" >> ${WORKDIR}/meson-tracker.cross -} - -EXTRA_OEMESON = "--cross-file ${WORKDIR}/meson-tracker.cross \ - -Dsystemd_user_services=${systemd_user_unitdir} \ -" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/tracker-2.0 \ - ${systemd_user_unitdir} \ -" diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb new file mode 100644 index 0000000000..1d5c79ab4d --- /dev/null +++ b/meta-gnome/recipes-gnome/tracker/tracker_3.7.1.bb @@ -0,0 +1,59 @@ +SUMMARY = "Tracker is a file search engine" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ + file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +DEPENDS = " \ + dbus-native \ + python3-pygobject-native \ + glib-2.0 \ + sqlite3 \ + libarchive \ + dbus \ + icu \ + json-glib \ + libsoup-3.0 \ + libstemmer \ +" + + +inherit gettext gnomebase gobject-introspection vala gtk-doc bash-completion python3native + +SRC_URI += "file://0001-fix-reproducibility.patch" +SRC_URI[archive.sha256sum] = "cd91b885ee9839cde5387f8e05ed24a7108d1627629cb6b1b2aa51a9603e130a" + +# text search is not an option anymore and requires sqlite3 build with +# PACKAGECONFIG[fts5] set (default) + +# set required cross property sqlite3_has_fts5 +do_write_config[vardeps] += "PACKAGECONFIG" +do_write_config:append() { + echo "[properties]" > ${WORKDIR}/meson-tracker.cross + echo "sqlite3_has_fts5 = 'true'" >> ${WORKDIR}/meson-tracker.cross +} + +EXTRA_OEMESON = " \ + --cross-file ${WORKDIR}/meson-tracker.cross \ + -Dman=false \ + -Dsystemd_user_services=${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} \ + -Dsystemd_user_services_dir=${systemd_user_unitdir} \ + -Dsoup=soup3 \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=enabled', '-Dvapi=disabled', d)} \ +" + +do_install:prepend() { + sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/tracker-sparql-enum-types.c + sed -i -e 's|${B}/../${PN}-${PV}|${TARGET_DBGSRC_DIR}|g' ${B}/src/libtracker-sparql/core/tracker-data-enum-types.c +} + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/tracker3 \ + ${libdir}/tracker-3.0 \ + ${systemd_user_unitdir} \ +" diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_42.1.bb index af2bab3804..f3e1efeaa1 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp-tools_3.32.2.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_42.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Collection of scripts and build utilities for documentation" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ @@ -10,12 +10,12 @@ inherit gnomebase itstool DEPENDS += " \ libxslt-native \ libxml2-native \ + python3-lxml-native \ yelp-xsl \ " -SRC_URI[archive.md5sum] = "7856f9ad0492aaf9adf097f5058bfc2e" -SRC_URI[archive.sha256sum] = "183856b5ed0b0bb2c05dd1204af023946ed436943e35e789afb0295e5e71e8f9" +SRC_URI[archive.sha256sum] = "3e496a4020d4145b99fd508a25fa09336a503a4e8900028421e72c6a4b11f905" -RDEPENDS_${PN} += "yelp-xsl" +RDEPENDS:${PN} += "python3-core yelp-xsl" BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb deleted file mode 100644 index 6b9d769b78..0000000000 --- a/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "XSL stylesheets for the yelp help browser" -LICENSE = "LGPLv2.1 & GPLv2" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=3e2bad3c5e3990988f9fa1bc5785b147 \ - file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -inherit gnomebase gettext itstool - -DEPENDS += "libxml2" - -SRC_URI[archive.md5sum] = "7d71af68fff4a92bcb2b8989f126be6c" -SRC_URI[archive.sha256sum] = "4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3" - -RDEPENDS_${PN}_append_class-target = " libxml2 itstool" - -# ensure our native consumers are forced to inherit itstool -RDEPENDS_${PN}_append_class-native = " libxml2" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.1.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.1.bb new file mode 100644 index 0000000000..5a8089e013 --- /dev/null +++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.1.bb @@ -0,0 +1,21 @@ +SUMMARY = "XSL stylesheets for the yelp help browser" +LICENSE = "LGPL-2.1-only & GPL-2.0-only & BSD-3-Clause" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=8ca13a5a6972ac1620a1e42a3dacd774 \ + file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gettext itstool + +DEPENDS += "libxml2" + +SRC_URI[archive.sha256sum] = "238be150b1653080ce139971330fd36d3a26595e0d6a040a2c030bf3d2005bcd" + +RDEPENDS:${PN}:append:class-target = " libxml2 itstool" + +# ensure our native consumers are forced to inherit itstool +RDEPENDS:${PN}:append:class-native = " libxml2-native" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index b9263f50cd..1b3ded0211 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb @@ -1,16 +1,15 @@ SUMMARY = "Help browser for the GNOME desktop" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ " - +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features_check mime-xdg # for webkitgtk REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "32f879293f79b4042edc46aa13d82c71" -SRC_URI[archive.sha256sum] = "fd4b3e23d31ad2bebe42ac8f80242b2d9bef51418bf62b59acdf2440bd94ed24" +SRC_URI[archive.sha256sum] = "a2c5fd0787a9089c722cc66bd0f85cdf7088d870e7b6cc85799f8e5bff9eac4b" DEPENDS += " \ libxml2-native \ @@ -19,17 +18,24 @@ DEPENDS += " \ appstream-glib \ libxslt \ sqlite3 \ - webkitgtk \ + libhandy \ + webkitgtk3 \ yelp-xsl \ " +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" + +PACKAGECONFIG[soup2] = "--with-webkit2gtk-4-0,," +PACKAGECONFIG[soup3] = ",--with-webkit2gtk-4-0," + -do_configure_prepend() { +do_configure:prepend() { export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/metainfo \ ${datadir}/yelp-xsl \ " -RDEPENDS_${PN} += "yelp-xsl" +RDEPENDS:${PN} += "yelp-xsl" diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb deleted file mode 100644 index c6883ae449..0000000000 --- a/meta-gnome/recipes-gnome/zenity/zenity_3.32.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Display dialog boxes from the command line and shell scripts" -SECTION = "x11/gnome" -LICENSE = "GPLv2+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -inherit gnomebase itstool gnome-help features_check gettext - -DEPENDS = " \ - yelp-tools-native \ - gtk+3 \ -" - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "ba2b2a13248773b4ec0fd323d95e6d5a" -SRC_URI[archive.sha256sum] = "e786e733569c97372c3ef1776e71be7e7599ebe87e11e8ad67dcc2e63a82cd95" - -do_install_append() { - # Remove gdialog compatibility helper - we don't want to pull in perl - rm ${D}${bindir}/gdialog -} diff --git a/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb new file mode 100644 index 0000000000..88b4b5c86c --- /dev/null +++ b/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Display dialog boxes from the command line and shell scripts" +SECTION = "x11/gnome" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +inherit gnomebase pkgconfig itstool gtk-icon-cache features_check gettext + +DEPENDS = " \ + desktop-file-utils-native \ + help2man-native \ + hicolor-icon-theme \ + gtk4 \ + gtk4-native \ + libadwaita \ +" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" +GTKIC_VERSION = "4" + +SRC_URI[archive.sha256sum] = "0c2f537813b10f728470d9d05d6c95713db2512f9c95096e1e85b1a6739605e6" + +PACKAGECONFIG ?= "webkitgtk" +PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" + +FILES:${PN}-doc = "${datadir}/man ${datadir}/help" diff --git a/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc b/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 0000000000..ce6b8a0f49 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,49 @@ +SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" +DESCRIPTION = "Clutter is an Open GL based interactive canvas library, \ +designed for creating fast, mainly 2D single window applications such as media \ +box UIs, presentations, kiosk style applications and so on." +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL-2.1-or-later" + +inherit clutter ptest-gnome features_check upstream-version-is-even gobject-introspection +# depends on cogl-1.0 which needs opengl +REQUIRED_DISTRO_FEATURES ?= "opengl" + +DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" +PACKAGE_BEFORE_PN += "${PN}-examples" +AUTOTOOLS_AUXDIR = "${S}/build-aux" + +EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" +EDEPENDS_GLX = "virtual/libgl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_WAYLAND = "wayland libxkbcommon gdk-pixbuf" + +EDEPENDS_EVDEV = "libxkbcommon" +ERDEPENDS_EVDEV = "xkeyboard-config" + +# Disable pretty much everything, override in platform specific set up +EXTRA_OECONF += "--disable-quartz-backend \ + --disable-win32-backend \ + --disable-cex100-backend \ + --disable-tslib-input \ + " + +PACKAGECONFIG[gdk] = "--enable-gdk-backend,--disable-gdk-backend,gtk+3" +PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}" +PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}" +PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}" +PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" +PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${EDEPENDS_WAYLAND}" +PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" + +# Default configuration, distros might want to override +PACKAGECONFIG ??= "egl gdk \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" + +FILES:${PN}-examples = "${libdir}/clutter/examples" + +do_configure:prepend() { + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 200001010000 ${S}/po/clutter-1.0.pot +} diff --git a/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch b/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch new file mode 100644 index 0000000000..7b3c1980b6 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch @@ -0,0 +1,143 @@ +From 3a0404dfbc65c6a864e01d1200a48074e19d5def Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 2 Sep 2016 14:28:38 +0300 +Subject: [PATCH] Remove clutter.types as it is build configuration-specific. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + doc/reference/clutter.types | 122 -------------------------------------------- + 1 file changed, 122 deletions(-) + delete mode 100644 doc/reference/clutter.types + +diff --git a/doc/reference/clutter.types b/doc/reference/clutter.types +deleted file mode 100644 +index 0037acc..0000000 +--- a/doc/reference/clutter.types ++++ /dev/null +@@ -1,122 +0,0 @@ +-cally_actor_get_type +-cally_clone_get_type +-cally_group_get_type +-cally_rectangle_get_type +-cally_root_get_type +-cally_stage_get_type +-cally_text_get_type +-cally_texture_get_type +-cally_util_get_type +-clutter_action_get_type +-clutter_actor_box_get_type +-clutter_actor_get_type +-clutter_actor_meta_get_type +-clutter_align_constraint_get_type +-clutter_alpha_get_type +-clutter_animatable_get_type +-clutter_animation_get_type +-clutter_animator_get_type +-clutter_animator_key_get_type +-clutter_backend_get_type +-clutter_behaviour_depth_get_type +-clutter_behaviour_ellipse_get_type +-clutter_behaviour_get_type +-clutter_behaviour_opacity_get_type +-clutter_behaviour_path_get_type +-clutter_behaviour_rotate_get_type +-clutter_behaviour_scale_get_type +-clutter_bin_layout_get_type +-clutter_bind_constraint_get_type +-clutter_binding_pool_get_type +-clutter_blur_effect_get_type +-clutter_box_get_type +-clutter_box_layout_get_type +-clutter_brightness_contrast_effect_get_type +-clutter_cairo_texture_get_type +-clutter_canvas_get_type +-clutter_child_meta_get_type +-clutter_click_action_get_type +-clutter_clip_node_get_type +-clutter_clone_get_type +-clutter_color_get_type +-clutter_color_node_get_type +-clutter_colorize_effect_get_type +-clutter_constraint_get_type +-clutter_container_get_type +-clutter_content_get_type +-clutter_deform_effect_get_type +-clutter_desaturate_effect_get_type +-clutter_device_manager_get_type +-clutter_drag_action_get_type +-clutter_drop_action_get_type +-clutter_effect_get_type +-clutter_event_get_type +-clutter_event_sequence_get_type +-clutter_fixed_layout_get_type +-clutter_flow_layout_get_type +-clutter_fog_get_type +-clutter_geometry_get_type +-clutter_gesture_action_get_type +-clutter_glx_texture_pixmap_get_type +-clutter_grid_layout_get_type +-clutter_group_get_type +-clutter_image_get_type +-clutter_input_device_get_type +-clutter_interval_get_type +-clutter_keyframe_transition_get_type +-clutter_knot_get_type +-clutter_layout_manager_get_type +-clutter_layout_meta_get_type +-clutter_list_model_get_type +-clutter_margin_get_type +-clutter_media_get_type +-clutter_model_get_type +-clutter_model_iter_get_type +-clutter_offscreen_effect_get_type +-clutter_page_turn_effect_get_type +-clutter_paint_node_get_type +-clutter_paint_volume_get_type +-clutter_pan_action_get_type +-clutter_param_color_get_type +-clutter_param_fixed_get_type +-clutter_param_units_get_type +-clutter_path_constraint_get_type +-clutter_path_get_type +-clutter_path_node_get_type +-clutter_perspective_get_type +-clutter_pipeline_node_get_type +-clutter_point_get_type +-clutter_property_transition_get_type +-clutter_rect_get_type +-clutter_rectangle_get_type +-clutter_rotate_action_get_type +-clutter_score_get_type +-clutter_script_get_type +-clutter_scriptable_get_type +-clutter_scroll_actor_get_type +-clutter_settings_get_type +-clutter_shader_effect_get_type +-clutter_shader_float_get_type +-clutter_shader_get_type +-clutter_shader_int_get_type +-clutter_shader_matrix_get_type +-clutter_size_get_type +-clutter_snap_constraint_get_type +-clutter_stage_get_type +-clutter_stage_manager_get_type +-clutter_state_get_type +-clutter_state_key_get_type +-clutter_swipe_action_get_type +-clutter_table_layout_get_type +-clutter_tap_action_get_type +-clutter_text_buffer_get_type +-clutter_text_get_type +-clutter_text_node_get_type +-clutter_texture_get_type +-clutter_texture_node_get_type +-clutter_timeline_get_type +-clutter_transition_get_type +-clutter_transition_group_get_type +-clutter_units_get_type +-clutter_vertex_get_type +-clutter_zoom_action_get_type +-- +2.9.3 + diff --git a/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch new file mode 100644 index 0000000000..ce9ab3a248 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-1.0/install-examples.patch @@ -0,0 +1,19 @@ +Install the examples to $libdir/clutter/. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream-Status: Inappropriate + +Index: clutter-1.26.2/examples/Makefile.am +=================================================================== +--- clutter-1.26.2.orig/examples/Makefile.am ++++ clutter-1.26.2/examples/Makefile.am +@@ -33,7 +33,8 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/clutter \ + -I$(top_builddir)/clutter + +-noinst_PROGRAMS = $(all_examples) ++exampledir = $(pkglibdir)/examples ++example_PROGRAMS = $(all_examples) + + EXTRA_DIST = redhand.png + diff --git a/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file mode 100644 index 0000000000..fef82eaf92 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -0,0 +1,30 @@ +From d6ceb5a44b28e0e50ede22b84984d8516897de4b Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 27 Apr 2015 20:12:33 +0300 +Subject: [PATCH] Run installed tests with tap output + +Configure output from installed-tests to be TAP compliant such that +gnome-desktop-testing-runner properly interprets the results. + +Upstream-Status: Pending + +Signed-off-by: Tim Orling <TicoTimo@gmail.com> + +--- + build-aux/autotools/glib-tap.mk | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build-aux/autotools/glib-tap.mk b/build-aux/autotools/glib-tap.mk +index a4f0dad..51cfa31 100644 +--- a/build-aux/autotools/glib-tap.mk ++++ b/build-aux/autotools/glib-tap.mk +@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) + %.test: %$(EXEEXT) Makefile + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ +- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ ++ echo 'Output=TAP' >> $@.tmp; \ + mv $@.tmp $@) + + CLEANFILES += $(installed_test_meta_DATA) diff --git a/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest b/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest new file mode 100644 index 0000000000..98877e5226 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-1.0/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner clutter diff --git a/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb b/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb new file mode 100644 index 0000000000..ee549fbdd5 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-1.0_1.26.4.bb @@ -0,0 +1,10 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "624dd776a5159de0267587b1df6b97b2" +SRC_URI[archive.sha256sum] = "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6" +SRC_URI += "file://install-examples.patch \ + file://run-installed-tests-with-tap-output.patch \ + file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \ + file://run-ptest" diff --git a/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc new file mode 100644 index 0000000000..7880021755 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -0,0 +1,23 @@ +SUMMARY = "GStreamer integration library for Clutter" +DESCRIPTION = "Clutter-Gst is an integration library for using GStreamer with Clutter. \ +It provides a GStreamer sink to upload frames to GL and an actor that \ +implements the ClutterGstPlayer interface using playbin." +HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter-gst/-/issues" +LICENSE = "LGPL-2.0-or-later" + +inherit clutter features_check upstream-version-is-even gobject-introspection +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" + +export GST_PLUGIN_SCANNER_1_0="${S}/gst-plugin-scanner-dummy" + +SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" + +DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgudev" +RDEPENDS:${PN} += "gstreamer1.0-meta-base" +PACKAGES =+ "${PN}-examples" + +FILES:${PN} += "${libdir}/gstreamer-1.0/lib*.so" +FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES:${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" diff --git a/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch new file mode 100644 index 0000000000..0b26b990d7 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0/0001-Install-example-binary-needed-for-core-image-clutter.patch @@ -0,0 +1,33 @@ +From d77c711277bf075ce0545c19b322f040c49c778a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 30 Apr 2015 12:19:13 +0300 +Subject: [PATCH] Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> + +Upstream-Status: Inappropriate [configuration] + +Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 3.0 + +Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + examples/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index bfbc1b5..09655e3 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content ++bin_PROGRAMS = camera-player video-player video-sink video-sink-navigation video-content + + AM_CPPFLAGS = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \ +-- +2.1.4 + diff --git a/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb new file mode 100644 index 0000000000..35382453c2 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb @@ -0,0 +1,7 @@ +require clutter-gst-3.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" + +SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e" +SRC_URI[archive.sha256sum] = "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" diff --git a/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 0000000000..025e95b5d4 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,23 @@ +SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" +DESCRIPTION = "Clutter-GTK is a library providing facilities to integrate Clutter into GTK+ \ +applications and vice versa. It provides a GTK+ widget, GtkClutterEmbed, for embedding the \ +a Clutter stage into any GtkContainer; and GtkClutterActor, a Clutter \ +actor for embedding any GtkWidget inside a Clutter stage." +HOMEPAGE = "http://www.clutter-project.org/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/clutter/-/issues" +LICENSE = "LGPL-2.0-or-later" + +CLUTTERBASEBUILDCLASS = "meson" +inherit clutter features_check upstream-version-is-even gobject-introspection gtk-doc + +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" +# depends on gtk+3 +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS = "clutter-1.0 gtk+3" +PACKAGES =+ "${PN}-examples" + +GTKDOC_MESON_OPTION = "enable_docs" + +GIR_MESON_OPTION = 'enable_gi' diff --git a/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch new file mode 100644 index 0000000000..e21c6fd903 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch @@ -0,0 +1,37 @@ +From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 11 Feb 2019 16:41:13 +0100 +Subject: [PATCH] Add a config variable for enabling/disabling introspection + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + clutter-gtk/meson.build | 2 +- + meson_options.txt | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build +index 5d6847d..5d934b6 100644 +--- a/clutter-gtk/meson.build ++++ b/clutter-gtk/meson.build +@@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk, + dependencies: [ mathlib_dep, clutter_dep, gtk_dep ], + include_directories: include_directories('.')) + +-if not meson.is_cross_build() ++if get_option('enable_gi') + gnome.generate_gir(clutter_gtk, + sources: clutter_gtk_headers + clutter_gtk_sources, + namespace: 'GtkClutter', +diff --git a/meson_options.txt b/meson_options.txt +index aaf59f1..b7e51c3 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,7 @@ option('enable_docs', + type: 'boolean', + value: false, + description: 'Enable generating the API reference (depends on GTK-Doc)') ++option('enable_gi', ++ type: 'boolean', ++ value: false, ++ description: 'Enable gobject introspection') diff --git a/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb new file mode 100644 index 0000000000..53948c8944 --- /dev/null +++ b/meta-gnome/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb @@ -0,0 +1,7 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI += " file://0001-Add-a-config-variable-for-enabling-disabling-introsp.patch" +SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" +SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" diff --git a/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc b/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 0000000000..3da361b3ff --- /dev/null +++ b/meta-gnome/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,84 @@ +SUMMARY = "Modern 3D graphics API with associated utility APIs" +DESCRIPTION = "Cogl is a small open source library for using 3D graphics \ +hardware for rendering. The API departs from the flat state machine style of \ +OpenGL and is designed to make it easy to write orthogonal components that \ +can render without stepping on each others toes." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/cogl" +LICENSE = "MIT" + +inherit clutter features_check upstream-version-is-even gobject-introspection +# cogl-1.0 needs opengl to build +REQUIRED_DISTRO_FEATURES ?= "opengl" + +DEPENDS = "glib-2.0 gdk-pixbuf" +PACKAGES =+ "${PN}-examples \ + libcogl libcogl-gles2 libcogl-pango libcogl-path \ + " +AUTOTOOLS_AUXDIR = "${S}/build" + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL = "virtual/libgl libdrm" +EDEPENDS_GLES2 = "virtual/libgles2" +EDEPENDS_KMS = "libdrm virtual/egl" +EDEPENDS_EGL = "virtual/egl" +EDEPENDS_X11 = "virtual/libx11 libxcomposite libxdamage libxfixes libxrandr" +EDEPENDS_WAYLAND = "virtual/egl virtual/libgles2 wayland" + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +ERDEPENDS_GL = "libgl" +ERDEPENDS_GLES2 = "libgles2" + +# GLESv1 is rarely tested, so disable it +EXTRA_OECONF += "--enable-examples-install \ + --enable-debug \ + --disable-gles1 \ + --disable-cairo \ + " +DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" + +# OpenGL/GLX +PACKAGECONFIG[glx] = "--enable-gl --enable-glx,--disable-gl --disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11},${ERDEPENDS_GL}" + +# GLESv2 +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" + +# EGL backends +PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" +PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" +PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" + +# Wayland (server-side) +PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-egl-server,${EDEPENDS_WAYLAND}" + +# Support rendering text directly with Pango +PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" + +# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by +# default. +PACKAGECONFIG ??= "cogl-pango gles2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " + +do_compile:prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" +} + +FILES:${PN} = "" +FILES:${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" +FILES:libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" +FILES:libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" +FILES:libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" + +FILES:libcogl-path = "${libdir}/libcogl-path${SOLIBS}" + +# For backwards compatibility after Debian-renaming +RPROVIDES:libcogl = "cogl-1.0" +RCONFLICTS:libcogl = "cogl-1.0" +RREPLACES:libcogl = "cogl-1.0" + +RDEPENDS:${PN}-dev = "libcogl" + +COMPATIBLE_HOST:armv4 = 'null' diff --git a/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch b/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch new file mode 100644 index 0000000000..328984a63f --- /dev/null +++ b/meta-gnome/recipes-graphics/cogl/cogl-1.0/0001-configure.ac-don-t-require-eglmesaext.h.patch @@ -0,0 +1,92 @@ +From bb9765a926588ebfe1eb324fbbe8fc22d419eebe Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Thu, 25 Jun 2020 11:27:40 +0000 +Subject: [PATCH] configure.ac: don't require eglmesaext.h + +E.g. the Vivante EGL implementation does not provide eglmesaext.h. + +The commit moves the check for header file existence outside of the +check for existence of a egl packageconfig and makes the existence +of eglmesaext.h optional. + +fixes commit fb1acfec ("Fix building against libglvnd-provided EGL headers") +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/cogl/-/merge_requests/28] +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + configure.ac | 51 ++++++++++++++++++++++++++++++++------------------- + 1 file changed, 32 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b7ba95d..0d1d8de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1212,22 +1212,6 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + PKG_CHECK_EXISTS([egl], + [COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES egl"], + [ +- AC_CHECK_HEADERS( +- [EGL/egl.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])]) +- AC_CHECK_HEADERS( +- [EGL/eglext.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])], +- [#include <EGL/egl.h>]) +- AC_CHECK_HEADERS( +- [EGL/eglmesaext.h], +- [], +- [AC_MSG_ERROR([Unable to locate required EGL headers])], +- [#include <EGL/egl.h> +-#include <EGL/eglext.h>]) +- + AC_CHECK_LIB(EGL, [eglInitialize], + [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], + [AC_MSG_ERROR([Unable to locate required EGL library])]) +@@ -1236,9 +1220,38 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + ] + ) + +- COGL_EGL_INCLUDES="#include <EGL/egl.h> +-#include <EGL/eglext.h> +-#include <EGL/eglmesaext.h>" ++dnl Test for the existence of egl headers. ++dnl egl*.h includes eglplatform.h which on __unix__ defaults to a X11 platform. ++dnl In that case AC_CHECK_HEADERS failes if X11 headers are not available. ++dnl Set the usual include guard define and, if the EGL implementation doesn't ++dnl use that guard fall back to USE_OZONE and EGL_NO_X11 platforms which don't ++dnl require additional headers. ++ AC_CHECK_HEADERS( ++ [EGL/egl.h], ++ [COGL_EGL_INCLUDES="#include <EGL/egl.h>"], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#define __egl_h_ ++ #define USE_OZONE ++ #define EGL_NO_X11]) ++ AC_CHECK_HEADERS( ++ [EGL/eglext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES ++#include <EGL/eglext.h>"], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#define __eglext_h_ ++ #define USE_OZONE ++ #define EGL_NO_X11 ++$COGL_EGL_INCLUDES]) ++ AC_CHECK_HEADERS( ++ [EGL/eglmesaext.h], ++ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES ++#include <EGL/eglmesaext.h>"], ++ [], ++ [#define __eglmesaext_h_ ++#define USE_OZONE ++#define EGL_NO_X11 ++$COGL_EGL_INCLUDES]) ++ + AC_SUBST([COGL_EGL_INCLUDES]) + ]) + +-- +2.20.1 + diff --git a/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb b/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb new file mode 100644 index 0000000000..b9446fab38 --- /dev/null +++ b/meta-gnome/recipes-graphics/cogl/cogl-1.0_1.22.8.bb @@ -0,0 +1,6 @@ +require cogl-1.0.inc + +SRC_URI += "file://0001-configure.ac-don-t-require-eglmesaext.h.patch" +SRC_URI[archive.sha256sum] = "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" diff --git a/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb new file mode 100644 index 0000000000..a3c274240a --- /dev/null +++ b/meta-gnome/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -0,0 +1,25 @@ +# +# Copyright (C) 2007 OpenedHand Ltd. +# + +SUMMARY = "Clutter package groups" + + +# clutter-1.0 gets debian renamed to libclutter-1.0-0 +# clutter-gtk-1.0 gets debian renamed to libclutter-gtk-1.0-0 +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit packagegroup features_check +# rdepends on clutter-* +REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGES = "\ + ${PN}-core \ + " + +SUMMARY:${PN}-core = "Clutter graphics library" +RDEPENDS:${PN}-core = "\ + clutter-1.0 \ + clutter-gst-3.0 \ + clutter-gtk-1.0 \ + " diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch index c2310fe46c..944d2f9165 100644 --- a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch @@ -1,25 +1,25 @@ -From 2a1c7103839c20df5ca9ce2fa863535d802f8f3a Mon Sep 17 00:00:00 2001 +From ff0718174faf1167fb4765ebe4bd280bbe8d2ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Sun, 8 Dec 2019 23:42:00 +0100 Subject: [PATCH] musl: Hack to fix configure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +Upstream-Status: Inappropriate [Musl Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - meson.build | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) + meson.build | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build -index 4465a26..726c9fe 100644 +index 075776f..dfd7421 100644 --- a/meson.build +++ b/meson.build -@@ -82,8 +82,14 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC - elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') +@@ -101,9 +101,14 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') + config_h.set('PATH_WTMP', '_PATH_WTMPX') else -- assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes') -- config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') +- path_wtmp = '/var/log/utx.log' +- assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes') +- config_h.set_quoted('PATH_WTMP', path_wtmp) + # musl: This is just a build fix hack. + # As usual they know better, consider all other projects crap and offer zero + # alternatives: So wtmp is a dead stub only [1] (= /dev/null/wtmp - taken @@ -32,5 +32,5 @@ index 4465a26..726c9fe 100644 # compiler flags -- -2.21.0 +2.34.1 diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch index 14161804ea..2b0924b2e4 100644 --- a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch @@ -1,4 +1,4 @@ -From 820249ea8e38c568e6a36fbd9c852718c7665b56 Mon Sep 17 00:00:00 2001 +From 7401e682400df87f3258f795bb1d143f64a35a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Mon, 9 Dec 2019 00:12:08 +0100 Subject: [PATCH] musl: add missing fgetspent_r @@ -6,6 +6,7 @@ Subject: [PATCH] musl: add missing fgetspent_r Stolen from void-linux Upstream-Status: Inappropriate [musl-specific] + --- src/daemon.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) @@ -41,6 +42,3 @@ index c52bda3..a7676fe 100644 static struct passwd * entry_generator_fgetpwent (Daemon *daemon, GHashTable *users, --- -2.21.0 - diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb b/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb index edc4890005..439958c7d2 100644 --- a/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb +++ b/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb @@ -1,6 +1,6 @@ DESCRIPTION = "D-Bus interfaces for querying and manipulating user account information" HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService/" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ @@ -8,26 +8,25 @@ DEPENDS = " \ polkit \ " -inherit meson gobject-introspection gtk-doc features_check systemd +inherit meson gobject-introspection gtk-doc features_check systemd vala REQUIRED_DISTRO_FEATURES = "polkit" SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://0001-musl-Hack-to-fix-build.patch \ file://0002-musl-add-missing-fgetspent_r.patch \ " -SRC_URI[md5sum] = "6e4c6fbd490260cfe17de2e76f5d803a" -SRC_URI[sha256sum] = "ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b" +SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391" GTKDOC_MESON_OPTION = "gtk_doc" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false -Dsystemdsystemunitdir='no', systemd" +PACKAGECONFIG[systemd] = ", -Dsystemdsystemunitdir='no', systemd" -SYSTEMD_SERVICE_${PN} = "accounts-daemon.service" +SYSTEMD_SERVICE:${PN} = "accounts-daemon.service" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/polkit-1 \ " diff --git a/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.8.2.bb index eb60bd9680..efb85d77c5 100644 --- a/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb +++ b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.8.2.bb @@ -1,15 +1,15 @@ SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata" HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ + curl \ gperf-native \ glib-2.0 \ gtk+3 \ libyaml \ libarchive \ - libsoup-2.4 \ json-glib \ gdk-pixbuf \ freetype \ @@ -17,19 +17,21 @@ DEPENDS = " \ libstemmer \ " -inherit meson gobject-introspection gettext bash-completion +inherit meson gobject-introspection gettext bash-completion pkgconfig manpages SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" -SRC_URI[md5sum] = "67d441fb0fb3e14551b47db656565fc4" -SRC_URI[sha256sum] = "7ca7e91d4accefa1c0d2c6e310cb3fe2686c017810e23b3f82d9f5724345e549" +SRC_URI[sha256sum] = "71256500add5048d6f08878904708b3d0c3875f402e0adcd358e91d47dcd8b96" EXTRA_OEMESON = " \ -Drpm=false \ " -FILES_${PN} += "${libdir}/asb-plugins-5" +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,docbook-xml-dtd4-native docbook-xsl-stylesheets-native libxslt-native" -FILES_${PN}-dev += " \ +FILES:${PN} += "${libdir}/asb-plugins-5" + +FILES:${PN}-dev += " \ ${datadir}/installed-tests \ ${datadir}/gettext \ " diff --git a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb index 7845509ba2..0e86d781ce 100644 --- a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb +++ b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb @@ -1,25 +1,25 @@ SUMMARY = "GTK support library for colord" HOMEPAGE = "https://www.freedesktop.org/software/colord/" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" inherit meson gobject-introspection gettext gtk-doc features_check DEPENDS = " \ - gtk+3 \ colord \ " SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933" -SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717" +SRC_URI[sha256sum] = "b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0" -EXTRA_OEMESON = "-Dman=false" +PACKAGECONFIG ??= "gtk3 gtk4" +PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3" +PACKAGECONFIG[gtk4] = "-Dgtk4=true, -Dgtk4=false, gtk4" +EXTRA_OEMESON = "-Dman=false" +GIR_MESON_OPTION = "" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" # colord REQUIRED_DISTRO_FEATURES += "polkit" - -UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb index caec455b6d..141341e341 100644 --- a/meta-gnome/recipes-support/ibus/ibus.bb +++ b/meta-gnome/recipes-support/ibus/ibus.bb @@ -8,30 +8,34 @@ DEPENDS += " \ iso-codes \ " -inherit gtk-icon-cache bash-completion +inherit gtk-icon-cache bash-completion features_check # for unicode-ucd EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" PACKAGECONFIG ??= " \ dconf vala \ - ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ " -do_configure_prepend() { +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk4', 'opengl', '', d)}" + +do_configure:prepend() { # run native unicode-parser sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/GConf \ ${datadir}/glib-2.0 \ ${libdir}/gtk-3.0 \ + ${libdir}/gtk-4.0 \ + ${systemd_user_unitdir} \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/gettext \ " - +RDEPENDS:${PN} += "python3-core" diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index 1bbeb2c481..9d0600c794 100644 --- a/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -1,25 +1,28 @@ SUMMARY = "Intelligent Input Bus for Linux/Unix" HOMEPAGE = "https://github.com/ibus/ibus/wiki" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala -PV = "1.5.22" +PV = "1.5.26" DEPENDS = "unicode-ucd" SRC_URI = " \ - git://github.com/ibus/ibus.git \ + git://github.com/ibus/ibus.git;branch=main;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ + file://0001-makefile-don-t-gzip-the-man-pages.patch \ " -SRCREV = "e3262f08b9e3efc57808700823b0622ec03a1b5f" +SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3" S = "${WORKDIR}/git" PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[gtk4] = "--enable-gtk4,--disable-gtk4,gtk4" +PACKAGECONFIG[systemd] = "--enable-systemd-services,--disable-systemd-services,systemd" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" @@ -29,8 +32,11 @@ EXTRA_OECONF = " \ --disable-emoji-dict \ --disable-python2 \ " +EXTRA_OECONF:append:class-target = "\ + --with-python=${bindir}/python3 \ +" -do_configure_prepend() { +do_configure:prepend() { touch ${S}/ChangeLog touch ${S}/ABOUT-NLS } diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch index 3701d19f5c..aec9e7abec 100644 --- a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch +++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch @@ -13,8 +13,6 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> data/dconf/make-dconf-override-db.sh | 6 ------ 1 file changed, 6 deletions(-) -diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh -index 9c650e97..02fbf059 100755 --- a/data/dconf/make-dconf-override-db.sh +++ b/data/dconf/make-dconf-override-db.sh @@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" @@ -28,12 +26,9 @@ index 9c650e97..02fbf059 100755 # in case that schema is not installed on the system glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" -@@ -46,5 +42,3 @@ for schema in $schemas; do - done - +@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then + umount $TMPDIR/cache/gvfs + fi rm -rf $TMPDIR - -kill $DBUS_SESSION_BUS_PID --- -2.20.1 - diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch b/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch new file mode 100644 index 0000000000..105e34873a --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch @@ -0,0 +1,164 @@ +From 5307c3b310fabeaa52fafe743c5efaca73ccce46 Mon Sep 17 00:00:00 2001 +From: Emil Velikov <emil.l.velikov@gmail.com> +Date: Sun, 11 Jun 2023 16:16:35 +0900 +Subject: [PATCH] makefile: don't gzip the man pages + +Drop the gzip step from the manpages - distributions already do that as +needed. In addition this resolves the final reproducibility issue with +ibus. + +BUG=https://github.com/ibus/ibus/pull/2514 + +Upstream-Status: Backport [https://github.com/ibus/ibus/commit/1a25975d9f55f18eab609e4d147dd32689e367f3] +Note: This commit is included in version >= 1.5.29 and can be dropped +after upgrading. +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + bus/Makefile.am | 6 +----- + data/dconf/Makefile.am | 6 +----- + setup/Makefile.am | 6 +----- + tools/Makefile.am | 6 +----- + ui/gtk3/Makefile.am | 6 +----- + 5 files changed, 5 insertions(+), 25 deletions(-) + +diff --git a/bus/Makefile.am b/bus/Makefile.am +index e173ee25..d0445d02 100644 +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -169,7 +169,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + $(libibus): +@@ -181,14 +180,11 @@ test: ibus-daemon + $(builddir)/ibus-daemon -v + + man_one_in_files = ibus-daemon.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + -include $(top_srcdir)/git.mk +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 5360f033..2352f770 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -38,15 +38,12 @@ dconfdb_DATA = 00-upstream-settings + { rc=$$?; $(RM) -rf $@; exit $$rc; } + + man_5_in_files = 00-upstream-settings.5.in ibus.5.in +-man_5_files = $(man_5_in_files:.5.in=.5) +-man_5_DATA =$(man_5_files:.5=.5.gz) ++man_5_DATA = $(man_5_in_files:.5.in=.5) + man_5dir = $(mandir)/man5 + %.5: %.5.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.5.gz: %.5 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + install-data-hook: + if test -z "$(DESTDIR)"; then \ +@@ -63,7 +60,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_5_DATA) \ +- $(man_5_files) \ + $(NULL) + + MAINTAINERCLEANFILES = \ +diff --git a/setup/Makefile.am b/setup/Makefile.am +index 34c8f136..b34aa8fc 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -56,20 +56,16 @@ org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + + man_one_in_files = ibus-setup.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + CLEANFILES = \ + $(desktop_DATA) \ + $(man_one_DATA) \ +- $(man_one_files) \ + *.pyc \ + ibus-setup \ + $(NULL) +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 5c18d3d6..1c716136 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -79,15 +79,12 @@ bash_completion_DATA= \ + bash_completiondir=@datadir@/bash-completion/completions + + man_one_in_files = ibus.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + EXTRA_DIST = \ + $(man_one_in_files) \ +@@ -96,7 +93,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + if ENABLE_EMOJI_DICT +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index ab379328..aff035da 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -242,15 +242,12 @@ panelbinding.o: $(srcdir)/panelbinding.c + + MAINTAINERCLEANFILES += extension.c panelbinding.c + +-man_seven_files = $(man_seven_in_files:.7.in=.7) +-man_seven_DATA =$(man_seven_files:.7=.7.gz) ++man_seven_DATA = $(man_seven_in_files:.7.in=.7) + man_sevendir = $(mandir)/man7 + %.7: %.7.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.7.gz: %.7 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + desktop_in_files = \ + ibus-ui-emojier.desktop.in \ +@@ -278,7 +275,6 @@ CLEANFILES += \ + $(desktop_DATA) \ + $(desktop_notrans_files) \ + $(man_seven_DATA) \ +- $(man_seven_files) \ + $(NULL) + + endif diff --git a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb index d567d00d3f..7960009078 100644 --- a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb +++ b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb @@ -9,20 +9,21 @@ DEPENDS = "gtk+3 gobject-introspection-native \ LIC_FILES_CHKSUM = "file://COPYING;md5=1f18f9c6d8b4cfcc7d7804a243a4c0b4" S = "${WORKDIR}/git" -B = "${S}" SRCREV = "736ccef40d39603b8111c8a3a0bca0319bbafdc0" -PV = "3.0+git${SRCPV}" -SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0 \ +PV = "3.0+git" +SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0;protocol=https \ " -RDEPENDS_${PN} = "gtk+" +RDEPENDS:${PN} = "gtk+" -inherit features_check autotools gtk-doc gobject-introspection +inherit features_check autotools-brokensep gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" -do_configure_prepend() { +do_configure:prepend() { touch ${S}/ChangeLog } -SRC_DISTRIBUTE_LICENSES += "X11" +# gtk-doc generation doesn't work, so disable it: +# ../keybinder-docs.sgml:26: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found +GTKDOC_ENABLED = "False" diff --git a/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb new file mode 100644 index 0000000000..f5660b5267 --- /dev/null +++ b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb @@ -0,0 +1,11 @@ +SUMMARY = "libcloudproviders is a DBus API that allows cloud storage sync clients to expose their services." +LICENSE="LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +VALA_MESON_OPTION ?= 'vapigen' + +DEPENDS = "glib-2.0" + +inherit gnomebase gobject-introspection vala + +SRC_URI[archive.sha256sum] = "3b75110b3a4fdef4c5c5a440e48701fe054d2ae061d156c89136bb5ba05e74b7" diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch deleted file mode 100644 index 73ebeb4847..0000000000 --- a/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch +++ /dev/null @@ -1,63 +0,0 @@ -From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Thu, 9 May 2019 22:06:48 +0200 -Subject: [PATCH] Build so-lib -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Stolen from [1] - -[1] https://aur.archlinux.org/cgit/aur.git/commit/dynamiclib.patch?h=snowball-git&id=a9cbf4f42f3661e4b8f791cd4374233821716ea1 - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - GNUmakefile | 7 +++++-- - libstemmer/symbol.map | 6 ++++++ - 2 files changed, 11 insertions(+), 2 deletions(-) - create mode 100644 libstemmer/symbol.map - -diff --git a/GNUmakefile b/GNUmakefile -index cbd6ff7..a85230b 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -142,10 +142,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) - JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) - JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) - --CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations -+CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations - CPPFLAGS=-Iinclude - --all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) -+all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) - - clean: - rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ -@@ -192,6 +192,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) - libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) - $(AR) -cru $@ $^ - -+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) -+ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ -+ - stemwords: $(STEMWORDS_OBJECTS) libstemmer.o - $(CC) $(CFLAGS) -o $@ $^ - -diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map -new file mode 100644 -index 0000000..7a3d423 ---- /dev/null -+++ b/libstemmer/symbol.map -@@ -0,0 +1,6 @@ -+SB_STEMMER_0 { -+ global: -+ sb_stemmer_*; -+ local: -+ *; -+}; --- -2.20.1 - diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch deleted file mode 100644 index 69c1d670e7..0000000000 --- a/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 6 Oct 2019 13:05:08 +0200 -Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build - environment -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if -their LDFLAGS are ignored. - -Upstream-Status: Submitted [1] - -[1] https://github.com/snowballstem/snowball/pull/120 - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - GNUmakefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/GNUmakefile b/GNUmakefile -index 76f6ae9..47c6077 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -179,7 +179,7 @@ clean: - -rmdir $(js_output_dir) - - snowball: $(COMPILER_OBJECTS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - $(COMPILER_OBJECTS): $(COMPILER_HEADERS) - -@@ -204,7 +204,7 @@ libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ - - stemwords: $(STEMWORDS_OBJECTS) libstemmer.o -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ - - csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) - $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) --- -2.21.0 - diff --git a/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb deleted file mode 100644 index 96dd880b6a..0000000000 --- a/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Snowball compiler and stemming algorithms" -HOMEPAGE = "https://snowballstem.org/" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e" - -DEPENDS_class-target = "${BPN}-native" - -SRC_URI = "\ - git://github.com/snowballstem/snowball.git \ - file://0001-Build-so-lib.patch \ - file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \ -" -SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74" -S = "${WORKDIR}/git" -PV = "2.0.0" -LIBVER = "0.0.0" - -inherit lib_package - -BBCLASSEXTEND = "native" - -do_compile_prepend_class-target() { - # use native tools - sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile -} - -do_install() { - install -d ${D}${bindir} - install -m 755 ${S}/snowball ${D}${bindir} - install -m 755 ${S}/stemwords ${D}${bindir} - - install -d ${D}${libdir} - install -m 755 ${S}/libstemmer.so.${LIBVER} ${D}${libdir}/ - ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so.0 - ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so - - install -d ${D}${includedir} - install -m 644 ${S}/include/*.h ${D}${includedir} -} diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch b/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch new file mode 100644 index 0000000000..add2872cca --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch @@ -0,0 +1,29 @@ +From e6bdf74a424652c4f9a38457c7fa93a2051157f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 30 Aug 2022 13:09:07 -0700 +Subject: [PATCH] docs: Disable building + +It needs linuxdoc-tools which we do not have in OE anymore + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index daa2288..b355185 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -8,7 +8,7 @@ CLEANFILES = $(man_MANS) $(SGML_OUTPUTS) + EXTRA_DIST = attributes.txt libuser.conf.5.in rfc2307.txt sgml/libuser.sgml \ + $(SGML_OUTPUTS) + +-all: sgml/libuser.txt sgml/libuser.html ++all: + + libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile + sed 's,@sysconfdir\@,$(sysconfdir),g' \ +-- +2.37.2 + diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch b/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch deleted file mode 100644 index 7c47df22e4..0000000000 --- a/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4857911ece5ebfcdef42aee4c070eb216f39597 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> -Date: Fri, 13 May 2016 11:40:13 -0500 -Subject: [PATCH] modules/files.c: parse_field fix string formating in - g_warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[YOCTO #9547] - -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - -Upstream-Status: Pending ---- - modules/files.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/files.c b/modules/files.c -index 4ef0a57..35eafc9 100644 ---- a/modules/files.c -+++ b/modules/files.c -@@ -534,7 +534,7 @@ parse_field(const struct format_specifier *format, GValue *value, - string, &err); - if (ret == FALSE) { - g_assert(err != NULL); -- g_warning(lu_strerror(err)); -+ g_warning(lu_strerror(err), NULL); - lu_error_free(&err); - } - return ret; --- -2.1.4 - diff --git a/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch b/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch new file mode 100644 index 0000000000..4d11b94e02 --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch @@ -0,0 +1,22 @@ +Update the GTK_DOC_CHECK invocation to specify where the +documentation will be built (as the default is ./docs). + +This is needed so that gtkdocize as run by autopoint knows where the +documentation will be built. + +Upstream-Status: Submitted [https://pagure.io/libuser/pull-request/70] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/configure.ac b/configure.ac +index 0bd4a67..51508b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,7 +169,7 @@ if test "$GCC" = yes ; then + AC_MSG_RESULT([$enable_Werror]) + fi + +-GTK_DOC_CHECK ++GTK_DOC_CHECK([1.14],[--flavour no-tmpl --docdir docs/reference]) + + AC_CONFIG_FILES([Makefile po/Makefile.in docs/Makefile docs/reference/Makefile + libuser.pc]) diff --git a/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb index 2c580f8727..6d3bce8a1c 100644 --- a/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb @@ -4,31 +4,38 @@ and group accounts" HOMEPAGE = "https://pagure.io/libuser" BUGTRACKER = "https://pagure.io/libuser/issues" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \ file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1" SECTION = "base" -SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ +SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \ + file://0001-docs-Disable-building.patch \ file://0002-remove-unused-execinfo.h.patch \ - file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ + file://gtkdoc.patch \ " -SRC_URI[md5sum] = "63e5e5c551e99dc5302b40b80bd6d4f2" -SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b" +SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f" -DEPENDS = "popt libpam glib-2.0 python3" +DEPENDS = "bison-native popt libpam glib-2.0 python3" -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" +inherit autotools features_check gettext python3native python3-dir pkgconfig gtk-doc -inherit autotools gettext python3native python3-dir pkgconfig gtk-doc +REQUIRED_DISTRO_FEATURES = "pam" EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" +do_configure:prepend() { + install -d ${S}/admin -d ${S}/m4 + touch ${S}/ABOUT-NLS ${S}/admin/config.rpath + cd ${S} + bison lib/getdate.y -o lib/getdate.c + cd - +} + PACKAGES += "${PN}-python " -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb b/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb deleted file mode 100644 index 6fb3b82ef1..0000000000 --- a/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "A tablet description library" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" - -DEPENDS = " \ - libxml2-native \ - libgudev \ -" - -inherit autotools pkgconfig - -SRC_URI = "git://github.com/linuxwacom/libwacom.git" -SRCREV = "87cc710e21a6220e267dd08936bbec2932aa3658" -S = "${WORKDIR}/git" diff --git a/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb b/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb new file mode 100644 index 0000000000..8f45221ad3 --- /dev/null +++ b/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "A tablet description library" +DESCRIPTION = "libwacom is a library to identify Wacom tablets and their model-specific features. \ + It provides easy access to information such as 'is this a built-in on-screen tablet\', \ + 'what is the size of this model', etc." +HOMEPAGE = "https://github.com/linuxwacom/libwacom" +BUGTRACKER = "https://github.com/linuxwacom/libwacom/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" + +SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" +SRCREV = "f5b92814320d0a5745b50b7b36103843ad23e299" + +DEPENDS = " \ + libxml2-native \ + libgudev \ +" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch deleted file mode 100644 index fda37895c9..0000000000 --- a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 09:01:04 -0700 -Subject: [PATCH] pypredict/lm: Define error API if platform does not have it - -error() API is not implemented across all libcs on linux -e.g. musl does not provide it. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Onboard/pypredict/lm/lm.cpp | 1 - - Onboard/pypredict/lm/lm.h | 13 +++++++++++++ - Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp -index 2e64296..37ae241 100644 ---- a/Onboard/pypredict/lm/lm.cpp -+++ b/Onboard/pypredict/lm/lm.cpp -@@ -19,7 +19,6 @@ - - #include <stdlib.h> - #include <stdio.h> --#include <error.h> - #include <algorithm> - #include <cmath> - #include <string> -diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h -index ed4164a..b8b63ee 100644 ---- a/Onboard/pypredict/lm/lm.h -+++ b/Onboard/pypredict/lm/lm.h -@@ -32,6 +32,19 @@ - #include <algorithm> - #include <string> - -+#if defined(HAVE_ERROR_H) -+#include <error.h> -+#else -+#include <err.h> -+#define _onboard_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _onboard_error -+#endif - - // break into debugger - // step twice to come back out of the raise() call into known code -diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp -index 7c62824..e7c7f40 100644 ---- a/Onboard/pypredict/lm/lm_dynamic.cpp -+++ b/Onboard/pypredict/lm/lm_dynamic.cpp -@@ -17,8 +17,6 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - --#include <error.h> -- - #include "lm_dynamic.h" - - using namespace std; --- -2.13.2 - diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb deleted file mode 100644 index 1eb4a100c5..0000000000 --- a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "An onscreen keyboard" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" - -DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" - -SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz \ - file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ - " -SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" -SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" - -inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg - -REQUIRED_DISTRO_FEATURES = "x11" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/icons \ - ${datadir}/gnome-shell \ - ${datadir}/help \ -" - -RDEPENDS_${PN} += " \ - ncurses \ - python3-dbus \ - python3-pycairo \ - python3-pygobject \ -" diff --git a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index 934101f9ba..7151f93267 100644 --- a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -4,19 +4,25 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup features_check -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 polkit gobject-introspection-data" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ evolution-data-server \ evince \ file-roller \ + geary \ gedit \ ghex \ gnome-calculator \ + gnome-calendar \ + gnome-commander \ gnome-font-viewer \ gnome-photos \ + gnome-screenshot \ gnome-terminal \ + gnome-text-editor \ + gthumb \ libwnck3 \ nautilus \ - ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor gnome-disk-utility', '', d)} \ " diff --git a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb index 3c333fe005..13394ca1db 100644 --- a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb +++ b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb @@ -2,21 +2,24 @@ SUMMARY = "Basic GNOME desktop" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +# gnome-menus & gmime get debian renamed +PACKAGE_ARCH = "${TUNE_PKGARCH}" + inherit packagegroup features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ adwaita-icon-theme \ adwaita-icon-theme-cursors \ evolution-data-server \ gnome-backgrounds \ gnome-bluetooth \ gnome-control-center \ - gnome-desktop3 \ + gnome-desktop \ gnome-flashback \ gnome-keyring \ - gnome-menus3 \ + gnome-menus \ gnome-session \ gnome-settings-daemon \ gnome-shell \ diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch index 76640b0a1e..7a052b23b9 100644 --- a/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch +++ b/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch @@ -3,24 +3,25 @@ From: Khem Raj <raj.khem@gmail.com> Date: Tue, 25 Jul 2017 18:28:15 -0700 Subject: [PATCH] Makefile.am: Link with libm for powl() API +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 4219f28..2a5ceac 100644 +index 779416a..67e2cc3 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -69,7 +69,7 @@ dist_pkgdata_DATA = usermode.ui +@@ -82,7 +82,7 @@ endif userhelper_SOURCES = userhelper.c userhelper.h shvar.c shvar.h userhelper_CPPFLAGS = $(AM_CPPFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' - userhelper_LDADD = liblib.a $(LIBUSER_LIBS) $(GLIB_LIBS) $(PAM_LIBS) \ + userhelper_LDADD = liblib.a $(LIBUSER_LIBS) $(GLIB_LIBS) $(PAM_LIBS) -lm \ - $(SELINUX_LIBS) $(EFENCE_LIBS) + $(SELINUX_LIBS) $(EFENCE_LIBS) -lm + if GTK userinfo_SOURCES = userinfo.c - userinfo_CPPFLAGS = $(AM_CPPFLAGS) $(PIXMAPDIR_CPPFLAGS) $(SBINDIR_CPPFLAGS) \ -- -2.13.3 +2.31.1 diff --git a/meta-gnome/recipes-support/usermode/usermode_1.113.bb b/meta-gnome/recipes-support/usermode/usermode_1.114.bb index a94440c933..1811b2d3c4 100644 --- a/meta-gnome/recipes-support/usermode/usermode_1.113.bb +++ b/meta-gnome/recipes-support/usermode/usermode_1.114.bb @@ -1,3 +1,4 @@ +SUMMARY = "Tools for certain user account management tasks" DESCRIPTION = "The usermode contains the userhelper program, which can be used to allow configured \ programs to be run with superuser privileges by ordinary users, and several \ graphical tools for users: \ @@ -6,7 +7,9 @@ graphical tools for users: \ * userpasswd allows users to change their passwords. \ " HOMEPAGE = "https://pagure.io/usermode" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ gtk+ desktop-file-utils-native \ startup-notification intltool-native \ @@ -17,13 +20,11 @@ SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-fix-compile-failure-against-musl-C-library.patch \ file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \ " -SRC_URI[md5sum] = "eadfbff18578b645096b6fa61854b41d" -SRC_URI[sha256sum] = "99fbfd248b411ed0e7c44d1957b0ecde699b5a968a4db5d37228e82e7b1ba092" +SRC_URI[sha256sum] = "e7f58712b12175965b3a21522052863a061f3f1a888df3ffbe713b434f80254f" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +REQUIRED_DISTRO_FEATURES = "x11 pam" inherit features_check autotools gettext pkgconfig EXTRA_OEMAKE += "INSTALL='install -p'" -REQUIRED_DISTRO_FEATURES = "x11 pam" diff --git a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb new file mode 100644 index 0000000000..73f22a3d95 --- /dev/null +++ b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb @@ -0,0 +1,23 @@ +SUMMARY = "WebP GDK Pixbuf Loader library" +HOMEPAGE = "https://github.com/aruiz/webp-pixbuf-loader" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL-2;md5=0d90e6d44bcf69014bfae649c75aa6ca" + +DEPENDS = " \ + gdk-pixbuf \ + libwebp \ +" + +inherit meson pkgconfig + +EXTRA_OEMESON = "-Dupdate_cache=true" + +SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;branch=mainline" + +S = "${WORKDIR}/git" +SRCREV = "52232e4ba282b2fed68e8fcb4b5d45ed0eaa4ed3" + +FILES:${PN} = " \ + ${datadir}/thumbnailers/webp-pixbuf.thumbnailer \ + ${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-webp.so \ +" diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.0.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.0.bb new file mode 100644 index 0000000000..c5040571cd --- /dev/null +++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.0.bb @@ -0,0 +1,31 @@ +SUMMARY = "A xdg-desktop-portal backend for gnome." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0-native \ + gtk4\ + xdg-desktop-portal \ + xdg-desktop-portal-gtk \ + libadwaita \ + fontconfig \ + gsettings-desktop-schemas \ + gnome-desktop \ + dconf \ +" + +RDEPENDS:${PN} = "xdg-desktop-portal xdg-desktop-portal-gtk" + +inherit gnomebase pkgconfig gsettings features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI[archive.sha256sum] = "5d2d533597d280b7370b8f74faa40097b292b0036dbd59166e1312230500bb8b" + +PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[wayland] = ",,wayland-native" +PACKAGECONFIG[screenshot] = ",,,gnome-shell" +PACKAGECONFIG[screencast] = ",,,mutter" + +FILES:${PN} += "${systemd_user_unitdir} ${datadir}" diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb new file mode 100644 index 0000000000..0d2b0012c5 --- /dev/null +++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb @@ -0,0 +1,30 @@ +SUMMARY = "A backend implementation for xdg-desktop-portal that is using GTK and various pieces of GNOME infrastructure." +HOMEPAGE = "https://github.com/flatpak/xdg-desktop-portal-gtk" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3\ + xdg-desktop-portal \ + libadwaita \ + dconf \ +" + +inherit gettext meson pkgconfig gsettings features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = "git://github.com/flatpak/xdg-desktop-portal-gtk.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "54003825481c2b48fd0c42355b484469dea12020" + +PACKAGECONFIG ?= "wallpaper appchooser lockdown settings" + +PACKAGECONFIG[wallpaper] = "-Dwallpaper=enabled,-Dwallpaper=disabled,gnome-desktop" +PACKAGECONFIG[settings] = "-Dsettings=enabled,-Dsettings=disabled,gsettings-desktop-schemas fontconfig" +PACKAGECONFIG[appchooser] = "-Dappchooser=enabled,-Dappchooser=disabled" +PACKAGECONFIG[lockdown] = "-Dlockdown=enabled,-Dlockdown=disabled" + +FILES:${PN} += "${systemd_user_unitdir} ${datadir}" diff --git a/meta-gnome/site/arm-64 b/meta-gnome/site/arm-64 deleted file mode 100644 index f474d2cc40..0000000000 --- a/meta-gnome/site/arm-64 +++ /dev/null @@ -1,13 +0,0 @@ -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=8 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=8 -ac_cv_alignof_CORBA_long_long=8 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=1 -ac_cv_alignof_CORBA_wchar=2 diff --git a/meta-gnome/site/riscv64-linux b/meta-gnome/site/riscv64-linux deleted file mode 100644 index e3a41ea0e1..0000000000 --- a/meta-gnome/site/riscv64-linux +++ /dev/null @@ -1,16 +0,0 @@ -# libidl -libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} - -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=8 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=8 -ac_cv_alignof_CORBA_long_long=8 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=4 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=1 -ac_cv_alignof_CORBA_wchar=2 diff --git a/meta-gnome/site/x86_64-linux b/meta-gnome/site/x86_64-linux deleted file mode 100644 index eba1fee2bb..0000000000 --- a/meta-gnome/site/x86_64-linux +++ /dev/null @@ -1,17 +0,0 @@ -# ORBit2 -ac_cv_alignof_CORBA_boolean=1 -ac_cv_alignof_CORBA_char=1 -ac_cv_alignof_CORBA_double=8 -ac_cv_alignof_CORBA_float=4 -ac_cv_alignof_CORBA_long=4 -ac_cv_alignof_CORBA_long_double=8 -ac_cv_alignof_CORBA_long_long=8 -ac_cv_alignof_CORBA_octet=1 -ac_cv_alignof_CORBA_pointer=8 -ac_cv_alignof_CORBA_short=2 -ac_cv_alignof_CORBA_struct=1 -ac_cv_alignof_CORBA_wchar=2 - -lf_cv_sane_realloc=yes -as_cv_unaligned_access=${as_cv_unaligned_access=yes} - |