brl/citadel
1
0
Fork 2
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Big Upgrade: GNOME 3.38, Yocto 3.1.3, meta-rust, meta-intel

Browse Source 
Updated Recipes

   * dash-to-panel 40
   * dconf 0.38.0
   * gdm 3.38.0
   * glib 2.66.1
   * gjs 1.66.0
   * gnome-autoar 0.2.4
   * gnome-backgrounds 3.38.0
   * gnome-bluetooth 3.34.3
   * gnome-control-center 3.38.1
   * gnome-screenshot 3.38.0
   * gnome-shell 3.38.1
   * gnome-session 3.38.0
   * gnome-settings-daemon 3.38.0
   * gnome-terminal 3.38.0
   * gnome-usage 3.38.0
   * graphene 1.10.2
   * gsettings-desktop-schema 3.38.0
   * gvfs 1.46.1
   * iwd 1.9
   * libgee 0.20.3
   * libgtop 2.40.0
   * libgweather 3.36.1
   * mkpasswd 5.5.7
   * mozjs 78.0.1
   * mutter 3.38.1
   * nautilus 3.38.1
   * networkmanager 1.26.4
   * polkit 0.118
   * tracker 3.0.1
   * vte 0.62.0

Removed because recipes exist in poky with adequate version

   * atk, at-spi
   * clutter
   * clutter-gtk
   * cogl
   * ell
   * gcr
   * itstool
   * libinput
   * pango

Other removed recipes

   * systemd-initrd          No longer using a separate systemd recipe
                             for initramfs
   * caribou                 What even is this
   * gnome-tweaks            Not used
   * mozjs                   Polkit no longer requires an ancient mozjs
   * mozjs68                 Upgraded to mozjs78
This commit is contained in:
Bruce Leidl 2020-10-30 14:55:28 -04:00
parent 87679d1c76
commit 4c3baa433b
242 changed files with 2768 additions and 25442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-citadel/conf/layer.conf
View File

@ -12,7 +12,7 @@ BBFILE_COLLECTIONS += "citadel"
BBFILE_PATTERN_citadel = "^${LAYERDIR}/"
BBFILE_PRIORITY_citadel = "5"
LAYERSERIES_COMPAT_citadel = "thud warrior zeus"
LAYERSERIES_COMPAT_citadel = "dunfell"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers

14
meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
View File

@ -40,7 +40,6 @@ SRC_URI = "\
file://sudo-citadel \
file://citadel-ifconfig.sh \
file://00-storage-tmpfiles.conf \
file://NetworkManager.conf \
file://share/dot.bashrc \
file://share/dot.profile \
file://share/dot.vimrc \
@ -56,6 +55,7 @@ SRC_URI = "\
file://systemd/x11-session-switcher.service \
file://systemd/citadel-installer-backend.service \
file://systemd/installer-session-switcher.service \
file://systemd/user/gnome-session@citadel-installer.target.d/session.conf \
file://skel/profile \
file://skel/bashrc \
file://skel/vimrc \
@ -77,7 +77,7 @@ RDEPENDS_${PN} = "bash wireless-regdb-static"
inherit allarch systemd useradd
SYSTEMD_SERVICE_${PN} = "zram-swap.service watch-run-user.path iptables.service sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service"
SYSTEMD_SERVICE_${PN} = "zram-swap.service watch-run-user.path sway-session-switcher.service x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service"
do_install() {
install -m 0755 -d ${D}/storage
@ -88,7 +88,7 @@ do_install() {
install -m 0755 -d ${D}${sysconfdir}/skel
install -m 0755 -d ${D}${sysconfdir}/tmpfiles.d
install -m 0755 -d ${D}${sysconfdir}/udev/rules.d
install -m 0755 -d ${D}${sysconfdir}/NetworkManager
# install -m 0755 -d ${D}${sysconfdir}/NetworkManager
install -m 0755 -d ${D}${sysconfdir}/polkit-1/rules.d
install -m 0755 -d ${D}${sysconfdir}/modprobe.d
install -m 0755 -d ${D}${sysconfdir}/sudoers.d
@ -107,17 +107,21 @@ do_install() {
install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
install -m 0440 ${WORKDIR}/sudo-citadel ${D}${sysconfdir}/sudoers.d/citadel
install -m 0644 ${WORKDIR}/00-storage-tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d
install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager
#install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager
install -d ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/zram-swap.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/iptables.service ${D}${systemd_system_unitdir}
# install -m 644 ${WORKDIR}/systemd/iptables.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/sway-session-switcher.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/x11-session-switcher.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/citadel-installer-backend.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/installer-session-switcher.service ${D}${systemd_system_unitdir}
install -d ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d
install -m 644 ${WORKDIR}/systemd/user/gnome-session@citadel-installer.target.d/session.conf ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d
install -m 644 ${WORKDIR}/systemd/watch-run-user.path ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/watch-run-user.service ${D}${systemd_system_unitdir}
install -m 644 ${WORKDIR}/systemd/launch-default-realm.path ${D}${systemd_system_unitdir}

2
meta-citadel/recipes-citadel/citadel-config/files/gsettings/90_citadel.gschema.override
View File

@ -3,7 +3,7 @@ natural-scroll=true
tap-to-click=true
[org.gnome.desktop.background]
picture-uri='file:///usr/share/backgrounds/gnome/Icescape.jpg'
picture-uri='file:///usr/share/backgrounds/gnome/Icetwigs.jpg'
[org.gnome.desktop.screensaver]
picture-uri='file:////usr/share/gnome-control-center/pixmaps/noise-texture-light.png'

4
meta-citadel/recipes-citadel/citadel-config/files/systemd/user/gnome-session@citadel-installer.target.d/session.conf Normal file
View File

@ -0,0 +1,4 @@
[Unit]
Wants=org.gnome.SettingsDaemon.XSettings.target
Requires=org.gnome.Shell.target

1
meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb
View File

@ -21,6 +21,7 @@ RDEPENDS_${PN} = "\
iso-codes \
libgudev \
networkmanager \
iwd \
polkit \
network-manager-applet \
clutter-1.0 \

1
meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb
View File

@ -17,7 +17,6 @@ RDEPENDS_${PN} = "\
mutter \
nautilus \
gjs \
caribou \
gvfs \
gnome-keyring \
gnome-session \

3
meta-citadel/recipes-connectivity/networkmanager/networkmanager_%.bbappend
View File

@ -1,7 +1,4 @@
# Append recipe from meta-openembedded/meta-networking
PACKAGECONFIG = "gnutls dhclient systemd wifi"
EXTRA_OECONF_remove = "--with-nmtui=yes"
EXTRA_OECONF += "--disable-ovs --with-nmtui=no"
SRC_URI += "\
file://watch-resolvconf.path \

91
meta-citadel/recipes-core/systemd/systemd/50-udev-default.rules
View File

@ -1,91 +0,0 @@
# do not edit this file, it will be overwritten on update
# run a command on remove events
ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
ACTION=="remove", GOTO="default_end"
SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
# select "system RTC" or just use the first one
SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
ACTION!="add", GOTO="default_end"
SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666"
SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"
SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"
SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"
SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
SUBSYSTEM=="input", GROUP="input"
SUBSYSTEM=="input", KERNEL=="js[0-9]*", MODE="0664"
SUBSYSTEM=="video4linux", GROUP="video"
SUBSYSTEM=="graphics", GROUP="video"
SUBSYSTEM=="drm", KERNEL!="renderD*", GROUP="video"
SUBSYSTEM=="dvb", GROUP="video"
SUBSYSTEM=="media", GROUP="video"
SUBSYSTEM=="cec", GROUP="video"
SUBSYSTEM=="drm", KERNEL=="renderD*", GROUP="video", MODE="0666"
SUBSYSTEM=="kfd", GROUP="video", MODE="0666"
# When using static_node= with non-default permissions, also update
# tmpfiles.d/static-nodes-permissions.conf.in to keep permissions synchronized.
SUBSYSTEM=="sound", GROUP="audio", \
OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
KERNEL=="parport[0-9]*", GROUP="lp"
SUBSYSTEM=="printer", KERNEL=="lp*", GROUP="lp"
SUBSYSTEM=="ppdev", GROUP="lp"
KERNEL=="lp[0-9]*", GROUP="lp"
KERNEL=="irlpt[0-9]*", GROUP="lp"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp"
SUBSYSTEM=="block", GROUP="disk"
SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"
SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
KERNEL=="sch[0-9]*", GROUP="cdrom"
KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
KERNEL=="pktcdvd", GROUP="cdrom"
SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"
KERNEL=="btrfs-control", GROUP="disk"
KERNEL=="rawctl", GROUP="disk"
SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", GROUP="disk"
SUBSYSTEM=="aoe", GROUP="disk", MODE="0220"
SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440"
KERNEL=="rfkill", MODE="0664"
KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse"
# The static_node is required on s390x and ppc (they are using MODULE_ALIAS)
KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"
KERNEL=="udmabuf", GROUP="kvm"
SUBSYSTEM=="ptp", ATTR{clock_name}=="KVM virtual PTP", SYMLINK += "ptp_kvm"
LABEL="default_end"

8
meta-citadel/recipes-core/systemd/systemd_%.bbappend
View File

@ -12,15 +12,7 @@ PACKAGECONFIG = "\
nss polkit randomseed seccomp timedated utmp timesyncd kmod sysusers gshadow \
"
SRC_URI += "\
file://50-udev-default.rules \
"
do_install_append() {
rm -f ${D}${sysconfdir}/tmpfiles.d/00-create-volatile.conf
ln -s rescue.target ${D}${systemd_unitdir}/system/kbrequest.target
rm -f ${D}${libdir}/udev/rules.d/50-udev-default.rules
install -d ${D}{$libdir}/udev/rules.d
install -m 644 ${WORKDIR}/50-udev-default.rules ${D}{$libdir}/udev/rules.d/
}

2
meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_38.bb → meta-citadel/recipes-desktop/dash-to-panel/dash-to-panel_40.bb
View File

@ -2,7 +2,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855"
SRC_URI = "git://github.com/home-sweet-gnome/dash-to-panel.git;protocol=https"
SRCREV = "a1bf1c0c61bb18b76e994c8c64b1877536ccc877"
SRCREV = "48a69e529614d1da456802b818e7d7f0d4d1d642"
S = "${WORKDIR}/git"

323
meta-citadel/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-GOA-CUPS-and-User-Accounts-optional.patch
View File

@ -1,323 +0,0 @@
From e0460ca5f7d65d17729e9eedffe3f0506e6ba3a3 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Fri, 5 Apr 2019 07:36:45 -0400
Subject: [PATCH] Make GOA, CUPS, and User Accounts optional
---
meson.build | 13 +++++++++++++
meson_options.txt | 7 ++++++-
panels/background/bg-pictures-source.c | 20 ++++++++++++++++++++
panels/background/meson.build | 15 +++++++++++----
panels/meson.build | 15 ++++++++++++---
shell/cc-panel-loader.c | 6 ++++++
tests/meson.build | 2 +-
7 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/meson.build b/meson.build
index e89ea52..d7926c9 100644
--- a/meson.build
+++ b/meson.build
@@ -112,6 +112,13 @@ if not libhandy_dep.found()
libhandy_dep = libhandy.get_variable('libhandy_dep')
endif
+enable_goa = get_option('online_accounts')
+enable_cups = get_option('cups')
+enable_user_accounts = get_option('user_accounts')
+config_h.set('WITH_GOA', enable_goa, description: 'Define to enable support for Gnome Online Accounts')
+config_h.set('WITH_CUPS', enable_goa, description: 'Define to enable support for CUPS')
+config_h.set('WITH_USER_ACCOUNTS', enable_user_accounts, description: 'Define to enable user accounts panel')
+
goa_req_version = '>= 3.25.3'
pulse_req_version = '>= 2.0'
@@ -122,7 +129,9 @@ gio_dep = dependency('gio-2.0')
glib_dep = dependency('glib-2.0', version: '>= 2.53.0')
gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90')
gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.25.90')
+if enable_goa
goa_dep = dependency('goa-1.0', version: goa_req_version)
+endif
gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.31.0')
libxml_dep = dependency('libxml-2.0')
polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103')
@@ -144,6 +153,8 @@ common_deps = [
dependency('gtk+-3.0', version: '>= 3.22.20')
]
+if enable_cups
+
# Check for CUPS 1.4 or newer
cups_dep = dependency('cups', version : '>= 1.4', required: false)
assert(cups_dep.found(), 'CUPS 1.4 or newer not found')
@@ -164,6 +175,8 @@ foreach header: check_headers
assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1])
endforeach
+endif
+
# Optional dependency for the user accounts panel
enable_cheese = get_option('cheese')
if enable_cheese
diff --git a/meson_options.txt b/meson_options.txt
index a347168..e0c3b23 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,4 +3,9 @@ option('documentation', type: 'boolean', value: false, description: 'build docum
option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir')
option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
option('tracing', type: 'boolean', value: false, description: 'add extra debugging information')
-option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
\ No newline at end of file
+option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
+
+option('staging_dir', type: 'string', description: 'set staging directory for cross-compile')
+option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts')
+option('cups', type: 'boolean', value: false, description: 'build with support for CUPS')
+option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel')
diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
index 714c7f7..59723e1 100644
--- a/panels/background/bg-pictures-source.c
+++ b/panels/background/bg-pictures-source.c
@@ -23,13 +23,17 @@
#include "bg-pictures-source.h"
+#ifdef WITH_GOA
#include "cc-background-grilo-miner.h"
+#endif
#include "cc-background-item.h"
#include <string.h>
#include <cairo-gobject.h>
#include <gio/gio.h>
+#ifdef WITH_GOA
#include <grilo.h>
+#endif
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
#include <gdesktop-enums.h>
@@ -43,7 +47,9 @@ struct _BgPicturesSource
GCancellable *cancellable;
+#ifdef WITH_GOA
CcBackgroundGriloMiner *grl_miner;
+#endif
GnomeDesktopThumbnailFactory *thumb_factory;
@@ -85,7 +91,9 @@ bg_pictures_source_dispose (GObject *object)
g_clear_object (&source->cancellable);
}
+#ifdef WITH_GOA
g_clear_object (&source->grl_miner);
+#endif
g_clear_object (&source->thumb_factory);
G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
@@ -461,7 +469,9 @@ add_single_file (BgPicturesSource *bg_source,
const gchar *pictures_path;
g_autoptr(GFile) pictures_dir = NULL;
g_autoptr(GFile) cache_dir = NULL;
+#ifdef WITH_GOA
GrlMedia *media;
+#endif
/* find png and jpeg files */
if (!content_type)
@@ -520,13 +530,16 @@ add_single_file (BgPicturesSource *bg_source,
read_file:
+#ifdef WITH_GOA
media = g_object_get_data (G_OBJECT (file), "grl-media");
if (media == NULL)
{
+#endif
g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
g_file_read_async (file, G_PRIORITY_DEFAULT,
bg_source->cancellable,
picture_opened_for_read, bg_source);
+#ifdef WITH_GOA
}
else
{
@@ -564,6 +577,7 @@ add_single_file (BgPicturesSource *bg_source,
picture_copied_for_read,
bg_source);
}
+#endif
retval = TRUE;
@@ -594,6 +608,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
}
+#ifdef WITH_GOA
static gboolean
add_single_file_from_media (BgPicturesSource *bg_source,
GFile *file,
@@ -618,6 +633,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
}
+#endif
gboolean
bg_pictures_source_add (BgPicturesSource *bg_source,
@@ -934,6 +950,7 @@ monitor_path (BgPicturesSource *self,
return monitor;
}
+#ifdef WITH_GOA
static void
media_found_cb (BgPicturesSource *self, GrlMedia *media)
{
@@ -945,6 +962,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
add_single_file_from_media (self, file, media);
}
+#endif
static void
bg_pictures_source_init (BgPicturesSource *self)
@@ -968,9 +986,11 @@ bg_pictures_source_init (BgPicturesSource *self)
cache_path = bg_pictures_source_get_cache_path ();
self->cache_dir_monitor = monitor_path (self, cache_path);
+#ifdef WITH_GOA
self->grl_miner = cc_background_grilo_miner_new ();
g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
cc_background_grilo_miner_start (self->grl_miner);
+#endif
self->thumb_factory =
gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
diff --git a/panels/background/meson.build b/panels/background/meson.build
index bb34b69..0db3dae 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -34,9 +34,11 @@ install_data(
common_sources = []
+staging = get_option('staging_dir')
+
enums = 'gdesktop-enums-types'
enums_header = files(
- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
+ staging + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
'cc-background-item.h'
)
@@ -75,20 +77,25 @@ sources = common_sources + files(
'bg-source.c',
'bg-wallpapers-source.c',
'cc-background-chooser-dialog.c',
- 'cc-background-grilo-miner.c',
'cc-background-item.c',
'cc-background-xml.c'
)
+if enable_goa
+sources += files('cc-background-grilo-miner.c')
+endif
+
deps = common_deps + [
gdk_pixbuf_dep,
gnome_desktop_dep,
- goa_dep,
libxml_dep,
dependency('cairo-gobject'),
- dependency('grilo-0.3', version: '>= 0.3.0')
]
+if enable_goa
+deps += [ goa_dep, dependency('grilo-0.3', version: '>= 0.3.0') ]
+endif
+
cflags += [
'-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir),
'-DDATADIR="@0@"'.format(control_center_datadir),
diff --git a/panels/meson.build b/panels/meson.build
index 95a44bb..0f927bd 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -10,16 +10,13 @@ panels = [
'keyboard',
'mouse',
'notifications',
- 'online-accounts',
'power',
- 'printers',
'privacy',
'region',
'search',
'sharing',
'sound',
'universal-access',
- 'user-accounts'
]
if host_is_linux
@@ -34,6 +31,18 @@ if host_is_linux_not_s390
]
endif
+if enable_goa
+ panels += ['online-accounts']
+endif
+
+if enable_cups
+ panels += ['printers']
+endif
+
+if enable_user_accounts
+ panels += ['user-accounts']
+endif
+
panels_list = []
panels_libs = []
foreach cappletname: panels
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 5eeb44e..93d18f0 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -102,9 +102,13 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("wifi", cc_wifi_panel_get_type, cc_wifi_panel_static_init_func),
#endif
PANEL_TYPE("notifications", cc_notifications_panel_get_type, NULL),
+#ifdef WITH_GOA
PANEL_TYPE("online-accounts", cc_goa_panel_get_type, NULL),
+#endif
PANEL_TYPE("power", cc_power_panel_get_type, NULL),
+#ifdef WITH_CUPS
PANEL_TYPE("printers", cc_printers_panel_get_type, NULL),
+#endif
PANEL_TYPE("privacy", cc_privacy_panel_get_type, NULL),
PANEL_TYPE("region", cc_region_panel_get_type, NULL),
PANEL_TYPE("search", cc_search_panel_get_type, NULL),
@@ -114,7 +118,9 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("thunderbolt", cc_bolt_panel_get_type, NULL),
#endif
PANEL_TYPE("universal-access", cc_ua_panel_get_type, NULL),
+#ifdef WITH_USER_ACCOUNTS
PANEL_TYPE("user-accounts", cc_user_panel_get_type, NULL),
+#endif
#ifdef BUILD_WACOM
PANEL_TYPE("wacom", cc_wacom_panel_get_type, cc_wacom_panel_static_init_func),
#endif
diff --git a/tests/meson.build b/tests/meson.build
index 4594327..cd52250 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,5 +6,5 @@ endif
subdir('interactive-panels')
-subdir('printers')
+#subdir('printers')
subdir('info')

112
meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb
View File

@ -15,7 +15,8 @@ PACKAGE_INSTALL = "\
busybox \
kbd \
keymaps \
systemd-initrd \
systemd \
systemd-initramfs \
linux-firmware-i915 \
kernel-module-arc4 \
kernel-module-ansi-cprng \
@ -119,12 +120,115 @@ require ${THISDIR}/../../recipes-citadel/images/citadel-image.inc
IMAGE_ROOTFS_SIZE = "8192"
IMAGE_ROOTFS_EXTRA_SPACE = "0"
ROOTFS_POSTPROCESS_COMMAND += "remove_blk_availability; append_initrd_release; "
ROOTFS_POSTPROCESS_COMMAND += "remove_systemd_units; append_initrd_release; "
remove_blk_availability() {
rm ${IMAGE_ROOTFS}${systemd_system_unitdir}/blk-availability.service
SYSTEMD_UNITS = "\
basic.target \
citadel-install-rootfs-mount.service \
citadel-lvm-activate.service \
citadel-rootfs-mount.path \
citadel-rootfs-mount.service \
citadel-rootfs-setup.service \
cryptsetup-pre.target \
cryptsetup.target \
debug-shell.service \
default.target \
emergency.service \
emergency.target \
initrd-cleanup.service \
initrd-fs.target \
initrd-parse-etc.service \
initrd-root-fs.target \
initrd-switch-root.target \
initrd-switch-root.service \
initrd-udevadm-cleanup-db.service \
initrd.target \
kmod-static-nodes.service \
local-fs-pre.target \
local-fs.target \
paths.target \
plymouth-halt.service \
plymouth-kexec.service \
plymouth-poweroff.service \
plymouth-quit-wait.service \
plymouth-quit.service \
plymouth-read-write.service \
plymouth-reboot.service \
plymouth-start.service \
plymouth-switch-root.service \
poweroff.target \
reboot.target \
rescue.service \
rescue.target \
serial-getty@.service \
shutdown.target \
sigpwr.target \
slices.target \
sockets.target \
swap.target \
sysinit.target \
systemd-ask-password-console.path \
systemd-ask-password-console.service \
systemd-ask-password-plymouth.path \
systemd-ask-password-plymouth.service \
systemd-fsck-root.service \
systemd-fsck@.service \
systemd-journald-audit.socket \
systemd-journald.service \
systemd-journald.socket \
systemd-modules-load.service \
systemd-sysctl.service \
systemd-udev-settle.service \
systemd-udev-trigger.service \
systemd-udevd-control.socket \
systemd-udevd-kernel.socket \
systemd-udevd.service \
timers.target \
umount.target \
"
remove_systemd_wants() {
for path in ${IMAGE_ROOTFS}${systemd_system_unitdir}/*; do
if [ -d ${path} ]; then
[ -h ${path}/${1} ] && rm -v ${path}/${1}
fi
done
local wants_dir=${IMAGE_ROOTFS}${systemd_system_unitdir}/${1}.wants
[ -d ${wants_dir} ] && rm -rv ${wants_dir}
return 0
}
remove_one_systemd_unit() {
local unit_path=${IMAGE_ROOTFS}${systemd_system_unitdir}/${1}
remove_systemd_wants ${1}
if [ -e ${unit_path} ]; then
rm ${unit_path}
else
echo "Cannot remove systemd unit ${1} from initramfs image because it does not exist"
fi
}
match_unit() {
for unit in ${SYSTEMD_UNITS}; do
[ ${unit} = ${1} ] && return 0
done
return 1
}
remove_systemd_units() {
for path in ${IMAGE_ROOTFS}${systemd_system_unitdir}/*; do
if [ ! -d ${path} ]; then
local unit_name=$(basename ${path})
match_unit ${unit_name} || remove_one_systemd_unit ${unit_name}
fi
done
}
generate_kernel_id() {
sha256sum ${DEPLOY_DIR_IMAGE}/bzImage-intel-corei7-64.bin | cut -d' ' -f1
}

141
meta-citadel/recipes-initrd/systemd-initrd/systemd-initrd_243.2.bb
View File

@ -1,141 +0,0 @@
FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-core/systemd/systemd:"
require ${COREBASE}/meta/recipes-core/systemd/systemd_${PV}.bb
PROVIDES_remove = "udev"
RDEPENDS_${PN}_remove = "dbus"
PACKAGECONFIG = "acl cryptsetup usrmerge kmod"
do_install() {
meson_do_install
install -d ${D}/sysroot
[ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init
chown root:systemd-journal ${D}/${localstatedir}/log/journal
}
ALTERNATIVE_${PN}_remove = "resolv-conf"
sockets_wants = "${systemd_system_unitdir}/sockets.target.wants"
sysinit_wants = "${systemd_system_unitdir}/sysinit.target.wants"
SYSTEMD_WANTS = "\
${sockets_wants}/systemd-journald-audit.socket \
${sockets_wants}/systemd-journald.socket \
${sockets_wants}/systemd-journald-udevd-control.socket \
${sockets_wants}/systemd-journald-udevd-kernel.socket \
\
${sysinit_wants}/kmod-static-nodes.service \
${sysinit_wants}/systemd-ask-password-console.path \
${sysinit_wants}/systemd-journald.service \
${sysinit_wants}/systemd-modules-load.service \
${sysinit_wants}/systemd-sysctl.service \
${sysinit_wants}/systemd-udev-trigger.service \
${sysinit_wants}/systemd-udevd.service \
"
SYSTEMD_TARGETS = "\
${systemd_system_unitdir}/sysinit.target \
${systemd_system_unitdir}/basic.target \
${systemd_system_unitdir}/cryptsetup-pre.target \
${systemd_system_unitdir}/cryptsetup.target \
${systemd_system_unitdir}/sockets.target \
${systemd_system_unitdir}/paths.target \
${systemd_system_unitdir}/slices.target \
${systemd_system_unitdir}/halt.target \
${systemd_system_unitdir}/poweroff.target \
${systemd_system_unitdir}/reboot.target \
${systemd_system_unitdir}/rescue.target \
${systemd_system_unitdir}/shutdown.target \
${systemd_system_unitdir}/final.target \
${systemd_system_unitdir}/sigpwr.target \
${systemd_system_unitdir}/sockets.target \
${systemd_system_unitdir}/swap.target \
${systemd_system_unitdir}/timers.target \
${systemd_system_unitdir}/paths.target \
${systemd_system_unitdir}/umount.target \
${systemd_system_unitdir}/local-fs.target \
${systemd_system_unitdir}/local-fs-pre.target \
"
generators = "${systemd_unitdir}/system-generators"
SYSTEMD_GENERATORS = "\
${generators}/systemd-debug-generator \
${generators}/systemd-cryptsetup-generator \
${generators}/systemd-fstab-generator \
"
SYSTEMD_BINARIES = "\
${bindir}/journalctl \
${bindir}/systemctl \
${bindir}/systemd-ask-password \
${bindir}/systemd-run \
${bindir}/systemd-escape \
${bindir}/systemd-cgls \
${bindir}/systemd-tmpfiles \
${bindir}/systemd-tty-ask-password-agent \
"
SYSTEMD_UNITS = "\
${systemd_system_unitdir}/emergency.target \
${systemd_system_unitdir}/emergency.service \
${systemd_system_unitdir}/rescue.target \
${systemd_system_unitdir}/rescue.service \
${systemd_system_unitdir}/debug-shell.service \
\
${systemd_system_unitdir}/initrd.target \
${systemd_system_unitdir}/initrd-fs.target \
${systemd_system_unitdir}/initrd-root-device.target \
${systemd_system_unitdir}/initrd-root-fs.target \
${systemd_system_unitdir}/initrd-switch-root.target \
${systemd_system_unitdir}/initrd-switch-root.service \
${systemd_system_unitdir}/initrd-cleanup.service \
${systemd_system_unitdir}/initrd-udevadm-cleanup-db.service \
${systemd_system_unitdir}/initrd-parse-etc.service \
${systemd_system_unitdir}/kmod-static-nodes.service \
${systemd_system_unitdir}/systemd-ask-password-console.path \
${systemd_system_unitdir}/systemd-ask-password-console.service \
${systemd_system_unitdir}/systemd-journald.service \
${systemd_system_unitdir}/systemd-ask-password-plymouth.path \
${systemd_system_unitdir}/systemd-ask-password-plymouth.service \
${systemd_system_unitdir}/systemd-fsck@.service \
${systemd_system_unitdir}/systemd-fsck-root.service \
${systemd_system_unitdir}/systemd-journald.socket \
${systemd_system_unitdir}/systemd-journald-audit.socket \
${systemd_system_unitdir}/systemd-udevd-control.socket \
${systemd_system_unitdir}/systemd-udevd-kernel.socket \
${systemd_system_unitdir}/systemd-modules-load.service \
${systemd_system_unitdir}/systemd-sysctl.service \
${systemd_system_unitdir}/systemd-udevd.service \
${systemd_system_unitdir}/systemd-udev-trigger.service \
${systemd_system_unitdir}/systemd-udev-settle.service \
${systemd_system_unitdir}/systemd-volatile-root \
"
FILES_${PN} = "\
/init /sysroot \
${libdir}/lib* \
${libdir}/sysctl.d/50-default.conf \
${libdir}/tmpfiles.d/systemd.conf \
${systemd_unitdir}/libsystemd* \
${systemd_unitdir}/systemd* \
${base_sbindir} \
${SYSTEMD_WANTS} \
${SYSTEMD_TARGETS} \
${SYSTEMD_UNITS} \
${SYSTEMD_GENERATORS} \
${SYSTEMD_BINARIES} \
"
python populate_packages_prepend() {
# hack to sabotage do_split_packages
d.setVar("rootlibdir", "/nowhere")
}
PRIVATE_LIBS = "libsystemd-shared-${PV}.so libsystemd.so.0 libudev.so.1"
PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-unused"
RDEPENDS_${PN}-unused += "bash ${PN}"
FILES_${PN}-unused = "/"

7
meta-citadel/recipes-support/libpam-pwdfile/libpam-pwdfile_1.0.bb
View File

@ -4,11 +4,10 @@ SECTION = "libs"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
SRC_URI = "https://github.com/tiwe-de/libpam-pwdfile/archive/v${PV}.tar.gz"
SRC_URI[md5sum] = "1546a57bfe50800175f7cbc88ade4a15"
SRC_URI[sha256sum] = "5b8db1397cff9cadfd1bb96f53c134b787ab0e6a0fbedb71040541d340313ba2"
SRC_URI = "git://github.com/tiwe-de/libpam-pwdfile.git;protocol=https"
SRCREV = "8f0e412b48178c00abd023917dd2c9050ee89c18"
S = "${WORKDIR}/libpam-pwdfile-${PV}"
S = "${WORKDIR}/git"
DEPENDS = "libpam libxcrypt"
inherit lib_package pkgconfig

8
meta-citadel/recipes-support/mkpasswd/mkpasswd_5.4.2.bb → meta-citadel/recipes-support/mkpasswd/mkpasswd_5.5.7.bb
View File

@ -1,10 +1,10 @@
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "https://github.com/rfc1036/whois/archive/v${PV}.tar.gz"
SRC_URI[md5sum] = "e7fce43576e9a3a3f20bef04d7941a8a"
SRC_URI[sha256sum] = "d928b981dc949a2ea1d0512d20da74707953369f889a88d8f84f1a4b05b822d2"
S = "${WORKDIR}/whois-${PV}"
SRC_URI = "git://github.com/rfc1036/whois.git;protocol=https"
SRCREV = "7f9fdae2a99c9a56959b37049488f94e8bdfa7c2"
S = "${WORKDIR}/git"
DEPENDS = "libxcrypt libidn2"
RDEPENDS_${PN} = "libxcrypt libidn2"

35
meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch Normal file
View File

@ -0,0 +1,35 @@
From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 18 Sep 2017 17:22:43 -0700
Subject: [PATCH] md: Fix build with musl
The MIPS specific header <sgidefs.h> is not provided by musl
linux kernel headers provide <asm/sgidefs.h> which has same definitions
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Pending
pr/include/md/_linux.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -499,7 +499,7 @@
#elif defined(__mips__)
/* For _ABI64 */
-#include <sgidefs.h>
+#include <asm/sgidefs.h>
#ifdef __MIPSEB__
#define IS_BIG_ENDIAN 1
@@ -511,7 +511,7 @@
#error "Unknown MIPS endianness."
#endif
-#if _MIPS_SIM == _ABI64
+#if _MIPS_SIM == _MIPS_SIM_ABI64
#define IS_64

102
meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch Normal file
View File

@ -0,0 +1,102 @@
From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Sat, 30 Jan 2016 07:18:02 +0100
Subject: [PATCH] Add nios2 support
Add support for the nios2 CPU.
Signed-off-by: Marek Vasut <marex@denx.de>
Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ]
---
nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++
nspr/pr/include/md/_linux.h | 14 ++++++++++++++
2 files changed, 59 insertions(+)
Index: nspr/pr/include/md/_linux.cfg
===================================================================
--- nspr.orig/pr/include/md/_linux.cfg
+++ nspr/pr/include/md/_linux.cfg
@@ -975,6 +975,51 @@
#define PR_BYTES_PER_WORD_LOG2 2
#define PR_BYTES_PER_DWORD_LOG2 3
+#elif defined(__nios2__)
+
+#define IS_LITTLE_ENDIAN 1
+#undef IS_BIG_ENDIAN
+
+#define PR_BYTES_PER_BYTE 1
+#define PR_BYTES_PER_SHORT 2
+#define PR_BYTES_PER_INT 4
+#define PR_BYTES_PER_INT64 8
+#define PR_BYTES_PER_LONG 4
+#define PR_BYTES_PER_FLOAT 4
+#define PR_BYTES_PER_DOUBLE 8
+#define PR_BYTES_PER_WORD 4
+#define PR_BYTES_PER_DWORD 8
+
+#define PR_BITS_PER_BYTE 8
+#define PR_BITS_PER_SHORT 16
+#define PR_BITS_PER_INT 32
+#define PR_BITS_PER_INT64 64
+#define PR_BITS_PER_LONG 32
+#define PR_BITS_PER_FLOAT 32
+#define PR_BITS_PER_DOUBLE 64
+#define PR_BITS_PER_WORD 32
+
+#define PR_BITS_PER_BYTE_LOG2 3
+#define PR_BITS_PER_SHORT_LOG2 4
+#define PR_BITS_PER_INT_LOG2 5
+#define PR_BITS_PER_INT64_LOG2 6
+#define PR_BITS_PER_LONG_LOG2 5
+#define PR_BITS_PER_FLOAT_LOG2 5
+#define PR_BITS_PER_DOUBLE_LOG2 6
+#define PR_BITS_PER_WORD_LOG2 5
+
+#define PR_ALIGN_OF_SHORT 2
+#define PR_ALIGN_OF_INT 4
+#define PR_ALIGN_OF_LONG 4
+#define PR_ALIGN_OF_INT64 4
+#define PR_ALIGN_OF_FLOAT 4
+#define PR_ALIGN_OF_DOUBLE 4
+#define PR_ALIGN_OF_POINTER 4
+#define PR_ALIGN_OF_WORD 4
+
+#define PR_BYTES_PER_WORD_LOG2 2
+#define PR_BYTES_PER_DWORD_LOG2 3
+
#elif defined(__or1k__)
#undef IS_LITTLE_ENDIAN
Index: nspr/pr/include/md/_linux.h
===================================================================
--- nspr.orig/pr/include/md/_linux.h
+++ nspr/pr/include/md/_linux.h
@@ -55,6 +55,8 @@
#define _PR_SI_ARCHITECTURE "avr32"
#elif defined(__m32r__)
#define _PR_SI_ARCHITECTURE "m32r"
+#elif defined(__nios2__)
+#define _PR_SI_ARCHITECTURE "nios2"
#elif defined(__or1k__)
#define _PR_SI_ARCHITECTURE "or1k"
#elif defined(__riscv) && (__riscv_xlen == 32)
@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn
#define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
#endif
+#if defined(__nios2__)
+#if defined(__GNUC__)
+/* Use GCC built-in functions */
+#define _PR_HAVE_ATOMIC_OPS
+#define _MD_INIT_ATOMIC()
+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1)
+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1)
+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i)
+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv)
+#endif
+#endif
+
#if defined(__or1k__)
#if defined(__GNUC__)
/* Use GCC built-in functions */

103
meta-citadel/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch Normal file
View File

@ -0,0 +1,103 @@
From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
From: Mingli Yu <Mingli.Yu@windriver.com>
Date: Fri, 16 Nov 2018 13:52:49 +0800
Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
Remove _BUILD_STRING and _BUILD_TIME to avoid
adding timestamp to _pl_bld.h which can result
in adding timestamp in library file such as
libnspr4.so.
$ readelf --wide --decompress --hex-dump=.rodata libnspr4.so
[snip]
0x00004000 32303138 2d31312d 31352030 353a3439 2018-11-15 05:49
[snip]
Upstream-Status: Pending
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
---
lib/ds/Makefile.in | 8 +-------
lib/libc/src/Makefile.in | 8 +-------
lib/prstreams/Makefile.in | 8 +-------
pr/src/Makefile.in | 8 +-------
4 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
index e737791..b578476 100644
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -114,13 +114,7 @@ GARBAGE += $(TINC)
$(TINC):
@$(MAKE_OBJDIR)
- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
- @if test ! -z "$(SH_NOW)"; then \
- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
- else \
- true; \
- fi
- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
index e8a6d9f..978ed28 100644
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -116,13 +116,7 @@ GARBAGE += $(TINC)
$(TINC):
@$(MAKE_OBJDIR)
- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
- @if test ! -z "$(SH_NOW)"; then \
- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
- else \
- true; \
- fi
- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
index aeb2944..f318097 100644
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -116,13 +116,7 @@ endif
$(TINC):
@$(MAKE_OBJDIR)
- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
- @if test ! -z "$(SH_NOW)"; then \
- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
- else \
- true; \
- fi
- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index 19c5a69..b4ac31c 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -326,13 +326,7 @@ GARBAGE += $(TINC)
$(TINC):
@$(MAKE_OBJDIR)
- @$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
- @if test ! -z "$(SH_NOW)"; then \
- $(ECHO) '#define _BUILD_TIME $(SH_NOW)$(SUF)' >> $(TINC); \
- else \
- true; \
- fi
- @$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
+ @$(ECHO) '#define _PRODUCTION "$(PROD)"' > $(TINC)
$(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
--
2.7.4

52
meta-citadel/recipes-support/nspr/nspr/fix-build-on-x86_64.patch Normal file
View File

@ -0,0 +1,52 @@
Fix build failure on x86_64
When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
opposite logic before.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Upstream-Status: Pending
---
configure.in | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Index: nspr/configure.in
===================================================================
--- nspr.orig/configure.in
+++ nspr/configure.in
@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve
PR_MD_ASFILES=os_Linux_ia64.s
;;
x86_64)
- if test -n "$USE_64"; then
- PR_MD_ASFILES=os_Linux_x86_64.s
- elif test -n "$USE_X32"; then
+ if test -n "$USE_X32"; then
+ AC_DEFINE(i386)
PR_MD_ASFILES=os_Linux_x86_64.s
CC="$CC -mx32"
CXX="$CXX -mx32"
else
- AC_DEFINE(i386)
- PR_MD_ASFILES=os_Linux_x86.s
- CC="$CC -m32"
- CXX="$CXX -m32"
+ PR_MD_ASFILES=os_Linux_x86_64.s
fi
;;
ppc|powerpc)
PR_MD_ASFILES=os_Linux_ppc.s
;;
powerpc64)
- if test -n "$USE_64"; then
+ if test -n "$USE_N32"; then
+ PR_MD_ASFILES=os_Linux_ppc.s
+ else
CC="$CC -m64"
CXX="$CXX -m64"
- else
- PR_MD_ASFILES=os_Linux_ppc.s
fi
;;
esac

11
meta-citadel/recipes-support/nspr/nspr/nspr.pc.in Normal file
View File

@ -0,0 +1,11 @@
os_libs=-lpthread -ldl
prefix=OEPREFIX
exec_prefix=OEEXECPREFIX
libdir=OELIBDIR
includedir=OEINCDIR
Name: NSPR
Description: The Netscape Portable Runtime
Version: NSPRVERSION
Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread -ldl
Cflags: -I${includedir}/nspr

26
meta-citadel/recipes-support/nspr/nspr/remove-rpath-from-tests.patch Normal file
View File

@ -0,0 +1,26 @@
Author: Andrei Gherzan <andrei@gherzan.ro>
Date: Thu Feb 9 00:03:38 2012 +0200
Avoid QA warnings by removing hardcoded rpath from binaries.
[...]
WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/nspr-4.8.9/mozilla/nsprpub/pr/tests/../../dist/lib
in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait
[...]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Upstream-Status: Pending
Index: nspr/pr/tests/Makefile.in
===================================================================
--- nspr.orig/pr/tests/Makefile.in
+++ nspr/pr/tests/Makefile.in
@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS)
endif # SunOS
ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
- LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
+ LDOPTS += -Xlinker
ifeq ($(USE_PTHREADS),1)
EXTRA_LIBS = -lpthread
endif

19
meta-citadel/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch Normal file
View File

@ -0,0 +1,19 @@
the $srcdir is not defined at the time of gnu-configurize.
Upstream-Status: Inappropriate [OE-Core specific]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: nspr/configure.in
===================================================================
--- nspr.orig/configure.in
+++ nspr/configure.in
@@ -8,7 +8,7 @@ AC_PREREQ(2.61)
AC_INIT
AC_CONFIG_SRCDIR([pr/include/nspr.h])
-AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf)
+AC_CONFIG_AUX_DIR(build/autoconf)
AC_CANONICAL_TARGET
dnl ========================================================

197
meta-citadel/recipes-support/nspr/nspr_4.26.bb Normal file
View File

@ -0,0 +1,197 @@
SUMMARY = "Netscape Portable Runtime Library"
HOMEPAGE = "http://www.mozilla.org/projects/nspr/"
LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1"
LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \
file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99"
SECTION = "libs/network"
SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
file://remove-rpath-from-tests.patch \
file://fix-build-on-x86_64.patch \
file://remove-srcdir-from-configure-in.patch \
file://0002-Add-nios2-support.patch \
file://0001-md-Fix-build-with-musl.patch \
file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
file://nspr.pc.in \
"
CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \
-D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \
-D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \
-D_PR_INET6_PROBE -DNO_DLOPEN_NULL'"
UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
SRC_URI[md5sum] = "615695d57eaafa1fca085d3891befd68"
SRC_URI[sha256sum] = "fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d"
CVE_PRODUCT = "netscape_portable_runtime"
S = "${WORKDIR}/nspr-${PV}/nspr"
RDEPENDS_${PN}-dev += "perl"
TARGET_CC_ARCH += "${LDFLAGS}"
TESTS = " \
accept \
acceptread \
acceptreademu \
affinity \
alarm \
anonfm \
atomic \
attach \
bigfile \
cleanup \
cltsrv \
concur \
cvar \
cvar2 \
dlltest \
dtoa \
errcodes \
exit \
fdcach \
fileio \
foreign \
formattm \
fsync \
gethost \
getproto \
i2l \
initclk \
inrval \
instrumt \
intrio \
intrupt \
io_timeout \
ioconthr \
join \
joinkk \
joinku \
joinuk \
joinuu \
layer \
lazyinit \
libfilename \
lltest \
lock \
lockfile \
logfile \
logger \
many_cv \
multiwait \
nameshm1 \
nblayer \
nonblock \
ntioto \
ntoh \
op_2long \
op_excl \
op_filnf \
op_filok \
op_nofil \
parent \
parsetm \
peek \
perf \
pipeping \
pipeping2 \
pipeself \
poll_nm \
poll_to \
pollable \
prftest \
primblok \
provider \
prpollml \
ranfile \
randseed \
reinit \
rwlocktest \
sel_spd \
selct_er \
selct_nm \
selct_to \
selintr \
sema \
semaerr \
semaping \
sendzlf \
server_test \
servr_kk \
servr_uk \
servr_ku \
servr_uu \
short_thread \
sigpipe \
socket \
sockopt \
sockping \
sprintf \
stack \
stdio \
str2addr \
strod \
switch \
system \
testbit \
testfile \
threads \
timemac \
timetest \
tpd \
udpsrv \
vercheck \
version \
writev \
xnotify \
zerolen"
inherit autotools multilib_script
MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
# Do not install nspr in usr/include, but in usr/include/nspr, the
# preferred path upstream.
EXTRA_OECONF += "--includedir=${includedir}/nspr"
do_compile_prepend() {
oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export
}
do_compile_append() {
oe_runmake -C pr/tests
}
do_install_append() {
install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc
sed -i \
-e 's:NSPRVERSION:${PV}:g' \
-e 's:OEPREFIX:${prefix}:g' \
-e 's:OELIBDIR:${libdir}:g' \
-e 's:OEINCDIR:${includedir}:g' \
-e 's:OEEXECPREFIX:${exec_prefix}:g' \
${D}${libdir}/pkgconfig/nspr.pc
mkdir -p ${D}${libdir}/nspr/tests
install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests
install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests
cd ${B}/pr/tests
install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests
# delete compile-et.pl and perr.properties from ${bindir} because these are
# only used to generate prerr.c and prerr.h files from prerr.et at compile
# time
rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties
}
FILES_${PN} = "${libdir}/lib*.so"
FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \
${includedir}/* ${datadir}/aclocal/* "
BBCLASSEXTEND = "native nativesdk"

47
meta-citadel/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch Normal file
View File

@ -0,0 +1,47 @@
From 8b67c22b057e158f61c9fdd5b01f37195c6f5ca4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 18 Dec 2019 12:29:50 +0100
Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
Not all current hardware supports it, particularly anything
prior to armv8 does not.
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
nss/lib/freebl/Makefile | 4 ++++
nss/lib/freebl/gcm.c | 2 ++
2 files changed, 6 insertions(+)
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -126,6 +126,8 @@ else
endif
endif
ifdef NS_USE_GCC
+ifdef NSS_USE_ARM_HW_CRYPTO
+ DEFINES += -DNSS_USE_ARM_HW_CRYPTO
ifeq ($(CPU_ARCH),aarch64)
DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2
EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c
@@ -150,6 +152,7 @@ endif
endif
endif
endif
+endif
ifeq ($(OS_TARGET),OSF1)
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
--- a/nss/lib/freebl/gcm.c
+++ b/nss/lib/freebl/gcm.c
@@ -21,7 +21,9 @@
/* old gcc doesn't support some poly64x2_t intrinsic */
#if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \
(defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
+# ifdef NSS_USE_ARM_HW_CRYPTO
#define USE_ARM_GCM
+# endif
#elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
!defined(NSS_DISABLE_ARM32_NEON)
/* We don't test on big endian platform, so disable this on big endian. */

46
meta-citadel/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch Normal file
View File

@ -0,0 +1,46 @@
From 8cea16e7550ae14494fbb3a8fe9f5452e6bd1407 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 22 Feb 2017 11:36:11 +0200
Subject: [PATCH] nss: fix support cross compiling
Let some make variables be assigned from outside makefile.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
nss/coreconf/arch.mk | 2 +-
nss/lib/freebl/Makefile | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
index 790372d..2563134 100644
--- a/nss/coreconf/arch.mk
+++ b/nss/coreconf/arch.mk
@@ -30,7 +30,7 @@ OS_TEST := $(shell uname -m)
ifeq ($(OS_TEST),i86pc)
OS_RELEASE := $(shell uname -r)_$(OS_TEST)
else
- OS_RELEASE := $(shell uname -r)
+ OS_RELEASE ?= $(shell uname -r)
endif
#
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
index 52d827c..f99f769 100644
--- a/nss/lib/freebl/Makefile
+++ b/nss/lib/freebl/Makefile
@@ -36,6 +36,12 @@ ifdef USE_64
DEFINES += -DNSS_USE_64
endif
+ifeq ($(OS_TEST),mips)
+ifndef USE_64
+ DEFINES += -DNS_PTR_LE_32
+endif
+endif
+
ifdef USE_ABI32_FPU
DEFINES += -DNSS_USE_ABI32_FPU
endif

46
meta-citadel/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch Normal file
View File

@ -0,0 +1,46 @@
From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 26 Aug 2020 17:30:40 -0700
Subject: [PATCH] pkix: Do not use NULL where 0 is needed
Clang finds this error
pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
logger->logComponent = (PKIX_ERRORCLASS)NULL;
^~~~~~~~~~~~~~~~~~~~~
pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
logger->logComponent = (PKIX_ERRORCLASS)NULL;
^~~~~~~~~~~~~~~~~~~~~
2 errors generated.
Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c
index a916e6e..10f537a 100644
--- a/nss/lib/libpkix/pkix/util/pkix_logger.c
+++ b/nss/lib/libpkix/pkix/util/pkix_logger.c
@@ -313,7 +313,7 @@ pkix_Logger_Destroy(
logger->callback = NULL;
PKIX_DECREF(logger->context);
- logger->logComponent = (PKIX_ERRORCLASS)NULL;
+ logger->logComponent = (PKIX_ERRORCLASS)0;
cleanup:
@@ -614,7 +614,7 @@ PKIX_Logger_Create(
logger->callback = callback;
logger->maxLevel = 0;
- logger->logComponent = (PKIX_ERRORCLASS)NULL;
+ logger->logComponent = (PKIX_ERRORCLASS)0;
PKIX_INCREF(loggerContext);
logger->context = loggerContext;
--
2.28.0

BIN
meta-citadel/recipes-support/nss/nss/blank-cert9.db Normal file
View File

Binary file not shown.

BIN
meta-citadel/recipes-support/nss/nss/blank-key4.db Normal file
View File

Binary file not shown.

42
meta-citadel/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch Normal file
View File

@ -0,0 +1,42 @@
From c5b2c6327f3692ed07bf8d212123e0bf08485722 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 7 Mar 2020 08:34:02 -0800
Subject: [PATCH] nss,nspr: Add recipes
clang 3.9 add this warning to rightly flag undefined
behavior, we relegate this to be just a warning instead
of error and keep the behavior as it was. Right fix would
be to not pass enum to the function with variadic arguments
as last named argument
Fixes errors like
ocsp.c:2220:22: error: passing an object that undergoes default argument promotion to 'va_start' has undefined behavior [-Werror,-Wvarargs]
va_start(ap, responseType0);
^
ocsp.c:2200:43: note: parameter of type 'SECOidTag' is declared here
SECOidTag responseType0, ...)
see
https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start
for more details
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
nss/coreconf/Werror.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nss/coreconf/Werror.mk b/nss/coreconf/Werror.mk
index a569a49..687fe58 100644
--- a/nss/coreconf/Werror.mk
+++ b/nss/coreconf/Werror.mk
@@ -56,7 +56,7 @@ ifndef WARNING_CFLAGS
ifdef CC_IS_CLANG
# -Qunused-arguments : clang objects to arguments that it doesn't understand
# and fixing this would require rearchitecture
- WARNING_CFLAGS += -Qunused-arguments
+ WARNING_CFLAGS += -Qunused-arguments -Wno-error=varargs
# -Wno-parentheses-equality : because clang warns about macro expansions
WARNING_CFLAGS += $(call disable_warning,parentheses-equality)
ifdef BUILD_OPT

91
meta-citadel/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch Normal file
View File

@ -0,0 +1,91 @@
From 028ec9c7e9f7a6f083eec987f3ad7e7623398d9d Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Mon, 13 Jul 2020 12:12:31 +0300
Subject: [PATCH] nss: fix incorrect shebang of perl
Replace incorrect shebang of perl with `#!/usr/bin/env perl'.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Pending
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
nss/cmd/signver/examples/1/form.pl | 2 +-
nss/cmd/signver/examples/1/signedForm.pl | 2 +-
nss/cmd/smimetools/smime | 2 +-
nss/coreconf/version.pl | 2 +-
nss/tests/clean_tbx | 2 +-
nss/tests/iopr/server_scr/client.cgi | 2 +-
nss/tests/path_uniq | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/nss/cmd/signver/examples/1/form.pl b/nss/cmd/signver/examples/1/form.pl
index f2cfddc..af58d54 100755
--- a/nss/cmd/signver/examples/1/form.pl
+++ b/nss/cmd/signver/examples/1/form.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/nss/cmd/signver/examples/1/signedForm.pl b/nss/cmd/signver/examples/1/signedForm.pl
index 847814c..64a31ff 100755
--- a/nss/cmd/signver/examples/1/signedForm.pl
+++ b/nss/cmd/signver/examples/1/signedForm.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#!/usr/bin/env perl
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime
index e67f6be..6cd85e6 100755
--- a/nss/cmd/smimetools/smime
+++ b/nss/cmd/smimetools/smime
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl
index d2a4942..3ba7323 100644
--- a/nss/coreconf/version.pl
+++ b/nss/coreconf/version.pl
@@ -1,4 +1,4 @@
-#!/usr/sbin/perl
+#!/usr/bin/env perl
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx
index 4de9555..c15a069 100755
--- a/nss/tests/clean_tbx
+++ b/nss/tests/clean_tbx
@@ -1,4 +1,4 @@
-#! /bin/perl
+#!/usr/bin/env perl
#######################################################################
#
diff --git a/nss/tests/iopr/server_scr/client.cgi b/nss/tests/iopr/server_scr/client.cgi
index 581ad06..34ea170 100644
--- a/nss/tests/iopr/server_scr/client.cgi
+++ b/nss/tests/iopr/server_scr/client.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq
index f29f60a..850332a 100755
--- a/nss/tests/path_uniq
+++ b/nss/tests/path_uniq
@@ -1,4 +1,4 @@
-#! /bin/perl
+#!/usr/bin/env perl
########################################################################
#

44
meta-citadel/recipes-support/nss/nss/nss-fix-nsinstall-build.patch Normal file
View File

@ -0,0 +1,44 @@
From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Sat, 7 Mar 2020 08:34:02 -0800
Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit
While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will
fail with error:
* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled
It caused by the '-m64' option which passed to host gcc.
The nsinstall was built first while nss starting to build, it only runs
on host to install built files, it doesn't need any cross-compling or
multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
error.
Upstream-Status: Pending
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
===================================================
---
nss/coreconf/nsinstall/Makefile | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
index 08dfbc2..e97fb5f 100644
--- a/nss/coreconf/nsinstall/Makefile
+++ b/nss/coreconf/nsinstall/Makefile
@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1
include $(DEPTH)/coreconf/config.mk
+# nsinstall is unfit for cross-compiling/multilib-build since it was
+# always run on local host to install built files. This change intends
+# to clean the '-m64' from ARCHFLAG and LDFLAGS.
+ARCHFLAG =
+LDFLAGS =
+# CFLAGS =
+
ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
PROGRAM =
TARGETS =

28
meta-citadel/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch Normal file
View File

@ -0,0 +1,28 @@
From dc51214895bcd63fc8eb8d1fe7941cd3e5500620 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sat, 7 Mar 2020 08:34:02 -0800
Subject: [PATCH] nss:no rpath for cross compiling
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Inappropriate [configuration]
---
nss/cmd/platlibs.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
index 6401778..e5c4e16 100644
--- a/nss/cmd/platlibs.mk
+++ b/nss/cmd/platlibs.mk
@@ -18,9 +18,9 @@ endif
ifeq ($(OS_ARCH), Linux)
ifeq ($(USE_64), 1)
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
else
-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
endif
endif

11
meta-citadel/recipes-support/nss/nss/nss.pc.in Normal file
View File

@ -0,0 +1,11 @@
prefix=OEPREFIX
exec_prefix=OEEXECPREFIX
libdir=OELIBDIR
includedir=OEINCDIR
Name: NSS
Description: Network Security Services
Version: %NSS_VERSION%
Requires: nspr >= %NSPR_VERSION%
Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3
Cflags: -IOEINCDIR

32
meta-citadel/recipes-support/nss/nss/pqg.c-ULL_addend.patch Normal file
View File

@ -0,0 +1,32 @@
From a550bdf458f11dff46ebddbac94cf48c27d3471e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 7 Mar 2020 08:34:02 -0800
Subject: [PATCH] nss does not build on mips with clang because wrong types are
used?
pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
if (addend < MP_DIGIT_MAX) {
~~~~~~ ^ ~~~~~~~~~~~~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
---
nss/lib/freebl/pqg.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c
index 626b2fb..052ad36 100644
--- a/nss/lib/freebl/pqg.c
+++ b/nss/lib/freebl/pqg.c
@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H)
static SECStatus
addToSeed(const SECItem *seed,
- unsigned long addend,
- int seedlen, /* g in 186-1 */
+ unsigned long long addend,
+ int seedlen, /* g in 186-1 */
SECItem *seedout)
{
mp_int s, sum, modulus, tmp;

5
meta-citadel/recipes-support/nss/nss/system-pkcs11.txt Normal file
View File

@ -0,0 +1,5 @@
library=
name=NSS Internal PKCS #11 Module
parameters=configdir='sql:/etc/pki/nssdb' certPrefix='' keyPrefix='' secmod='secmod.db' flags= updatedir='' updateCertPrefix='' updateKeyPrefix='' updateid='' updateTokenDescription=''
NSS=Flags=internal,critical trustOrder=75 cipherOrder=100 slotParams=(1={slotFlags=[ECC,RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512] askpw=any timeout=30})

272
meta-citadel/recipes-support/nss/nss_3.56.bb Normal file
View File

@ -0,0 +1,272 @@
SUMMARY = "Mozilla's SSL and TLS implementation"
DESCRIPTION = "Network Security Services (NSS) is a set of libraries \
designed to support cross-platform development of \
security-enabled client and server applications. \
Applications built with NSS can support SSL v2 and v3, \
TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \
v3 certificates, and other security standards."
HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
SECTION = "libs"
DEPENDS = "sqlite3 nspr zlib nss-native"
DEPENDS_class-native = "sqlite3-native nspr-native zlib-native"
LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)"
LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \
file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132"
VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \
file://nss.pc.in \
file://0001-nss-fix-support-cross-compiling.patch \
file://nss-no-rpath-for-cross-compiling.patch \
file://nss-fix-incorrect-shebang-of-perl.patch \
file://disable-Wvarargs-with-clang.patch \
file://pqg.c-ULL_addend.patch \
file://blank-cert9.db \
file://blank-key4.db \
file://system-pkcs11.txt \
file://nss-fix-nsinstall-build.patch \
file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \
"
SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
inherit siteinfo
TD = "${S}/tentative-dist"
TDS = "${S}/tentative-dist-staging"
# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a
# which caused -march conflicts in gcc
TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto"
TARGET_CC_ARCH += "${LDFLAGS}"
do_configure_prepend_libc-musl () {
sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk
}
do_compile_prepend_class-native() {
export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr
export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE}
}
do_compile_prepend_class-nativesdk() {
export LDFLAGS=""
}
do_compile_prepend_class-native() {
# Need to set RPATH so that chrpath will do its job correctly
RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}"
}
do_compile() {
export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr
export NSS_ENABLE_WERROR=0
export CROSS_COMPILE=1
export NATIVE_CC="${BUILD_CC}"
# Additional defines needed on Centos 7
export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux"
export BUILD_OPT=1
export FREEBL_NO_DEPEND=1
export FREEBL_LOWHASH=1
export LIBDIR=${libdir}
export MOZILLA_CLIENT=1
export NS_USE_GCC=1
export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_ECC=1
${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)}
export OS_RELEASE=3.4
export OS_TARGET=Linux
export OS_ARCH=Linux
if [ "${TARGET_ARCH}" = "powerpc" ]; then
OS_TEST=ppc
elif [ "${TARGET_ARCH}" = "powerpc64" ]; then
OS_TEST=ppc64
elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then
OS_TEST=mips
elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then
OS_TEST="aarch64"
else
OS_TEST="${TARGET_ARCH}"
fi
if [ "${SITEINFO_BITS}" = "64" ]; then
export USE_64=1
elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then
export USE_X32=1
fi
export NSS_DISABLE_GTESTS=1
# We can modify CC in the environment, but if we set it via an
# argument to make, nsinstall, a host program, will also build with it!
#
# nss pretty much does its own thing with CFLAGS, so we put them into CC.
# Optimization will get clobbered, but most of the stuff will survive.
# The motivation for this is to point to the correct place for debug
# source files and CFLAGS does that. Nothing uses CCC.
#
export CC="${CC} ${CFLAGS}"
make -C ./nss CCC="${CXX} -g" \
OS_TEST=${OS_TEST} \
RPATH="${RPATH}" \
autobuild
}
do_compile[vardepsexclude] += "SITEINFO_BITS"
do_install_prepend_class-nativesdk() {
export LDFLAGS=""
}
do_install() {
export CROSS_COMPILE=1
export NATIVE_CC="${BUILD_CC}"
export BUILD_OPT=1
export FREEBL_NO_DEPEND=1
export LIBDIR=${libdir}
export MOZILLA_CLIENT=1
export NS_USE_GCC=1
export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_ECC=1
export OS_RELEASE=3.4
export OS_TARGET=Linux
export OS_ARCH=Linux
if [ "${TARGET_ARCH}" = "powerpc" ]; then
OS_TEST=ppc
elif [ "${TARGET_ARCH}" = "powerpc64" ]; then
OS_TEST=ppc64
elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then
OS_TEST=mips
elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then
CPU_ARCH=aarch64
OS_TEST="aarch64"
else
OS_TEST="${TARGET_ARCH}"
fi
if [ "${SITEINFO_BITS}" = "64" ]; then
export USE_64=1
elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then
export USE_X32=1
fi
export NSS_DISABLE_GTESTS=1
make -C ./nss \
CCC="${CXX}" \
OS_TEST=${OS_TEST} \
SOURCE_LIB_DIR="${TD}/${libdir}" \
SOURCE_BIN_DIR="${TD}/${bindir}" \
install
install -d ${D}/${libdir}/
for file in ${S}/dist/*.OBJ/lib/*.so; do
echo "Installing `basename $file`..."
cp $file ${D}/${libdir}/
done
for shared_lib in ${TD}/${libdir}/*.so.*; do
if [ -f $shared_lib ]; then
cp $shared_lib ${D}/${libdir}
ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe)
fi
done
for shared_lib in ${TD}/${libdir}/*.so; do
if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then
cp $shared_lib ${D}/${libdir}
fi
done
install -d ${D}/${includedir}/nss3
install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/*
install -d ${D}/${bindir}
for binary in ${TD}/${bindir}/*; do
install -m 755 -t ${D}/${bindir} $binary
done
}
do_install[vardepsexclude] += "SITEINFO_BITS"
do_install_append() {
# Create empty .chk files for the NSS libraries at build time. They could
# be regenerated at target's boot time.
for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do
touch ${D}/${libdir}/$file
chmod 755 ${D}/${libdir}/$file
done
install -d ${D}${libdir}/pkgconfig/
sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc
sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc
sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc
sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc
sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc
}
do_install_append_class-target() {
# It used to call certutil to create a blank certificate with empty password at
# build time, but the checksum of key4.db changes every time when certutil is called.
# It causes non-determinism issue, so provide databases with a blank certificate
# which are originally from output of nss in qemux86-64 build. You can get these
# databases by:
# certutil -N -d sql:/database/path/ --empty-password
install -d ${D}${sysconfdir}/pki/nssdb/
install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db
install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db
install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt
}
PACKAGE_WRITE_DEPS += "nss-native"
pkg_postinst_${PN} () {
for I in $D${libdir}/lib*.chk; do
DN=`dirname $I`
BN=`basename $I .chk`
FN=$DN/$BN.so
shlibsign -i $FN
if [ $? -ne 0 ]; then
echo "shlibsign -i $FN failed"
fi
done
}
PACKAGES =+ "${PN}-smime"
FILES_${PN}-smime = "\
${bindir}/smime \
"
FILES_${PN} = "\
${sysconfdir} \
${bindir} \
${libdir}/lib*.chk \
${libdir}/lib*.so \
"
FILES_${PN}-dev = "\
${libdir}/nss \
${libdir}/pkgconfig/* \
${includedir}/* \
"
RDEPENDS_${PN}-smime = "perl"
BBCLASSEXTEND = "native nativesdk"

2
meta-gnome/conf/layer.conf
View File

@ -1,7 +1,7 @@
# We have a conf and classes directory, add to BBPATH
BBPATH .= ":${LAYERDIR}"
LAYERSERIES_COMPAT_meta-gnome = "thud warrior zeus"
LAYERSERIES_COMPAT_meta-gnome = "dunfell"
# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \

3
meta-gnome/recipes-connectivity/iwd/iwd_1.7.bb → meta-gnome/recipes-connectivity/iwd/iwd_1.9.bb
View File

@ -8,7 +8,8 @@ DEPENDS = "ell"
SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
file://0001-Remove-config-dir-from-unit-file.patch \
"
SRCREV = "ef6084dcb4fe2e00327bb9c7b113ece204042c22"
SRCREV = "aa3dc1b95348dea177e9d8c2c3063b29e20fe2e9"
S = "${WORKDIR}/git"
inherit autotools manpages pkgconfig python3native systemd

22
meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch
View File

@ -1,22 +0,0 @@
From 3dc3d8e73bc430ea4e93e33f7b2a4b3e0ff175af Mon Sep 17 00:00:00 2001
From: Pablo Saavedra <psaavedra@igalia.com>
Date: Tue, 13 Mar 2018 17:36:20 +0100
Subject: [PATCH] Fixed configure.ac: Fix pkgconfig sysroot locations
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 967eac0..b914219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -592,7 +592,7 @@ if test "$have_jansson" = "yes"; then
AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled])
AC_CHECK_TOOLS(READELF, [eu-readelf readelf])
- JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson`
+ JANSSON_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable=libdir jansson`
JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'`
if test "$JANSSON_SONAME" = ""; then

40
meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-Generator-fails-to-build-in-cross-compile-environmen.patch Normal file
View File

@ -0,0 +1,40 @@
From 0ec98dd65d3133514175968b19c01eed9b1d9b0c Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 27 Oct 2020 16:14:07 -0400
Subject: [PATCH] Generator fails to build in cross-compile environment.
It's not needed because it's for (re-)creating generate-docs-nm-settings-nmcli.xml
which already exists in the source archive.
---
clients/cli/meson.build | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index 517deff..d3b249c 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -35,24 +35,3 @@ executable(
endif
-generate_docs_nm_settings_nmcli = executable(
- 'generate-docs-nm-settings-nmcli',
- files(
- 'generate-docs-nm-settings-nmcli.c',
- ),
- dependencies: [
- libnmc_base_dep,
- libnmc_dep,
- libnm_libnm_aux_dep,
- ],
- c_args: clients_c_flags + ['-DG_LOG_DOMAIN="@0@"'.format('nmcli')],
- link_args: ldflags_linker_script_binary,
- link_depends: linker_script_binary,
-)
-
-generate_docs_nm_settings_nmcli_xml = custom_target(
- 'generate-docs-nm-settings-nmcli.xml',
- output: 'generate-docs-nm-settings-nmcli.xml',
- command: [ generate_docs_nm_settings_nmcli ],
- capture: true,
-)

74
meta-gnome/recipes-connectivity/networkmanager/networkmanager/0002-Do-not-create-settings-settings-property-documentati.patch
View File

@ -1,74 +0,0 @@
From 9eab96351a726e9ce6a15d158f743e35d73a8900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 22 Mar 2018 11:08:30 +0100
Subject: [PATCH] Do not create settings settings/property documentation
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
It was tried to get this work but gi / GirRepository could not be found by
python. Anyway it is not necessary for us to have the settings/property docs.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile.am | 11 -----------
configure.ac | 5 -----
2 files changed, 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d5cbcf5..2a1819a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1473,9 +1473,7 @@ libnm/libnm.typelib: libnm/libnm.gir
INTROSPECTION_GIRS += libnm/NM-1.0.gir
libnm_noinst_data = \
- libnm/nm-property-docs.xml \
libnm/nm-settings-docs-overrides.xml \
- libnm/nm-settings-docs.xml \
libnm/nm-settings-keyfile-docs.xml \
libnm/nm-settings-ifcfg-rh-docs.xml
@@ -4236,18 +4234,9 @@ $(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums)
$(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
clients_common_settings_doc_h = clients/common/settings-docs.h
-if HAVE_INTROSPECTION
-$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
- $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
-DISTCLEANFILES += $(clients_common_settings_doc_h)
-check-local-settings-docs: $(clients_common_settings_doc_h)
- $(srcdir)/tools/check-settings-docs.sh "$(srcdir)" "$(builddir)" "$(clients_common_settings_doc_h)"
-check_local += check-local-settings-docs
-else
$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
check-local-settings-docs:
-endif
EXTRA_DIST += \
$(clients_common_settings_doc_h) \
$(clients_common_settings_doc_h).in
diff --git a/configure.ac b/configure.ac
index ad4b0fc..0092092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1201,11 +1201,6 @@ GTK_DOC_CHECK(1.0)
# check if we can build setting property documentation
build_docs=no
if test -n "$INTROSPECTION_MAKEFILE"; then
- # If g-i is installed we know we have python, but we might not have pygobject
- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
- AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
- fi
-
AC_PATH_PROG(PERL, perl)
if test -z "$PERL"; then
AC_MSG_ERROR([--enable-introspection requires perl])

54
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch
View File

@ -1,54 +0,0 @@
From b2cdab746ef64bc25ba0b9cff596ebdddd6e8dc6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 7 Nov 2018 11:30:44 -0800
Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h
They conflict when used together especially with musl
removing them still keeps it working so it seems they are redundant
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
shared/n-acd/src/n-acd.c | 1 -
src/platform/wpan/nm-wpan-utils.h | 2 --
src/settings/nm-settings-connection.h | 2 --
3 files changed, 5 deletions(-)
diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c
index def56a2..dd4eb78 100644
--- a/shared/n-acd/src/n-acd.c
+++ b/shared/n-acd/src/n-acd.c
@@ -11,7 +11,6 @@
#include <inttypes.h>
#include <limits.h>
#include <linux/if_packet.h>
-#include <netinet/if_ether.h>
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h
index 1b54ec4..ed39938 100644
--- a/src/platform/wpan/nm-wpan-utils.h
+++ b/src/platform/wpan/nm-wpan-utils.h
@@ -20,8 +20,6 @@
#ifndef __WPAN_UTILS_H__
#define __WPAN_UTILS_H__
-#include <net/ethernet.h>
-
#include "nm-dbus-interface.h"
#include "platform/nm-netlink.h"
diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index e796b71..c01fef6 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -22,8 +22,6 @@
#ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__
#define __NETWORKMANAGER_SETTINGS_CONNECTION_H__
-#include <net/ethernet.h>
-
#include "nm-dbus-object.h"
#include "nm-connection.h"

37
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0002-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch
View File

@ -1,37 +0,0 @@
From 32dc6cab58912add5bc6495558538953d9344c36 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 31 Mar 2017 16:48:00 -0700
Subject: [PATCH] sd-lldp.h: Remove net/ethernet.h seems to be over specified
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/systemd/src/libsystemd-network/sd-lldp.c | 1 +
src/systemd/src/systemd/sd-lldp.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/systemd/src/libsystemd-network/sd-lldp.c b/src/systemd/src/libsystemd-network/sd-lldp.c
index 741128e..62914ae 100644
--- a/src/systemd/src/libsystemd-network/sd-lldp.c
+++ b/src/systemd/src/libsystemd-network/sd-lldp.c
@@ -3,6 +3,7 @@
#include "nm-sd-adapt-core.h"
#include <arpa/inet.h>
+#include <net/ethernet.h>
#include <linux/sockios.h>
#include <sys/ioctl.h>
diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h
index bf3afad..4cace87 100644
--- a/src/systemd/src/systemd/sd-lldp.h
+++ b/src/systemd/src/systemd/sd-lldp.h
@@ -18,7 +18,7 @@
***/
#include <inttypes.h>
-#include <net/ethernet.h>
+//#include <net/ethernet.h>
#include <sys/types.h>
#include "sd-event.h"

56
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0003-musl-basic.patch
View File

@ -1,56 +0,0 @@
From ff1a5b849755db67b1778940fff92d6eb8b8b050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 22 Mar 2018 17:54:10 +0100
Subject: [PATCH] Usual fix for musl libc
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
Stolen from [1] and prettyfied slightly
[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
shared/systemd/src/basic/stdio-util.h | 2 ++
shared/systemd/src/basic/util.h | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/shared/systemd/src/basic/stdio-util.h b/shared/systemd/src/basic/stdio-util.h
index dc67b6e..6336243 100644
--- a/shared/systemd/src/basic/stdio-util.h
+++ b/shared/systemd/src/basic/stdio-util.h
@@ -1,7 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
+#if defined(__GLIBC__)
#include <printf.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h
index dc33d66..8ee2d64 100644
--- a/shared/systemd/src/basic/util.h
+++ b/shared/systemd/src/basic/util.h
@@ -27,6 +27,11 @@
#include "macro.h"
#include "time-util.h"
+#if !defined(__GLIBC__)
+typedef int (*__compar_fn_t) (const void*, const void*);
+typedef __compar_fn_t comparison_fn_t;
+#endif
+
size_t page_size(void) _pure_;
#define PAGE_ALIGN(l) ALIGN_TO((l), page_size())

33
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0004-musl-dlopen-configure-ac.patch
View File

@ -1,33 +0,0 @@
From 7743ea63fbe572b1f82db7d399fe9c5c99521432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 22 Mar 2018 18:18:06 +0100
Subject: [PATCH] musl: dlopen is included so LD_LIBS="" instead of
LD_LIBS="none required"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Stolen from [1] and prettyfied slightly
[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index b914219..1b2b0ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,7 @@ dnl
dnl Checks for libdl - on certain platforms its part of libc
dnl
AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
+AS_IF([test "$ac_cv_search_dlopen" = "none required"],[ac_cv_search_dlopen=""])
AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],

71
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0005-musl-network-support.patch
View File

@ -1,71 +0,0 @@
From 70ecbc01874bf2f8603ccbdfda634cac0bb83d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 22 Mar 2018 18:24:07 +0100
Subject: [PATCH] musl: network support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Stolen from [1] and prettyfied slightly
[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
libnm-core/nm-utils.h | 4 ++++
shared/systemd/src/basic/socket-util.h | 6 ++++++
src/platform/wifi/nm-wifi-utils.h | 4 ++++
3 files changed, 14 insertions(+)
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index 2b5baba..976850c 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -30,7 +30,11 @@
#include <netinet/in.h>
/* For ETH_ALEN and INFINIBAND_ALEN */
+#if defined(__GLIBC__)
#include <linux/if_ether.h>
+#else
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
+#endif
#include <linux/if_infiniband.h>
#include "nm-core-enum-types.h"
diff --git a/shared/systemd/src/basic/socket-util.h b/shared/systemd/src/basic/socket-util.h
index d2246a8..76f257f 100644
--- a/shared/systemd/src/basic/socket-util.h
+++ b/shared/systemd/src/basic/socket-util.h
@@ -13,6 +13,12 @@
#include <sys/types.h>
#include <sys/un.h>
+#if !defined(__GLIBC__)
+/* SIOCGSTAMPNS from linux/asm-generic.h
+ * for src/systemd/src/libsystemd-network/sd-lldp.c */
+#include <linux/sockios.h>
+#endif
+
#include "macro.h"
#include "missing_socket.h"
#include "sparse-endian.h"
diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils.h
index 36148b5..d282eb2 100644
--- a/src/platform/wifi/nm-wifi-utils.h
+++ b/src/platform/wifi/nm-wifi-utils.h
@@ -22,7 +22,11 @@
#ifndef __WIFI_UTILS_H__
#define __WIFI_UTILS_H__
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#else /* musl libc */
+#define ETH_ALEN 6 /* Octets in one ethernet addr */
+#endif
#include "nm-dbus-interface.h"
#include "nm-setting-wireless.h"

60
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0006-musl-process-util.patch
View File

@ -1,60 +0,0 @@
From 4f2fb1e1f785bad22df8f3d96cb4792acf21f315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 25 Oct 2018 09:57:07 +0200
Subject: [PATCH] musl: process-util
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Stolen from [1] and prettyfied slightly
[1] https://github.com/voidlinux/void-packages/tree/master/srcpkgs/NetworkManager/patches
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
shared/systemd/src/basic/process-util.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c
index b0afb5c..7adc8bd 100644
--- a/shared/systemd/src/basic/process-util.c
+++ b/shared/systemd/src/basic/process-util.c
@@ -21,6 +21,9 @@
#include <sys/wait.h>
#include <syslog.h>
#include <unistd.h>
+#ifndef __GLIBC__
+#include <pthread.h>
+#endif
#if 0 /* NM_IGNORED */
#if HAVE_VALGRIND_VALGRIND_H
#include <valgrind/valgrind.h>
@@ -1168,11 +1171,13 @@ void reset_cached_pid(void) {
cached_pid = CACHED_PID_UNSET;
}
+#ifdef __GLIBC__
/* We use glibc __register_atfork() + __dso_handle directly here, as they are not included in the glibc
* headers. __register_atfork() is mostly equivalent to pthread_atfork(), but doesn't require us to link against
* libpthread, as it is part of glibc anyway. */
extern int __register_atfork(void (*prepare) (void), void (*parent) (void), void (*child) (void), void *dso_handle);
extern void* __dso_handle _weak_;
+#endif
pid_t getpid_cached(void) {
static bool installed = false;
@@ -1201,7 +1206,11 @@ pid_t getpid_cached(void) {
* only half-documented (glibc doesn't document it but LSB does — though only superficially)
* we'll check for errors only in the most generic fashion possible. */
+#ifdef __GLIBC__
if (__register_atfork(NULL, NULL, reset_cached_pid, __dso_handle) != 0) {
+#else
+ if (pthread_atfork(NULL, NULL, reset_cached_pid) != 0) {
+#endif
/* OOM? Let's try again later */
cached_pid = CACHED_PID_UNSET;
return new_pid;

75
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0007-musl-avoid-further-conflicts-by-including-net-ethern.patch
View File

@ -1,75 +0,0 @@
From 4232a34064e33b52f07cca51b902b93699800f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 16 Apr 2018 14:45:44 +0200
Subject: [PATCH] musl: avoid further conflicts by including net/ethernet.h
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>
---
src/systemd/src/systemd/sd-dhcp-client.h | 2 ++
src/systemd/src/systemd/sd-dhcp-lease.h | 2 ++
src/systemd/src/systemd/sd-dhcp6-client.h | 2 ++
src/systemd/src/systemd/sd-ipv4ll.h | 2 ++
4 files changed, 8 insertions(+)
diff --git a/src/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h
index bd0d429..c935fe1 100644
--- a/src/systemd/src/systemd/sd-dhcp-client.h
+++ b/src/systemd/src/systemd/sd-dhcp-client.h
@@ -20,7 +20,9 @@
***/
#include <inttypes.h>
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#endif
#include <netinet/in.h>
#include <sys/types.h>
#include <stdbool.h>
diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h
index d299c79..991e67e 100644
--- a/src/systemd/src/systemd/sd-dhcp-lease.h
+++ b/src/systemd/src/systemd/sd-dhcp-lease.h
@@ -19,7 +19,9 @@
***/
#include <inttypes.h>
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#endif
#include <netinet/in.h>
#include <sys/types.h>
diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h
index 43d38f5..57ab487 100644
--- a/src/systemd/src/systemd/sd-dhcp6-client.h
+++ b/src/systemd/src/systemd/sd-dhcp6-client.h
@@ -20,7 +20,9 @@
***/
#include <inttypes.h>
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#endif
#include <sys/types.h>
#include "sd-dhcp6-lease.h"
diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h
index 71bd4cf..1c667ba 100644
--- a/src/systemd/src/systemd/sd-ipv4ll.h
+++ b/src/systemd/src/systemd/sd-ipv4ll.h
@@ -19,7 +19,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#if defined(__GLIBC__)
#include <net/ethernet.h>
+#endif
#include <netinet/in.h>
#include "sd-event.h"

45
meta-gnome/recipes-connectivity/networkmanager/networkmanager/musl/0008-Add-a-strndupa-replacement-for-musl.patch
View File

@ -1,45 +0,0 @@
From cdd69321ec97ed19e66a747a968a1637a251b9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 16 Apr 2018 15:07:20 +0200
Subject: [PATCH] Add a strndupa replacement for musl
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>
---
shared/systemd/src/basic/in-addr-util.c | 1 +
shared/systemd/src/basic/string-util.h | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/shared/systemd/src/basic/in-addr-util.c b/shared/systemd/src/basic/in-addr-util.c
index 5ced350..c6b52b8 100644
--- a/shared/systemd/src/basic/in-addr-util.c
+++ b/shared/systemd/src/basic/in-addr-util.c
@@ -13,6 +13,7 @@
#include "in-addr-util.h"
#include "macro.h"
#include "parse-util.h"
+#include "string-util.h"
#include "util.h"
bool in4_addr_is_null(const struct in_addr *a) {
diff --git a/shared/systemd/src/basic/string-util.h b/shared/systemd/src/basic/string-util.h
index 38070ab..6b918e0 100644
--- a/shared/systemd/src/basic/string-util.h
+++ b/shared/systemd/src/basic/string-util.h
@@ -27,6 +27,11 @@
#define strcaseeq(a,b) (strcasecmp((a),(b)) == 0)
#define strncaseeq(a, b, n) (strncasecmp((a), (b), (n)) == 0)
+/* musl does not know strndupa */
+#if !defined(__GLIBC__)
+#define strndupa(x,s) strncpy(alloca(strlen(x)+1),x,s)
+#endif
+
int strcmp_ptr(const char *a, const char *b) _pure_;
static inline bool streq_ptr(const char *a, const char *b) {

91
meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.22.10.bb → meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.26.4.bb
View File

@ -15,76 +15,50 @@ DEPENDS = " \
util-linux \
libndp \
libnewt \
jansson \
curl \
dbus \
nss \
iwd \
coreutils-native \
python3-pygobject-native \
"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext update-rc.d systemd bash-completion vala gobject-introspection gtk-doc update-alternatives upstream-version-is-even
SRC_URI = " \
${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
file://${BPN}.initd \
file://0001-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \
file://0002-Do-not-create-settings-settings-property-documentati.patch \
file://NetworkManager.conf \
"
SRC_URI_append_libc-musl = " \
file://musl/0001-Fix-build-with-musl-systemd-specific.patch \
file://musl/0002-Fix-build-with-musl.patch \
file://musl/0003-Fix-build-with-musl-for-n-dhcp4.patch \
file://musl/0004-Fix-build-with-musl-systemd-specific.patch \
"
SRC_URI[sha256sum] = "2b29ccc1531ba7ebba95a97f40c22b963838e8b6833745efe8e6fb71fd8fca77"
SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \
file://${BPN}.initd \
file://NetworkManager.conf \
file://watch-resolvconf.path \
file://watch-resolvconf.service \
file://0001-Generator-fails-to-build-in-cross-compile-environmen.patch \
"
SRC_URI[sha256sum] = "7995802c67e54fc58be4c0e3d2095d943f53f4300a93bde7ff48822a0b1f62ea"
S = "${WORKDIR}/NetworkManager-${PV}"
EXTRA_OECONF = " \
--disable-ifcfg-rh \
--disable-more-warnings \
--with-iptables=${sbindir}/iptables \
--with-tests \
--with-nmtui=no \
--with-udev-dir=${nonarch_base_libdir}/udev \
--with-iwd \
"
# stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template
# avoids:
# | ../NetworkManager-1.16.0/libnm-core/nm-json.c:106:50: error: 'RTLD_DEEPBIND' undeclared (first use in this function); did you mean 'RTLD_DEFAULT'?
CFLAGS_append_libc-musl = " \
-DRTLD_DEEPBIND=0 \
"
EXTRA_OEMESON = "\
-Diwd=true \
-Dnmtui=false \
-Djson_validation=false \
-Dselinux=false \
-Dlibaudit=no \
-Dpolkit=false \
-Dppp=false \
-Dmodem_manager=false \
-Dovs=false \
-Dlibpsl=false \
-Dqt=false \
-Dfirewalld_zone=false \
-Dsession_tracking_consolekit=false \
-Ddhclient=${base_sbindir}/dhclient \
"
do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs"
}
PACKAGECONFIG ??= "nss ifupdown dhclient dnsmasq \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \
"
PACKAGECONFIG[systemd] = " \
--with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd, \
--without-systemdsystemunitdir, \
"
PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit"
PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
# consolekit is not picked by shlibs, so add it to RDEPENDS too
PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
# Use full featured dhcp client instead of internal one
PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
PACKAGECONFIG[resolvconf] = "--with-resolvconf=${base_sbindir}/resolvconf,,,resolvconf"
PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,,iwd"
PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
PACKAGECONFIG[cloud-setup] = "--with-nm-cloud-setup=yes,--with-nm-cloud-setup=no"
PACKAGES =+ " \
${PN}-nmtui ${PN}-nmtui-doc \
${PN}-adsl ${PN}-cloud-setup \
@ -102,7 +76,6 @@ FILES_${PN}-cloud-setup = " \
${libdir}/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh \
"
ALLOW_EMPTY_${PN}-cloud-setup = "1"
SYSTEMD_SERVICE_${PN}-cloud-setup = "${@bb.utils.contains('PACKAGECONFIG', 'cloud-setup', 'nm-cloud-setup.service nm-cloud-setup.timer', '', d)}"
FILES_${PN} += " \
${libexecdir} \
@ -146,7 +119,7 @@ FILES_${PN}-nmtui-doc = " \
"
INITSCRIPT_NAME = "network-manager"
SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'NetworkManager.service NetworkManager-dispatcher.service', '', d)}"
SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}"

33
meta-gnome/recipes-devtools/meson/meson.inc Normal file
View File

@ -0,0 +1,33 @@
HOMEPAGE = "http://mesonbuild.com"
SUMMARY = "A high performance build system"
DESCRIPTION = "Meson is a build system designed to increase programmer \
productivity. It does this by providing a fast, simple and easy to use \
interface for modern software development tools and practices."
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz \
file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \
file://0003-native_bindir.patch \
file://0001-python-module-do-not-manipulate-the-environment-when.patch \
file://disable-rpath-handling.patch \
file://cross-prop-default.patch \
file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \
"
SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080"
SRC_URI_append_class-native = " \
file://0001-Make-CPU-family-warnings-fatal.patch \
file://0002-Support-building-allarch-recipes-again.patch \
"
UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
inherit setuptools3
RDEPENDS_${PN} = "ninja python3-modules python3-pkg-resources"
FILES_${PN} += "${datadir}/polkit-1"

41
meta-gnome/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch Normal file
View File

@ -0,0 +1,41 @@
From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
mesonbuild/envconfig.py | 2 +-
mesonbuild/environment.py | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 219b62e..d1be65b 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -199,7 +199,7 @@ class MachineInfo:
cpu_family = literal['cpu_family']
if cpu_family not in known_cpu_families:
- mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
+ raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family))
endian = literal['endian']
if endian not in ('little', 'big'):
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index bf09a88..8eabe78 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
trial = 'parisc'
if trial not in known_cpu_families:
- mlog.warning('Unknown CPU family {!r}, please report this at '
- 'https://github.com/mesonbuild/meson/issues/new with the '
- 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
+ raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
return trial

37
meta-gnome/recipes-devtools/meson/meson/0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch Normal file
View File

@ -0,0 +1,37 @@
From 64aa6718c290e150dafd8da83f31cb08af00af0e Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 27 May 2020 16:43:05 +0000
Subject: [PATCH] gnome.py: prefix g-i paths with PKG_CONFIG_SYSROOT_DIR
When using sysroots for builds, the standard target paths for the
tools need to be prefixed (pkg-config is not clever enough to
determine when a custom variable is a path)
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
mesonbuild/modules/gnome.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 52016f4..2b72ee4 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -410,14 +410,14 @@ class GnomeModule(ExtensionModule):
if giscanner is not None:
self.giscanner = ExternalProgram.from_entry('g-ir-scanner', giscanner)
elif self.gir_dep.type_name == 'pkgconfig':
- self.giscanner = ExternalProgram('g_ir_scanner', self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
+ self.giscanner = ExternalProgram('g_ir_scanner', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_scanner', {}))
else:
self.giscanner = self.interpreter.find_program_impl('g-ir-scanner')
gicompiler = state.environment.lookup_binary_entry(MachineChoice.HOST, 'g-ir-compiler')
if gicompiler is not None:
self.gicompiler = ExternalProgram.from_entry('g-ir-compiler', gicompiler)
elif self.gir_dep.type_name == 'pkgconfig':
- self.gicompiler = ExternalProgram('g_ir_compiler', self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
+ self.gicompiler = ExternalProgram('g_ir_compiler', os.environ['PKG_CONFIG_SYSROOT_DIR'] + self.gir_dep.get_pkgconfig_variable('g_ir_compiler', {}))
else:
self.gicompiler = self.interpreter.find_program_impl('g-ir-compiler')
return self.gir_dep, self.giscanner, self.gicompiler

36
meta-gnome/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch Normal file
View File

@ -0,0 +1,36 @@
From d3ef01a4208a801acad380a4aaceb6a21f8fa603 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 4 Aug 2017 16:16:41 +0300
Subject: [PATCH] gtkdoc: fix issues that arise when cross-compiling
Specifically:
1) Make it possible to specify a wrapper for executing binaries
(usually, some kind of target hardware emulator, such as qemu)
2) Explicitly provide CC and LD via command line, as otherwise gtk-doc will
try to guess them, incorrectly.
3) If things break down, print the full command with arguments,
not just the binary name.
4) Correctly determine the compiler/linker executables and cross-options when cross-compiling
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
mesonbuild/modules/gnome.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index bcf77b9..6a4b472 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -974,6 +974,10 @@ This will become a hard error in the future.''')
args.append('--{}={}'.format(program_name, path))
if namespace:
args.append('--namespace=' + namespace)
+ gtkdoc_exe_wrapper = state.environment.properties.host.get('gtkdoc_exe_wrapper', None)
+ if gtkdoc_exe_wrapper is not None:
+ args.append('--run=' + gtkdoc_exe_wrapper)
+
args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
args += self._unpack_args('--scanobjsargs=', 'scanobjs_args', kwargs)

45
meta-gnome/recipes-devtools/meson/meson/0001-modules-python.py-do-not-substitute-python-s-install.patch Normal file
View File

@ -0,0 +1,45 @@
From 214e559d394491b1376e4cc370f75151117a3f83 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 18 Apr 2019 17:36:11 +0200
Subject: [PATCH] modules/python.py: do not substitute python's install prefix
with meson's
Not sure why this is being done, but it
a) relies on Python's internal variable substitution which may break in the future
b) shouldn't be necessary as Python's prefix ought to be correct in the first place
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
mesonbuild/modules/python.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index 2f0c644..d2aa565 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -251,7 +251,7 @@ INTROSPECT_COMMAND = '''import sysconfig
import json
import sys
-install_paths = sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', 'platbase': '', 'installed_base': ''})
+install_paths = sysconfig.get_paths(scheme='posix_prefix')
def links_against_libpython():
from distutils.core import Distribution, Extension
@@ -276,12 +276,11 @@ class PythonInstallation(ExternalProgramHolder):
ExternalProgramHolder.__init__(self, python, interpreter.subproject)
self.interpreter = interpreter
self.subproject = self.interpreter.subproject
- prefix = self.interpreter.environment.coredata.get_builtin_option('prefix')
self.variables = info['variables']
self.paths = info['paths']
install_paths = info['install_paths']
- self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:])
- self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:])
+ self.platlib_install_path = install_paths['platlib']
+ self.purelib_install_path = install_paths['purelib']
self.version = info['version']
self.platform = info['platform']
self.is_pypy = info['is_pypy']

43
meta-gnome/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch Normal file
View File

@ -0,0 +1,43 @@
From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling
pkg-config
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
mesonbuild/modules/python.py | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index 07be318..b770603 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
- os.environ.pop('PKG_CONFIG_PATH', None)
-
- if pkg_libdir:
- os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
-
try:
self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
mlog.debug(e)
- if old_pkg_path is not None:
- os.environ['PKG_CONFIG_PATH'] = old_pkg_path
-
- if old_pkg_libdir is not None:
- os.environ['PKG_CONFIG_LIBDIR'] = old_pkg_libdir
- else:
- os.environ.pop('PKG_CONFIG_LIBDIR', None)
else:
mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))

23
meta-gnome/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch
View File

@ -1,23 +0,0 @@
From 3ec508d72b45e65b83610680e4fe31fadb13a8d3 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Thu, 4 Apr 2019 12:39:12 -0400
Subject: [PATCH] Use exe wrapper for custom targets
---
mesonbuild/backend/backends.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 4b9bcb5..f8b8168 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -745,6 +745,9 @@ class Backend:
and no exe wrapper is defined or needs_exe_wrapper is true.
You might want to set it to native instead.'''.format(exe.name))
raise MesonException(s)
+ else:
+ exe_path = os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))
+ return [self.environment.exe_wrapper.get_path(), exe_path]
if isinstance(exe, build.BuildTarget):
exe_arr = [os.path.join(self.environment.get_build_dir(), self.get_target_filename(exe))]
else:

26
meta-gnome/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch Normal file
View File

@ -0,0 +1,26 @@
From 38f59e256f760aa959c13f4c5713f87ff7addee5 Mon Sep 17 00:00:00 2001
From: Peter Kjellerstedt <pkj@axis.com>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again
This registers "allarch" as a known CPU family.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
mesonbuild/envconfig.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index d1be65b..90f3573 100644
--- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py
@@ -36,6 +36,7 @@ _T = T.TypeVar('_T')
known_cpu_families = (
+ 'allarch',
'aarch64',
'alpha',
'arc',

125
meta-gnome/recipes-devtools/meson/meson/0003-native_bindir.patch Normal file
View File

@ -0,0 +1,125 @@
From f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir
Some libraries, like QT, have pre-processors that convert their input
files into something that the cross-compiler can process. We find the
path of those pre-processors via pkg-config-native instead of
pkg-config.
This path forces the use of pkg-config-native for host_bins arguments.
There are some discussions upstream to merge this patch, but I presonaly believe
that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment-303730323
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
mesonbuild/dependencies/base.py | 19 +++++++++++--------
mesonbuild/dependencies/ui.py | 6 +++---
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 368a4bc..9fc398e 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -183,7 +183,7 @@ class Dependency:
def get_exe_args(self, compiler):
return []
- def get_pkgconfig_variable(self, variable_name, kwargs):
+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name))
def get_configtool_variable(self, variable_name):
@@ -261,7 +261,7 @@ class InternalDependency(Dependency):
setattr(result, k, copy.deepcopy(v, memo))
return result
- def get_pkgconfig_variable(self, variable_name, kwargs):
+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
raise DependencyException('Method "get_pkgconfig_variable()" is '
'invalid for an internal dependency')
@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency):
return s.format(self.__class__.__name__, self.name, self.is_found,
self.version_reqs)
- def _call_pkgbin_real(self, args, env):
- cmd = self.pkgbin.get_command() + args
+ def _call_pkgbin_real(self, args, env, use_native=False):
+ if use_native:
+ cmd = [self.pkgbin.get_command()[0] + "-native"] + args
+ else:
+ cmd = self.pkgbin.get_command() + args
p, out, err = Popen_safe(cmd, env=env)
rc, out, err = p.returncode, out.strip(), err.strip()
call = ' '.join(cmd)
mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out))
return rc, out, err
- def _call_pkgbin(self, args, env=None):
+ def _call_pkgbin(self, args, env=None, use_native=False):
# Always copy the environment since we're going to modify it
# with pkg-config variables
if env is None:
@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency):
targs = tuple(args)
cache = PkgConfigDependency.pkgbin_cache
if (self.pkgbin, targs, fenv) not in cache:
- cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env)
+ cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
return cache[(self.pkgbin, targs, fenv)]
def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]:
@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency):
(self.name, out_raw))
self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
- def get_pkgconfig_variable(self, variable_name, kwargs):
+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False):
options = ['--variable=' + variable_name, self.name]
if 'define_variable' in kwargs:
@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency):
options = ['--define-variable=' + '='.join(definition)] + options
- ret, out, err = self._call_pkgbin(options)
+ ret, out, err = self._call_pkgbin(options, use_native=use_native)
variable = ''
if ret != 0:
if self.required:
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index 95dfe2b..5f82890 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
self.bindir = self.get_pkgconfig_host_bins(core)
if not self.bindir:
# If exec_prefix is not defined, the pkg-config file is broken
- prefix = core.get_pkgconfig_variable('exec_prefix', {})
+ prefix = core.get_pkgconfig_variable('exec_prefix', {}, use_native=True)
if prefix:
self.bindir = os.path.join(prefix, 'bin')
@@ -528,7 +528,7 @@ class Qt4Dependency(QtBaseDependency):
applications = ['moc', 'uic', 'rcc', 'lupdate', 'lrelease']
for application in applications:
try:
- return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}))
+ return os.path.dirname(core.get_pkgconfig_variable('%s_location' % application, {}, use_native=True))
except MesonException:
pass
@@ -538,7 +538,7 @@ class Qt5Dependency(QtBaseDependency):
QtBaseDependency.__init__(self, 'qt5', env, kwargs)
def get_pkgconfig_host_bins(self, core):
- return core.get_pkgconfig_variable('host_bins', {})
+ return core.get_pkgconfig_variable('host_bins', {}, use_native=True)
def get_private_includes(self, mod_inc_dir, module):
return _qt_get_private_includes(mod_inc_dir, module, self.version)

23
meta-gnome/recipes-devtools/meson/meson/cross-prop-default.patch Normal file
View File

@ -0,0 +1,23 @@
meson.build files that use cc.run() in native builds can silently fallback to
meson.get_cross_property() in cross builds without an exe-wrapper, but there's
no way to know that this is happening.
As the defaults may be pessimistic (for example, disabling the support for a
feature that should be enabled) emit a warning when the default is used, so that
the recipe can explicitly set the cross property as relevant.
Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/5071]
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 3c3cfae0..10e741ae 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1890,6 +1890,7 @@ class MesonMain(InterpreterObject):
return props[propname]
except Exception:
if len(args) == 2:
+ mlog.warning('Cross property %s is using default value %s' % (propname, args[1]))
return args[1]
raise InterpreterException('Unknown cross property: %s.' % propname)

35
meta-gnome/recipes-devtools/meson/meson/disable-rpath-handling.patch Normal file
View File

@ -0,0 +1,35 @@
From 9e3fcf192c1ca068d310c648c311f9d850214421 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 23 Nov 2018 15:28:28 +0000
Subject: [PATCH] meson: Disable rpath stripping at install time
We need to allow our rpaths generated through the compiler flags to make it into
our binaries. Therefore disable the meson manipulations of these unless there
is a specific directive to do something differently in the project.
RP 2018/11/23
Upstream-Status: Submitted [https://github.com/mesonbuild/meson/issues/2567]
---
mesonbuild/minstall.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
index 0be01fe..5406cab 100644
--- a/mesonbuild/minstall.py
+++ b/mesonbuild/minstall.py
@@ -512,8 +512,11 @@ class Installer:
if file_copied:
self.did_install_something = True
try:
- depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
- install_name_mappings, verbose=False)
+ if install_rpath:
+ depfixer.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
+ install_name_mappings, verbose=False)
+ else:
+ print("RPATH changes at install time disabled")
except SystemExit as e:
if isinstance(e.code, int) and e.code == 0:
pass

31
meta-gnome/recipes-devtools/meson/meson/meson-setup.py Executable file
View File

@ -0,0 +1,31 @@
#!/usr/bin/env python3
import os
import string
import sys
class Template(string.Template):
delimiter = "@"
class Environ():
def __getitem__(self, name):
val = os.environ[name]
val = ["'%s'" % x for x in val.split()]
val = ', '.join(val)
val = '[%s]' % val
return val
try:
sysroot = os.environ['OECORE_NATIVE_SYSROOT']
except KeyError:
print("Not in environment setup, bailing")
sys.exit(1)
template_file = os.path.join(sysroot, 'usr/share/meson/meson.cross.template')
cross_file = os.path.join(sysroot, 'usr/share/meson/%smeson.cross' % os.environ["TARGET_PREFIX"])
with open(template_file) as in_file:
template = in_file.read()
output = Template(template).substitute(Environ())
with open(cross_file, "w") as out_file:
out_file.write(output)

14
meta-gnome/recipes-devtools/meson/meson/meson-wrapper Executable file
View File

@ -0,0 +1,14 @@
#!/bin/sh
if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
echo "OECORE_NATIVE_SYSROOT not set; are you in a Yocto SDK environment?" >&2
fi
# If these are set to a cross-compile path, meson will get confused and try to
# use them as native tools. Unset them to prevent this, as all the cross-compile
# config is already in meson.cross.
unset CC CXX CPP LD AR NM STRIP
exec "$OECORE_NATIVE_SYSROOT/usr/bin/meson.real" \
--cross-file "${OECORE_NATIVE_SYSROOT}/usr/share/meson/${TARGET_PREFIX}meson.cross" \
"$@"

6
meta-gnome/recipes-devtools/meson/meson_%.bbappend
View File

@ -1,6 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/meson:"
#SRC_URI += "\
# file://0001-use-exe-wrapper-for-custom-targets.patch \
#"

4
meta-gnome/recipes-devtools/meson/meson_0.55.1.bb Normal file
View File

@ -0,0 +1,4 @@
include meson.inc
BBCLASSEXTEND = "native"

65
meta-gnome/recipes-devtools/meson/nativesdk-meson_0.55.1.bb Normal file
View File

@ -0,0 +1,65 @@
include meson.inc
inherit nativesdk
inherit siteinfo
SRC_URI += "file://meson-setup.py \
file://meson-wrapper"
def meson_endian(prefix, d):
arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS")
sitedata = siteinfo_data_for_machine(arch, os, d)
if "endian-little" in sitedata:
return "little"
elif "endian-big" in sitedata:
return "big"
else:
bb.fatal("Cannot determine endianism for %s-%s" % (arch, os))
# The cross file logic is similar but not identical to that in meson.bbclass,
# since it's generating for an SDK rather than a cross-compile. Important
# differences are:
# - We can't set vars like CC, CXX, etc. yet because they will be filled in with
# real paths by meson-setup.sh when the SDK is extracted.
# - Some overrides aren't needed, since the SDK injects paths that take care of
# them.
do_install_append() {
install -d ${D}${datadir}/meson
cat >${D}${datadir}/meson/meson.cross.template <<EOF
[binaries]
c = @CC
cpp = @CXX
ar = @AR
nm = @NM
strip = @STRIP
pkgconfig = 'pkg-config'
[properties]
needs_exe_wrapper = true
c_args = @CFLAGS
c_link_args = @LDFLAGS
cpp_args = @CPPFLAGS
cpp_link_args = @LDFLAGS
[host_machine]
system = '${SDK_OS}'
cpu_family = '${SDK_ARCH}'
cpu = '${SDK_ARCH}'
endian = '${@meson_endian("SDK", d)}'
EOF
install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d
install -m 0755 ${WORKDIR}/meson-setup.py ${D}${SDKPATHNATIVE}/post-relocate-setup.d/
# We need to wrap the real meson with a thin env setup wrapper.
mv ${D}${bindir}/meson ${D}${bindir}/meson.real
install -m 0755 ${WORKDIR}/meson-wrapper ${D}${bindir}/meson
}
RDEPENDS_${PN} += "\
nativesdk-ninja \
nativesdk-python3 \
nativesdk-python3-setuptools \
"
FILES_${PN} += "${datadir}/meson ${SDKPATHNATIVE}"

22
meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.54.bb
View File

@ -1,22 +0,0 @@
SUMMARY = "D-Bus service for accessing the list of user accounts and information attached to those accounts."
HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "https://www.freedesktop.org/software/accountsservice/accountsservice-${PV}.tar.xz"
SRC_URI[md5sum] = "6420f2e619ddcf92230d8f10bad049fe"
SRC_URI[sha256sum] = "26e9062c84797e9604182d0efdb2231cb01c98c3c9b0fea601ca79a2802d21ac"
DEPENDS = "glib-2.0 intltool-native polkit systemd glib-2.0-native dbus"
inherit meson pkgconfig gettext gobject-introspection
FILES_${PN} += "\
${datadir}/dbus-1/interfaces/*.xml \
${datadir}/dbus-1/system-services/org.freedesktop.Accounts.service \
${datadir}/polkit-1/actions/org.freedesktop.accounts.policy \
${systemd_system_unitdir} \
"
EXTRA_OECONF = "--enable-admin-group=wheel"

11
meta-gnome/recipes-freedesktop/polkit/polkit_0.116.bb → meta-gnome/recipes-freedesktop/polkit/polkit_0.118.bb
View File

@ -5,7 +5,7 @@ LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \
file://src/polkit/polkit.h;beginline=1;endline=20;md5=0a8630b0133176d0504c87a0ded39db4"
DEPENDS = "expat glib-2.0 intltool-native mozjs"
DEPENDS = "expat glib-2.0 intltool-native mozjs78"
inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection
@ -24,10 +24,10 @@ PACKAGECONFIG[consolekit] = ",,,consolekit"
PAM_SRC_URI = "file://polkit-1_pam.patch"
SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
file://0003-make-netgroup-support-optional.patch \
"
SRC_URI[md5sum] = "4b37258583393e83069a0e2e89c0162a"
SRC_URI[sha256sum] = "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1"
SRC_URI[sha256sum] = "6d54e984e7072339f0d3147179e16e34e5fe0705158f259a765d772dcf78956b"
SRC_URI[md5] = "ae3f2a742740069922589ad20ffd54d2"
EXTRA_OECONF = "--with-os-type=moblin \
--disable-man-pages \
@ -35,6 +35,9 @@ EXTRA_OECONF = "--with-os-type=moblin \
--enable-libsystemd-login \
"
do_configure_prepend() {
export LIBJS_CFLAGS="-include ${STAGING_INCDIR}/mozjs-78/js/RequiredDefines.h -isystem ${STAGING_INCDIR}/mozjs-78"
}
do_compile_prepend () {
export GIR_EXTRA_LIBS_PATH="${B}/src/polkit/.libs"
}

0
meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_12.%.bbappend → meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_13.%.bbappend
View File

21
meta-gnome/recipes-gnome/atk/at-spi2-atk_2.32.0.bb
View File

@ -1,21 +0,0 @@
SUMMARY = "AT-SPI 2 Toolkit Bridge"
HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
SRC_URI[archive.md5sum] = "6a4b27bace3b9352721ed462b95f6291"
SRC_URI[archive.sha256sum] = "0b51e6d339fa2bcca3a3e3159ccea574c67b107f1ac8b00047fa60e34ce7a45c"
DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase distro_features_check upstream-version-is-even
# The at-spi2-core requires x11 in DISTRO_FEATURES
REQUIRED_DISTRO_FEATURES = "x11"
PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"
FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*"
BBCLASSEXTEND = "native"

19
meta-gnome/recipes-gnome/atk/at-spi2-atk_2.34.2.bb
View File

@ -1,19 +0,0 @@
SUMMARY = "AT-SPI 2 Toolkit Bridge"
HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI[archive.md5sum] = "58cd278574e101363b18d9a8b7053d67"
SRC_URI[archive.sha256sum] = "901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0"
DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase upstream-version-is-even
PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"
FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*"
BBCLASSEXTEND = "native nativesdk"

37
meta-gnome/recipes-gnome/atk/at-spi2-core_2.32.0.bb
View File

@ -1,37 +0,0 @@
SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
"
SRC_URI[md5sum] = "57269004541646c4c5cf0bcb7c99bb5b"
SRC_URI[sha256sum] = "43a435d213f8d4b55e8ac83a46ae976948dc511bb4a515b69637cb36cf0e7220"
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
-Ddbus_daemon=${bindir}/dbus-daemon"
GTKDOC_ENABLE_FLAG = "-Ddocs=true"
GTKDOC_DISABLE_FLAG = "-Ddocs=false"
GIR_MESON_ENABLE_FLAG = 'yes'
GIR_MESON_DISABLE_FLAG = 'no'
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
'${GTKDOC_DISABLE_FLAG}', d)} "
FILES_${PN} += "${datadir}/dbus-1/services/*.service \
${datadir}/dbus-1/accessibility-services/*.service \
${datadir}/defaults/at-spi2 \
${systemd_user_unitdir}/at-spi-dbus-bus.service \
"
BBCLASSEXTEND = "native"

36
meta-gnome/recipes-gnome/atk/at-spi2-core_2.36.0.bb
View File

@ -1,36 +0,0 @@
SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
LICENSE = "LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "f101d111b06293d15738afc904c1d931"
SRC_URI[sha256sum] = "88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a"
X11DEPENDS = "virtual/libx11 libxi libxtst"
DEPENDS = "dbus glib-2.0"
DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
inherit meson gtk-doc gettext systemd pkgconfig upstream-version-is-even gobject-introspection
EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
-Ddbus_daemon=${bindir}/dbus-daemon \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-Dx11=yes', '-Dx11=no', d)} \
"
GTKDOC_MESON_OPTION = "docs"
GIR_MESON_OPTION = 'introspection'
GIR_MESON_ENABLE_FLAG = 'yes'
GIR_MESON_DISABLE_FLAG = 'no'
FILES_${PN} += "${datadir}/dbus-1/services/*.service \
${datadir}/dbus-1/accessibility-services/*.service \
${datadir}/defaults/at-spi2 \
${systemd_user_unitdir}/at-spi-dbus-bus.service \
"
BBCLASSEXTEND = "native nativesdk"

38
meta-gnome/recipes-gnome/atk/atk/0001-Switch-from-filename-to-basename.patch
View File

@ -1,38 +0,0 @@
Upstream-Status: Submitted
From 0330251715fee908f2f162565d4fa1df5030d0c0 Mon Sep 17 00:00:00 2001
From: Jeremy Puhlman <jpuhlman@mvista.com>
Date: Thu, 14 Jun 2018 17:21:49 +0000
Subject: [PATCH] Switch from filename to basename
When atk-enum-types.h is installed in to a system, the user likely has
no access to the location where the headers were built, especially if
the software was built in a sysroot environment. If the headers were
built for a mulitlib environment, the build pathing may be different.
Subsequently, if two mulitlib variants of atk are installed together the
headers conflict for no other reason then they were built in two
different locations. Switching from filename to basename, still should
provide sufficient information on the providence of the enums, while not
conflicting for really no good reason.
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
---
atk/atk-enum-types.h.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/atk/atk-enum-types.h.template b/atk/atk-enum-types.h.template
index 7b4cec4..8321c24 100644
--- a/atk/atk-enum-types.h.template
+++ b/atk/atk-enum-types.h.template
@@ -14,7 +14,7 @@ G_BEGIN_DECLS
/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
+/* enumerations from "@basename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
--
2.14.1.459.g238e487

22
meta-gnome/recipes-gnome/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch
View File

@ -1,22 +0,0 @@
From e112815aabac23d9f9c8fa3ff66965a6a823a143 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Sun, 13 Jan 2019 21:04:00 -0500
Subject: [PATCH] sup
---
atk/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/atk/meson.build b/atk/meson.build
index 0ad67e5..1d2a49c 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -137,7 +137,7 @@ libatk_dep = declare_dependency(link_with: libatk,
dependencies: glib_dep,
sources: atk_enum_h)
-if not meson.is_cross_build() and get_option('introspection')
+if get_option('introspection')
gnome.generate_gir(libatk,
sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
namespace: 'Atk',

36
meta-gnome/recipes-gnome/atk/atk_2.32.0.bb
View File

@ -1,36 +0,0 @@
SUMMARY = "Accessibility toolkit for GNOME"
HOMEPAGE = "http://live.gnome.org/GAP/"
BUGTRACKER = "https://bugzilla.gnome.org/"
SECTION = "x11/libs"
LICENSE = "GPLv2+ & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \
file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b"
# Need gettext-native as Meson can't turn off i18n
DEPENDS = "gettext-native glib-2.0"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
GI_ENABLE_FLAG = "-Ddisable_introspection=false"
GI_DISABLE_FLAG = "-Ddisable_introspection=true"
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
'${GI_DISABLE_FLAG}', d)} "
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
'${GTKDOC_DISABLE_FLAG}', d)} "
SRC_URI_append = " \
file://0001-meson.build-enable-introspection-for-cross-compile.patch \
"
SRC_URI[archive.md5sum] = "c10b0b2af3c199e42caa6275b845c49d"
SRC_URI[archive.sha256sum] = "cb41feda7fe4ef0daa024471438ea0219592baf7c291347e5a858bb64e4091cc"
BBCLASSEXTEND = "native"

21
meta-gnome/recipes-gnome/atk/atk_2.36.0.bb
View File

@ -1,21 +0,0 @@
SUMMARY = "Accessibility toolkit for GNOME"
HOMEPAGE = "http://live.gnome.org/GAP/"
BUGTRACKER = "https://bugzilla.gnome.org/"
SECTION = "x11/libs"
LICENSE = "GPLv2+ & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://atk/atkutil.c;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 \
file://atk/atk.h;endline=18;md5=fcd7710187e0eae485e356c30d1b0c3b"
# Need gettext-native as Meson can't turn off i18n
DEPENDS = "gettext-native glib-2.0"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection
SRC_URI[archive.md5sum] = "01aa5ec5138f5f8c9b3a4e3196ed2900"
SRC_URI[archive.sha256sum] = "fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788"
BBCLASSEXTEND = "native nativesdk"

33
meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb
View File

@ -1,33 +0,0 @@
SUMMARY = "Text entry and UI navigation application being developed as an alternative to the GNOME On-Screen Keyboard"
HOMEPAGE = "https://wiki.gnome.org/Projects/Caribou"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=e2aa4f66375a24019b0ff5e99cec40ad"
SRC_URI = "https://download.gnome.org/sources/caribou/0.4/caribou-${PV}.tar.xz"
SRC_URI[md5sum] = "16b76cd7453b99e2871e8d4da88bf976"
SRC_URI[sha256sum] = "9c43d9f4bd30f4fea7f780d4e8b14f7589107c52e9cb6bd202bd0d1c2064de55"
DEPENDS = "gtk+3 python3-pygobject intltool-native glib-2.0 clutter-1.0 libgee libxklavier glib-2.0-native xmlto-native python3-pygobject-native"
WARN_QA_remove = "unknown-configure-option"
PYTHON_CARIBOU = "${libdir}/python3.7/site-packages/caribou"
FILES_${PN} += "\
${datadir}/dbus-1/services \
${datadir}/glib-2.0/schemas \
${datadir}/antler \
${datadir}/vala/vapi \
${libdir}/gtk-3.0/modules/libcaribou-gtk-module.so \
${libdir}/gnome-settings-daemon-3.0/gtk-modules \
${PYTHON_CARIBOU} \
"
FILES_${PN}-staticdev += "${libdir}/gtk-3.0/modules/libcaribou-gtk-module.a"
inherit gettext python3native pkgconfig autotools gobject-introspection
export GI_TYPELIB_PATH = "${STAGING_LIBDIR_NATIVE}/girepository-1.0"
EXTRA_OECONF = "--disable-glibtest --enable-gtk2-module=no"

16
meta-gnome/recipes-gnome/clutter-gtk/clutter-gtk_1.8.4.bb
View File

@ -1,16 +0,0 @@
SUMMARY = "Library for embedding a Clutter canvas (stage) in GTK+"
HOMEPAGE = "https://wiki.gnome.org/Projects/Clutter"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
SRC_URI = "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-${PV}.tar.xz"
SRC_URI[md5sum] = "b363ac9878e2337be887b8ee9e1da00e"
SRC_URI[sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06"
DEPENDS = "gtk+3 clutter-1.0"
inherit gettext pkgconfig autotools gobject-introspection
EXTRA_OECONF = ""

24
meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb
View File

@ -1,24 +0,0 @@
SUMMARY = "configuation database system"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
SECTION = "x11/gnome"
SRC_URI[archive.md5sum] = "1a50c988d9f0206f74a44f7c6d09cead"
SRC_URI[archive.sha256sum] = "9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d"
DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase bash-completion vala
SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch"
FILES_${PN} += " \
${datadir}/dbus-1 \
${libdir}/gio/modules/*.so \
"
EXTRA_OEMESON_append_class-native = "-Dbash_completion=false"
BBCLASSEXTEND= "native"

4
meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb → meta-gnome/recipes-gnome/dconf/dconf_0.38.0.bb
View File

@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
SECTION = "x11/gnome"
SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a"
SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab"
SRC_URI[archive.md5sum] = "716cf730995cf133c2c443556a66a50c"
SRC_URI[archive.sha256sum] = "45f60f41330d27715cce1315af123f94f1c2cdedb68b6bed3b309866eec44f58"
DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native"

32
meta-gnome/recipes-gnome/gcr/gcr/0001-Use-pkgconfig-to-find-libgcrypt.patch
View File

@ -1,32 +0,0 @@
From 6f22047a0c97c06d8d4069a7dbecaa567065a00b Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Wed, 21 Mar 2018 15:19:09 -0400
Subject: [PATCH] Use pkgconfig to find libgcrypt
---
configure.ac | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 06dfc0c..c11526f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,14 +193,7 @@ AC_DEFINE_UNQUOTED([GPG_EXECUTABLE], ["$GNUPG"], [Path to gpg executable.])
#
GCRYPT_LIBVER=1
-
-AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_VERSION,,
- AC_MSG_ERROR([[
-***
-*** libgcrypt was not found. You may want to get it from
-*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/
-***
-]]))
+PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt)
libgcrypt=yes
AC_DEFINE_UNQUOTED(LIBGCRYPT_VERSION, "$GCRYPT_VERSION", [Version of GCRYPT we expect])
--
2.16.2

45
meta-gnome/recipes-gnome/gcr/gcr/0001-meson.build-correctly-set-internal-vapi-dependencies.patch
View File

@ -1,45 +0,0 @@
From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 11 May 2020 22:19:16 +0000
Subject: [PATCH] meson.build: correctly set internal vapi dependencies
If they are set as strings, meson will supply the right
arguments to vapigen, but will not set the ninja dependencies
to ensure they get built first, and so races will occur:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gcr/meson.build | 2 +-
ui/meson.build | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gcr/meson.build b/gcr/meson.build
index 254a933..199452f 100644
--- a/gcr/meson.build
+++ b/gcr/meson.build
@@ -203,7 +203,7 @@ if get_option('introspection')
gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version),
sources: gcr_gir[0],
- packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ],
+ packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ],
metadata_dirs: meson.current_source_dir(),
vapi_dirs: [
build_root / 'gck',
diff --git a/ui/meson.build b/ui/meson.build
index 5ca3753..477412d 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -174,8 +174,8 @@ if get_option('introspection')
packages: [
'glib-2.0',
'gio-2.0',
- 'gck-@0@'.format(gck_major_version),
- 'gcr-@0@'.format(gcr_major_version),
+ gck_vapi,
+ gcr_vapi,
'gtk+-3.0'
],
metadata_dirs: meson.current_source_dir(),

32
meta-gnome/recipes-gnome/gcr/gcr_3.36.0.bb
View File

@ -1,32 +0,0 @@
SUMMARY = "A library for bits of crypto UI and parsing etc"
DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \
accessing key stores. It also provides the viewer for crypto files on the \
GNOME desktop."
HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr"
BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt gnupg-native \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc"
inherit gnomebase gtk-icon-cache gtk-doc distro_features_check upstream-version-is-even vala gobject-introspection gettext mime
# depends on gtk+3, but also x11 through gtk+-x11
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += " file://0001-meson.build-correctly-set-internal-vapi-dependencies.patch"
SRC_URI[archive.md5sum] = "adc65563b6b458507b9a578a8b68fb61"
SRC_URI[archive.sha256sum] = "aaf9bed017a2263c6145c89a1a84178f9f40f238426463e4ae486694ef5f6601"
FILES_${PN} += " \
${datadir}/dbus-1 \
${datadir}/gcr-3 \
"
# http://errors.yoctoproject.org/Errors/Details/20229/
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
ARM_INSTRUCTION_SET_armv6 = "arm"

48
meta-gnome/recipes-gnome/gdm/files/0001-Ensure-pam-file-installation.patch
View File

@ -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

25
meta-gnome/recipes-gnome/gdm/files/0001-replace-absolute-path-with-staging-path.patch
View File

@ -1,25 +0,0 @@
From 5a39825877c98495de2d9ae91544b25053fe5687 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Fri, 2 Feb 2018 19:17:41 -0500
Subject: [PATCH] replace absolute path with staging path
---
data/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index c10c915..3a94592 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -298,7 +298,7 @@ endif
fi
system=`uname`; \
- if test -f /usr/include/security/pam_appl.h; then \
+ if test -f $(STAGING_INCDIR)/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; \
--
2.15.1

74
meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb
View File

@ -1,74 +0,0 @@
SUMMARY = "GNOME Display Manager"
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = " \
dconf-native \
gtk+3 \
glib-2.0 \
accountsservice \
libcanberra \
libxinerama \
libpam \
plymouth \
"
REQUIRED_DISTRO_FEATURES = "x11 systemd pam"
inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even distro_features_check
SRC_URI[archive.md5sum] = "18384eb8345dbee5a8219916debf7e43"
SRC_URI[archive.sha256sum] = "3f561c10ae2e5942b03026f02c0aa7d8712e382708b17a0970874df8175b83a8"
SRC_URI += "\
file://gdm.conf \
file://0001-replace-absolute-path-with-staging-path.patch \
"
# 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} += " \
${libdir}/systemd/system/gdm.service \
${base_libdir}/security/pam_gdm.so \
${datadir}/gnome-session/sessions \
${datadir}/dconf/profile \
/run/gdm/greeter \
"
do_install_append() {
install -d ${D}${sysconfdir}/default/volatiles
echo "d gdm gdm 755 ${localstatedir}/run/gdm/greeter none" > ${D}${sysconfdir}/default/volatiles/99_gdm
rm ${D}${sysconfdir}/gdm/custom.conf
rm -rf ${D}/run/gdm
rm ${D}${libdir}/udev/rules.d/61-gdm.rules
install -m 644 ${WORKDIR}/gdm.conf ${D}${sysconfdir}/gdm/custom.conf
}
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --home /var/lib/gdm -u 21 -s /bin/false --user-group gdm"
SYSTEMD_SERVICE_${PN} = "${BPN}.service"
EXTRA_OECONF = " \
--with-plymouth \
--with-default-pam-config=openembedded \
--with-pam-mod-dir=${base_libdir}/security \
--enable-introspection \
--enable-systemd-journal \
--enable-wayland-support \
--with-xdmcp=no \
--disable-static \
--enable-gdm-xsession \
"

61
meta-gnome/recipes-gnome/gdm/gdm_3.38.0.bb Normal file
View File

@ -0,0 +1,61 @@
SUMMARY = "GNOME Display Manager"
LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = " \
dconf-native \
itstool-native \
gtk+3 \
glib-2.0 \
accountsservice \
libcanberra \
libxinerama \
libpam \
plymouth \
"
REQUIRED_DISTRO_FEATURES = "x11 systemd pam"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check
SRC_URI[archive.md5sum] = "948dec80099d9d3a2adacc5788964043"
SRC_URI[archive.sha256sum] = "46d4415c39c94ccee81fbac21102e2ebcd284d39858c893e759900b1e88435ba"
SRC_URI += "file://gdm.conf"
WARN_QA_remove = "unknown-configure-option"
FILES_${PN} += " \
${libdir}/systemd/system/gdm.service \
${libdir}/systemd/user \
${base_libdir}/security/pam_gdm.so \
${datadir}/gnome-session/sessions \
${datadir}/dconf/profile \
/run/gdm/greeter \
"
do_install_append() {
install -d ${D}${sysconfdir}/default/volatiles
echo "d gdm gdm 755 ${localstatedir}/run/gdm/greeter none" > ${D}${sysconfdir}/default/volatiles/99_gdm
rm ${D}${sysconfdir}/gdm/custom.conf
rm -rf ${D}/run/gdm
rm ${D}${libdir}/udev/rules.d/61-gdm.rules
install -m 644 ${WORKDIR}/gdm.conf ${D}${sysconfdir}/gdm/custom.conf
}
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = "--system --home /var/lib/gdm -u 21 -s /bin/false --user-group gdm"
SYSTEMD_SERVICE_${PN} = "${BPN}.service"
EXTRA_OEMESON = "\
-Dplymouth=enabled \
-Dxdmcp=disabled \
-Ddefault-pam-config=openembedded \
-Dpam-mod-dir=${base_libdir}/security \
-Dgdm-xsession=true\
"
PACKAGES += "${PN}-help"
FILES_${PN}-help = "${datadir}/help"

43
meta-gnome/recipes-gnome/gjs/gjs/0001-Fix-tests-that-cannot-run.patch
View File

@ -8,13 +8,16 @@ Subject: [PATCH] Fix tests that cannot run
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/meson.build b/meson.build
index 2ffbf28..6679e45 100644
index 9ab29475..3dbadcf1 100644
--- a/meson.build
+++ b/meson.build
@@ -221,23 +221,23 @@ endif
# 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.
@@ -233,27 +233,6 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with
--disable-debug.''')
endif
-# 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.
-minimal_program = cxx.run('''
-#include <js/Initialization.h>
-int main(void) {
@ -30,34 +33,20 @@ index 2ffbf28..6679e45 100644
- error('''A minimal SpiderMonkey program
-could not be compiled, linked, or run. Most likely you should build it with a
-different configuration. Check the recommended configuration:
-https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr60/docs/Building%20SpiderMonkey.md''')
-https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr78/docs/Building%20SpiderMonkey.md''')
-endif
+#minimal_program = cxx.run('''
+##include <js/Initialization.h>
+#int main(void) {
+# if (!JS_Init()) return 1;
+# JS_ShutDown();
+# return 0;
+#}
+#''',
+# args: debug_arg, dependencies: spidermonkey,
+# name: 'SpiderMonkey sanity check')
+
+#if not minimal_program.compiled() or minimal_program.returncode() != 0
+# error('''A minimal SpiderMonkey program
+#could not be compiled, linked, or run. Most likely you should build it with a
+#different configuration. Check the recommended configuration:
+#https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr60/docs/Building%20SpiderMonkey.md''')
+#endif
-
have_printf_alternative_int = cc.compiles('''
#include <stdio.h>
@@ -610,7 +610,7 @@ if not get_option('skip_gtk_tests')
int main(void) {
@@ -628,8 +607,6 @@ if not get_option('skip_gtk_tests')
have_gtk4 = dependency('gtk4', required: false).found()
endif
-subdir('installed-tests')
+#subdir('installed-tests')
-
valgrind_environment = environment()
valgrind_environment.set('G_SLICE', 'always-malloc,debug-blocks')
valgrind_environment.set('G_DEBUG',

57
meta-gnome/recipes-gnome/gjs/gjs/overriding_introspected_gobject_interface_properties.patch
View File

@ -1,57 +0,0 @@
diff --git a/gi/object.cpp b/gi/object.cpp
index 2b2265da0cc74c2a1b5b027c2566c5f0e334e278..7003273630efcd6a09c302476e95544ad287c853 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -717,7 +717,11 @@ bool ObjectPrototype::lazy_define_gobject_property(JSContext* cx,
JS::RootedValue private_id(cx, JS::StringValue(JSID_TO_STRING(id)));
if (!gjs_define_property_dynamic(
cx, obj, name, "gobject_prop", &ObjectBase::prop_getter,
- &ObjectBase::prop_setter, private_id, GJS_MODULE_PROP_FLAGS))
+ &ObjectBase::prop_setter, private_id,
+ // Make property configurable so that interface properties can be
+ // overridden by GObject.ParamSpec.override in the class that
+ // implements them
+ GJS_MODULE_PROP_FLAGS & ~JSPROP_PERMANENT))
return false;
*resolved = true;
diff --git a/installed-tests/js/testGObjectInterface.js b/installed-tests/js/testGObjectInterface.js
index 9eab97461cca93817ac747060134306ba235a9b1..daefb6831e38725db5c86398569040af942cd714 100644
--- a/installed-tests/js/testGObjectInterface.js
+++ b/installed-tests/js/testGObjectInterface.js
@@ -84,6 +84,22 @@ const ImplementationOfTwoInterfaces = GObject.registerClass({
}
});
+const ImplementationOfIntrospectedInterface = GObject.registerClass({
+ Implements: [Gio.Action],
+ Properties: {
+ 'enabled': GObject.ParamSpec.override('enabled', Gio.Action),
+ 'name': GObject.ParamSpec.override('name', Gio.Action),
+ 'state': GObject.ParamSpec.override('state', Gio.Action),
+ 'state-type': GObject.ParamSpec.override('state-type', Gio.Action),
+ 'parameter-type': GObject.ParamSpec.override('parameter-type',
+ Gio.Action)
+ }
+}, class ImplementationOfIntrospectedInterface extends GObject.Object {
+ get name() {
+ return 'inaction';
+ }
+});
+
describe('GObject interface', function () {
it('cannot be instantiated', function () {
expect(() => new AGObjectInterface()).toThrow();
@@ -247,6 +263,11 @@ describe('GObject interface', function () {
253, 'testGObjectMustOverrideInterfaceProperties');
});
+ it('can have introspected properties overriden', function() {
+ let obj = new ImplementationOfIntrospectedInterface();
+ expect(obj.name).toEqual('inaction');
+ });
+
it('can be implemented by a class as well as its parent class', function () {
const SubObject = GObject.registerClass(
class SubObject extends GObjectImplementingGObjectInterface {});

22
meta-gnome/recipes-gnome/gjs/gjs_1.56.0.bb
View File

@ -1,22 +0,0 @@
SUMMARY = "GNOME javascript bindings based on the Spidermonkey javascript engine"
HOMEPAGE = "https://wiki.gnome.org/Projects/Gjs"
LICENSE = "MIT & LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=beb29cf17fabe736f0639b09ee6e76fa \
file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
inherit gnomebase gettext gobject-introspection
WARN_QA_remove = "unknown-configure-option"
export GI_DATADIR="${STAGING_DATADIR}/gobject-introspection-1.0"
DEPENDS = "glib-2.0 gobject-introspection cairo gtk+3 mozjs glib-2.0-native"
EXTRA_OECONF = "--without-dbus-tests"
SRC_URI[archive.md5sum] = "aa47ee8bdcb7c36e9eafd4c7796fbb96"
SRC_URI[archive.sha256sum] = "64a7ad5554adb0105fabb432abcfa690033c177d8e650872b469b7cbf475ec1a"
RDEPENDS_${PN} += "libmozjs"
FILES_${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind"

9
meta-gnome/recipes-gnome/gjs/gjs_1.64.2.bb → meta-gnome/recipes-gnome/gjs/gjs_1.66.0.bb
View File

@ -11,14 +11,15 @@ WARN_QA_remove = "unknown-configure-option"
export GIDATADIR="${STAGING_DATADIR_NATIVE}/gobject-introspection-1.0"
DEPENDS = "glib-2.0 gobject-introspection gobject-introspection-native cairo gtk+3 mozjs68 glib-2.0-native"
DEPENDS = "glib-2.0 gobject-introspection gobject-introspection-native cairo gtk+3 mozjs78 glib-2.0-native"
EXTRA_OEMESON = " -Dskip_dbus_tests=true -Dskip_gtk_tests=true -Dinstalled_tests=false -Dpkgconfig-sysroot-path=${GIDATADIR}"
CFLAGS_append = " -include ${STAGING_INCDIR}/mozjs-78/js/RequiredDefines.h"
SRC_URI += " file://0001-Fix-tests-that-cannot-run.patch"
SRC_URI[archive.md5sum] = "bd2f7f411b46016e8ee2d2c8d3c140d9"
SRC_URI[archive.sha256sum] = "15ff834d374df19595d955f03e6b60631a3bb14fabda36d00f81ab3eabd3997b"
SRC_URI[archive.md5sum] = "d43a936f5edd8ff36ecc54684b26d82a"
SRC_URI[archive.sha256sum] = "f30cf90e016db6c8fdd0059749559611760f0721f375b2b61e0b7239b43ab5f8"
RDEPENDS_${PN} += "libmozjs-68"
RDEPENDS_${PN} += "libmozjs-78"
FILES_${PN}-dbg += "${datadir}/gjs-1.0/lsan ${datadir}/gjs-1.0/valgrind"

6
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch
View File

@ -1,4 +1,4 @@
From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001
From 658c034d92027dc8af5f784cae852123fac79b19 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 16 Apr 2016 13:28:59 -0700
Subject: [PATCH] Do not ignore return value of write()
@ -16,10 +16,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/glib/tests/unix.c b/glib/tests/unix.c
index 9d55a6c..a07f945 100644
index 7639d06..f941141 100644
--- a/glib/tests/unix.c
+++ b/glib/tests/unix.c
@@ -32,14 +32,15 @@ test_pipe (void)
@@ -33,14 +33,15 @@ test_pipe (void)
GError *error = NULL;
int pipefd[2];
char buf[1024];

12
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Do-not-write-bindir-into-pkg-config-files.patch
View File

@ -1,4 +1,4 @@
From 60b36289ac314ad972cf81c1acd19f6f2e58ff25 Mon Sep 17 00:00:00 2001
From 0797a40627a4cb5439a24b872edc65356dceaaf0 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 15 Feb 2019 11:17:27 +0100
Subject: [PATCH] Do not write $bindir into pkg-config files
@ -16,13 +16,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gio/meson.build b/gio/meson.build
index 71e88c4..8ce3987 100644
index 532b086..98468a3 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -831,14 +831,14 @@ pkg.generate(libgio,
@@ -817,14 +817,14 @@ pkg.generate(libgio,
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'giomoduledir=' + giomodulesdir,
'giomoduledir=' + pkgconfig_giomodulesdir,
- 'gio=' + join_paths('${bindir}', 'gio'),
- 'gio_querymodules=' + join_paths('${bindir}', 'gio-querymodules'),
- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
@ -43,10 +43,10 @@ index 71e88c4..8ce3987 100644
install_dir : glib_pkgconfigreldir,
filebase : 'gio-2.0',
diff --git a/glib/meson.build b/glib/meson.build
index 91a48f1..978fb73 100644
index aaf5f00..1e0992b 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -375,9 +375,9 @@ pkg.generate(libglib,
@@ -392,9 +392,9 @@ pkg.generate(libglib,
subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')),

7
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch
View File

@ -1,4 +1,4 @@
From 15f807481de53942525b48952c5b6bbb9fb66542 Mon Sep 17 00:00:00 2001
From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 15 Mar 2014 22:42:29 -0700
Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux
@ -9,7 +9,7 @@ based systems therefore lets set DATADIRNAME to "share".
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
%% original patch: uclibc_musl_translation.patch
---
m4macros/glib-gettext.m4 | 4 ++++
1 file changed, 4 insertions(+)
@ -29,6 +29,3 @@ index df6fbf0..47db864 100644
*)
CATOBJEXT=.mo
DATADIRNAME=lib
--
2.17.1

4
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch
View File

@ -1,4 +1,4 @@
From d29dfba67b1808eea6d428085f95b6e42cf2d1e4 Mon Sep 17 00:00:00 2001
From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 22 Mar 2016 15:14:58 +0200
Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM
@ -14,7 +14,7 @@ Upstream-Status: Inappropriate [OE specific]
1 file changed, 1 insertion(+)
diff --git a/gio/meson.build b/gio/meson.build
index 4e5e021..90a741a 100644
index 2ef60ed..532b086 100644
--- a/gio/meson.build
+++ b/gio/meson.build
@@ -940,6 +940,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu

11
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch
View File

@ -1,7 +1,7 @@
From 2acf40361eecd17c6981743dabd06e25a9934258 Mon Sep 17 00:00:00 2001
From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 12 Jun 2015 17:08:46 +0300
Subject: [PATCH 05/10] Remove the warning about deprecated paths in schemas
Subject: [PATCH] Remove the warning about deprecated paths in schemas
Some schemas in gsettings-desktop-schemas (such as proxy and locale)
are still using deprecated paths, as of 3.16.1. This causes warning
@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 13 deletions(-)
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index b8de090..130f89b 100644
index 7888120..7acbd5b 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state,
@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state,
return;
}
@ -38,6 +38,3 @@ index b8de090..130f89b 100644
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
--
2.14.1

26
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch
View File

@ -1,4 +1,4 @@
From cfff734af6bff6a30a649f784ecf698658c01884 Mon Sep 17 00:00:00 2001
From d3334e83ae0da9ca184eb9c8daf0854544ece023 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 13 Feb 2019 15:32:05 +0100
Subject: [PATCH] Set host_machine correctly when building with mingw32
@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 95aafc1..9025eb2 100644
index dab65d2..e8bb2ee 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -13,7 +13,7 @@ test_c_args = [
@@ -12,7 +12,7 @@ test_c_args = [
'-UG_DISABLE_ASSERT',
]
@ -26,7 +26,7 @@ index 95aafc1..9025eb2 100644
common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')]
endif
@@ -120,7 +120,7 @@ if dbus1_dep.found()
@@ -133,7 +133,7 @@ else
endif
# Test programs buildable on UNIX only
@ -35,7 +35,7 @@ index 95aafc1..9025eb2 100644
gio_tests += {
'file' : {},
'gdbus-peer' : {
@@ -332,7 +332,7 @@ if host_machine.system() != 'windows'
@@ -385,7 +385,7 @@ if host_machine.system() != 'windows'
endif # unix
# Test programs buildable on Windows only
@ -44,7 +44,7 @@ index 95aafc1..9025eb2 100644
gio_tests += {'win32-streams' : {}}
endif
@@ -397,7 +397,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
@@ -455,7 +455,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl'
}
endif
@ -54,10 +54,10 @@ index 95aafc1..9025eb2 100644
'gdbus-example-unix-fd-client' : {
'install' : false,
diff --git a/glib/tests/meson.build b/glib/tests/meson.build
index c47133f..cad975f 100644
index 3dedafc..94605e6 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -132,7 +132,7 @@ if glib_conf.has('HAVE_EVENTFD')
@@ -137,7 +137,7 @@ if glib_conf.has('HAVE_EVENTFD')
}
endif
@ -67,7 +67,7 @@ index c47133f..cad975f 100644
glib_tests += {
'gpoll' : {
diff --git a/meson.build b/meson.build
index 717d1bc..2a3beb8 100644
index e1b4b79..afb6eaa 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,9 @@ else
@ -78,13 +78,13 @@ index 717d1bc..2a3beb8 100644
+ host_system = 'windows'
+endif
glib_version = meson.project_version()
glib_api_version = '2.0'
if host_system == 'darwin'
ios_test_code = '''#include <TargetConditionals.h>
diff --git a/tests/meson.build b/tests/meson.build
index ce30442..5710f2c 100644
index 6741f8f..12fdc90 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -66,7 +66,7 @@ test_extra_programs = {
@@ -73,7 +73,7 @@ test_extra_programs = {
'unicode-collate' : {},
}

3
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch
View File

@ -1,4 +1,4 @@
From 730803f2bc3f2f1a74f4db809a224066e7eae114 Mon Sep 17 00:00:00 2001
From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 8 Jan 2020 18:22:46 +0100
Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test
@ -8,6 +8,7 @@ not cross-compatible (hardcodes ld and objcopy).
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
gio/tests/resources.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

10
meta-gnome/recipes-gnome/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch
View File

@ -1,4 +1,4 @@
From cce617bec254e327ed7bcad60f58208024c6dc42 Mon Sep 17 00:00:00 2001
From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 12 Oct 2019 17:46:26 -0700
Subject: [PATCH] meson: Run atomics test on clang as well
@ -9,15 +9,16 @@ Fixes
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 9731de4..c678931 100644
index afb6eaa..6aa70f5 100644
--- a/meson.build
+++ b/meson.build
@@ -1634,7 +1634,7 @@ atomicdefine = '''
@@ -1790,7 +1790,7 @@ atomicdefine = '''
# We know that we can always use real ("lock free") atomic operations with MSVC
if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops')
have_atomic_lock_free = true
@ -26,6 +27,3 @@ index 9731de4..c678931 100644
# Old gcc release may provide
# __sync_bool_compare_and_swap but doesn't define
# __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4
--
2.23.0

Some files were not shown because too many files have changed in this diff Show More