diff --git a/meta-citadel/conf/layer.conf b/meta-citadel/conf/layer.conf index df8e02c..0bb6baf 100644 --- a/meta-citadel/conf/layer.conf +++ b/meta-citadel/conf/layer.conf @@ -14,7 +14,7 @@ BBFILE_COLLECTIONS += "citadel" BBFILE_PATTERN_citadel = "^${LAYERDIR}/" BBFILE_PRIORITY_citadel = "5" -LAYERSERIES_COMPAT_citadel = "kirkstone" +LAYERSERIES_COMPAT_citadel = "langdale" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-citadel/conf/bblayers.conf.sample b/meta-citadel/conf/templates/default/bblayers.conf.sample similarity index 100% rename from meta-citadel/conf/bblayers.conf.sample rename to meta-citadel/conf/templates/default/bblayers.conf.sample diff --git a/meta-citadel/conf/local.conf.sample b/meta-citadel/conf/templates/default/local.conf.sample similarity index 100% rename from meta-citadel/conf/local.conf.sample rename to meta-citadel/conf/templates/default/local.conf.sample diff --git a/meta-citadel/recipes-citadel/bbappends/bluez5_%.bbappend b/meta-citadel/recipes-citadel/bbappends/bluez5_%.bbappend new file mode 100644 index 0000000..725681a --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/bluez5_%.bbappend @@ -0,0 +1,11 @@ +PACKAGECONFIG = "\ + readline \ + systemd \ + a2dp-profiles \ + avrcp-profiles \ + hid-profiles \ + hog-profiles \ + tools \ + deprecated \ + udev \ +" diff --git a/meta-citadel/recipes-citadel/bbappends/gdm_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gdm_%.bbappend index c8b7f72..cbc21c2 100644 --- a/meta-citadel/recipes-citadel/bbappends/gdm_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/gdm_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/gdm:" +INSANE_SKIP:${PN}-src = "buildpaths" + SRC_URI += "file://gdm.conf" DEPENDS += "plymouth" diff --git a/meta-citadel/recipes-citadel/bbappends/gnome-control-center_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gnome-control-center_%.bbappend new file mode 100644 index 0000000..6b5165c --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/gnome-control-center_%.bbappend @@ -0,0 +1 @@ +INSANE_SKIP:${PN}-src = "buildpaths" diff --git a/meta-citadel/recipes-citadel/bbappends/gnome-disk-utility_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gnome-disk-utility_%.bbappend new file mode 100644 index 0000000..6b5165c --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/gnome-disk-utility_%.bbappend @@ -0,0 +1 @@ +INSANE_SKIP:${PN}-src = "buildpaths" diff --git a/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend b/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend index 9a34598..f7e7424 100644 --- a/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/gnome-terminal_%.bbappend @@ -1,5 +1,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/gnome-terminal:" +INSANE_SKIP:${PN}-src = "buildpaths" + SRC_URI += "\ file://gnome-terminal-citadel.service \ file://org.gnome.TerminalCitadel.desktop \ diff --git a/meta-citadel/recipes-citadel/bbappends/libxcb_1.14.bbappend b/meta-citadel/recipes-citadel/bbappends/libxcb_1.15.bbappend similarity index 100% rename from meta-citadel/recipes-citadel/bbappends/libxcb_1.14.bbappend rename to meta-citadel/recipes-citadel/bbappends/libxcb_1.15.bbappend diff --git a/meta-citadel/recipes-citadel/bbappends/modemmanager_%.bbappend b/meta-citadel/recipes-citadel/bbappends/modemmanager_%.bbappend index 583d032..af0844f 100644 --- a/meta-citadel/recipes-citadel/bbappends/modemmanager_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/modemmanager_%.bbappend @@ -1,2 +1,4 @@ PACKAGECONFIG = "polkit systemd" +INSANE_SKIP:${PN}-src = "buildpaths" +INSANE_SKIP:${PN}-dev = "buildpaths" diff --git a/meta-citadel/recipes-citadel/bbappends/mozjs-102_%.bbappend b/meta-citadel/recipes-citadel/bbappends/mozjs-102_%.bbappend new file mode 100644 index 0000000..6b5165c --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/mozjs-102_%.bbappend @@ -0,0 +1 @@ +INSANE_SKIP:${PN}-src = "buildpaths" diff --git a/meta-citadel/recipes-citadel/bbappends/mutter_%.bbappend b/meta-citadel/recipes-citadel/bbappends/mutter_%.bbappend new file mode 100644 index 0000000..6b5165c --- /dev/null +++ b/meta-citadel/recipes-citadel/bbappends/mutter_%.bbappend @@ -0,0 +1 @@ +INSANE_SKIP:${PN}-src = "buildpaths" diff --git a/meta-citadel/recipes-citadel/bbappends/pulseaudio_15.%.bbappend b/meta-citadel/recipes-citadel/bbappends/pulseaudio_16.%.bbappend similarity index 100% rename from meta-citadel/recipes-citadel/bbappends/pulseaudio_15.%.bbappend rename to meta-citadel/recipes-citadel/bbappends/pulseaudio_16.%.bbappend diff --git a/meta-citadel/recipes-citadel/images/citadel-image.inc b/meta-citadel/recipes-citadel/images/citadel-image.inc index 53521f4..cf8a7be 100644 --- a/meta-citadel/recipes-citadel/images/citadel-image.inc +++ b/meta-citadel/recipes-citadel/images/citadel-image.inc @@ -5,7 +5,7 @@ CITADEL_IMAGE_VERSION_rootfs = "1" CITADEL_IMAGE_VERSION_extra = "1" CITADEL_IMAGE_VERSION_kernel = "1" -CITADEL_KERNEL_VERSION = "5.19.9" +CITADEL_KERNEL_VERSION = "6.0.8" CITADEL_KERNEL_CONFIG = "${COREBASE}/../meta-citadel/recipes-kernel/citadel-kernel/files/defconfig" diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb index 1868d1d..59d1ead 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb @@ -28,5 +28,6 @@ RDEPENDS:${PN} = "\ libdrm-amdgpu \ dash-to-panel \ citadel-config-gnome \ + power-profiles-daemon \ " diff --git a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.19.9.bb b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_6.0.8.bb similarity index 88% rename from meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.19.9.bb rename to meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_6.0.8.bb index edaa281..e46433b 100644 --- a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.19.9.bb +++ b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_6.0.8.bb @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -SRC_URI = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz\ +SRC_URI = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${PV}.tar.xz\ file://defconfig \ " -SRC_URI[sha256sum] = "0ad5b5986693adc1962be807bc3a64423a24b6a9da9df39b259d7e3bfd927f37" +SRC_URI[sha256sum] = "0de4f83996951c6faf9b2225db4f645882c47b1a09198190f97bd46e5f5fa257" LINUX_VERSION ?= "${PV}" S = "${WORKDIR}/linux-${LINUX_VERSION}" diff --git a/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig index cad03f6..c83411f 100644 --- a/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig +++ b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig @@ -1,19 +1,18 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.9 Kernel Configuration +# Linux/x86 6.0.8 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-2) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-9) 12.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=120200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23890 +CONFIG_AS_VERSION=23900 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23890 +CONFIG_LD_VERSION=23900 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y -CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y @@ -88,6 +87,8 @@ CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y +CONFIG_CONTEXT_TRACKING=y +CONFIG_CONTEXT_TRACKING_IDLE=y # # Timers subsystem @@ -97,8 +98,8 @@ CONFIG_NO_HZ_COMMON=y # CONFIG_HZ_PERIODIC is not set # CONFIG_NO_HZ_IDLE is not set CONFIG_NO_HZ_FULL=y -CONFIG_CONTEXT_TRACKING=y -# CONFIG_CONTEXT_TRACKING_FORCE is not set +CONFIG_CONTEXT_TRACKING_USER=y +# CONFIG_CONTEXT_TRACKING_USER_FORCE is not set CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100 @@ -157,6 +158,7 @@ CONFIG_TASKS_RCU_GENERIC=y # CONFIG_FORCE_TASKS_RCU is not set CONFIG_TASKS_RCU=y # CONFIG_FORCE_TASKS_RUDE_RCU is not set +CONFIG_TASKS_RUDE_RCU=y # CONFIG_FORCE_TASKS_TRACE_RCU is not set CONFIG_TASKS_TRACE_RCU=y CONFIG_RCU_STALL_COMMON=y @@ -165,6 +167,7 @@ CONFIG_RCU_FANOUT=32 CONFIG_RCU_FANOUT_LEAF=16 # CONFIG_RCU_BOOST is not set CONFIG_RCU_NOCB_CPU=y +# CONFIG_RCU_NOCB_CPU_DEFAULT_ALL is not set # CONFIG_TASKS_TRACE_RCU_READ_MB is not set # end of RCU Subsystem @@ -193,6 +196,7 @@ CONFIG_ARCH_SUPPORTS_INT128=y # CONFIG_NUMA_BALANCING is not set CONFIG_CGROUPS=y CONFIG_PAGE_COUNTER=y +# CONFIG_CGROUP_FAVOR_DYNMODS is not set CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_KMEM=y @@ -436,7 +440,6 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=0 CONFIG_X86_PAT=y CONFIG_ARCH_USES_PG_UNCACHED=y -CONFIG_ARCH_RANDOM=y CONFIG_X86_UMIP=y CONFIG_CC_HAS_IBT=y CONFIG_X86_KERNEL_IBT=y @@ -474,6 +477,7 @@ CONFIG_LEGACY_VSYSCALL_NONE=y # CONFIG_MODIFY_LDT_SYSCALL is not set # CONFIG_STRICT_SIGALTSTACK_SIZE is not set CONFIG_HAVE_LIVEPATCH=y +# CONFIG_LIVEPATCH is not set # end of Processor type and features CONFIG_CC_HAS_SLS=y @@ -499,6 +503,7 @@ CONFIG_SUSPEND_FREEZER=y CONFIG_PM_SLEEP=y CONFIG_PM_SLEEP_SMP=y # CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_USERSPACE_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set CONFIG_PM=y CONFIG_PM_DEBUG=y @@ -567,8 +572,8 @@ CONFIG_ACPI_APEI_EINJ=m # CONFIG_ACPI_PFRUT is not set CONFIG_ACPI_PCC=y # CONFIG_PMIC_OPREGION is not set -CONFIG_X86_PM_TIMER=y CONFIG_ACPI_PRMT=y +CONFIG_X86_PM_TIMER=y # # CPU Frequency scaling @@ -677,6 +682,7 @@ CONFIG_JUMP_LABEL=y # CONFIG_STATIC_KEYS_SELFTEST is not set # CONFIG_STATIC_CALL_SELFTEST is not set CONFIG_OPTPROBES=y +CONFIG_KPROBES_ON_FTRACE=y CONFIG_UPROBES=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y @@ -735,8 +741,8 @@ CONFIG_ARCH_SUPPORTS_LTO_CLANG=y CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y CONFIG_LTO_NONE=y CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y +CONFIG_HAVE_CONTEXT_TRACKING_USER=y +CONFIG_HAVE_CONTEXT_TRACKING_USER_OFFSTACK=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_MOVE_PUD=y @@ -751,6 +757,7 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y +CONFIG_SOFTIRQ_ON_OWN_STACK=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y @@ -966,7 +973,6 @@ CONFIG_MIGRATION=y CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y CONFIG_ARCH_ENABLE_THP_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_VIRT_TO_BUS=y CONFIG_MMU_NOTIFIER=y CONFIG_KSM=y CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 @@ -990,7 +996,6 @@ CONFIG_GENERIC_EARLY_IOREMAP=y # CONFIG_IDLE_PAGE_TRACKING is not set CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y -CONFIG_ARCH_HAS_VM_GET_PAGE_PROT=y CONFIG_ARCH_HAS_PTE_DEVMAP=y CONFIG_ARCH_HAS_ZONE_DMA_SET=y CONFIG_ZONE_DMA=y @@ -1327,11 +1332,14 @@ CONFIG_BPFILTER_UMH=m # CONFIG_L2TP is not set CONFIG_STP=y CONFIG_BRIDGE=y -# CONFIG_BRIDGE_IGMP_SNOOPING is not set +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y # CONFIG_BRIDGE_MRP is not set # CONFIG_BRIDGE_CFM is not set # CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set # CONFIG_DECNET is not set CONFIG_LLC=y # CONFIG_LLC2 is not set @@ -1385,12 +1393,14 @@ CONFIG_BT=m CONFIG_BT_BREDR=y CONFIG_BT_RFCOMM=m # CONFIG_BT_RFCOMM_TTY is not set -# CONFIG_BT_BNEP is not set +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y CONFIG_BT_HIDP=m CONFIG_BT_HS=y CONFIG_BT_LE=y # CONFIG_BT_LEDS is not set -# CONFIG_BT_MSFTEXT is not set +CONFIG_BT_MSFTEXT=y # CONFIG_BT_AOSPEXT is not set CONFIG_BT_DEBUGFS=y # CONFIG_BT_SELFTEST is not set @@ -1404,18 +1414,24 @@ CONFIG_BT_BCM=m CONFIG_BT_RTL=m CONFIG_BT_MTK=m CONFIG_BT_HCIBTUSB=m -# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set +CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y CONFIG_BT_HCIBTUSB_BCM=y -# CONFIG_BT_HCIBTUSB_MTK is not set +CONFIG_BT_HCIBTUSB_MTK=y CONFIG_BT_HCIBTUSB_RTL=y -# CONFIG_BT_HCIBTSDIO is not set -# CONFIG_BT_HCIUART is not set -# CONFIG_BT_HCIBCM203X is not set -# CONFIG_BT_HCIBPA10X is not set +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_INTEL=y +CONFIG_BT_HCIUART_AG6XX=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m # CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIVHCI is not set -# CONFIG_BT_MRVL is not set -# CONFIG_BT_ATH3K is not set +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m CONFIG_BT_MTKSDIO=m # CONFIG_BT_VIRTIO is not set # end of Bluetooth device drivers @@ -1642,7 +1658,6 @@ CONFIG_SYSFB_SIMPLEFB=y # # EFI (Extensible Firmware Interface) Support # -CONFIG_EFI_VARS=y CONFIG_EFI_ESRT=y CONFIG_EFI_VARS_PSTORE=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set @@ -1702,12 +1717,12 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=4 # CONFIG_BLK_DEV_DRBD is not set CONFIG_BLK_DEV_NBD=y -# CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_RAM is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set CONFIG_VIRTIO_BLK=y # CONFIG_BLK_DEV_RBD is not set +# CONFIG_BLK_DEV_UBLK is not set # # NVME Support @@ -1719,11 +1734,13 @@ CONFIG_NVME_MULTIPATH=y CONFIG_NVME_HWMON=y # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set +# CONFIG_NVME_AUTH is not set CONFIG_NVME_TARGET=m CONFIG_NVME_TARGET_PASSTHRU=y # CONFIG_NVME_TARGET_LOOP is not set # CONFIG_NVME_TARGET_FC is not set # CONFIG_NVME_TARGET_TCP is not set +# CONFIG_NVME_TARGET_AUTH is not set # end of NVME Support # @@ -1850,7 +1867,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_AIC94XX is not set # CONFIG_SCSI_MVSAS is not set # CONFIG_SCSI_MVUMI is not set -# CONFIG_SCSI_DPT_I2O is not set # CONFIG_SCSI_ADVANSYS is not set # CONFIG_SCSI_ARCMSR is not set # CONFIG_SCSI_ESAS2R is not set @@ -2145,6 +2161,7 @@ CONFIG_I40EVF=m # CONFIG_ICE is not set CONFIG_FM10K=m # CONFIG_IGC is not set +# CONFIG_NET_VENDOR_WANGXUN is not set # CONFIG_JME is not set # CONFIG_NET_VENDOR_LITEX is not set CONFIG_NET_VENDOR_MARVELL=y @@ -2155,6 +2172,7 @@ CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set # CONFIG_OCTEON_EP is not set +# CONFIG_PRESTERA is not set CONFIG_NET_VENDOR_MELLANOX=y CONFIG_MLX4_EN=m CONFIG_MLX4_CORE=m @@ -2184,7 +2202,6 @@ CONFIG_NET_VENDOR_NI=y # CONFIG_NET_VENDOR_NATSEMI is not set CONFIG_NET_VENDOR_NETERION=y # CONFIG_S2IO is not set -# CONFIG_VXGE is not set # CONFIG_NET_VENDOR_NETRONOME is not set # CONFIG_NET_VENDOR_NVIDIA is not set # CONFIG_NET_VENDOR_OKI is not set @@ -2305,7 +2322,6 @@ CONFIG_MDIO_BCM_UNIMAC=m # # PCS device drivers # -# CONFIG_PCS_XPCS is not set # end of PCS device drivers # CONFIG_PPP is not set @@ -2453,7 +2469,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y CONFIG_IWLWIFI_DEVICE_TRACING=y # end of Debugging Options -# CONFIG_IWLMEI is not set # CONFIG_WLAN_VENDOR_INTERSIL is not set # CONFIG_WLAN_VENDOR_MARVELL is not set # CONFIG_WLAN_VENDOR_MEDIATEK is not set @@ -2825,6 +2840,7 @@ CONFIG_TCG_TIS_CORE=m CONFIG_TCG_TIS=m CONFIG_TCG_TIS_SPI=m CONFIG_TCG_TIS_SPI_CR50=y +CONFIG_TCG_TIS_I2C=m # CONFIG_TCG_TIS_I2C_CR50 is not set # CONFIG_TCG_TIS_I2C_ATMEL is not set # CONFIG_TCG_TIS_I2C_INFINEON is not set @@ -2962,6 +2978,7 @@ CONFIG_SPI_DW_PCI=m CONFIG_SPI_DW_MMIO=m # CONFIG_SPI_NXP_FLEXSPI is not set # CONFIG_SPI_GPIO is not set +# CONFIG_SPI_MICROCHIP_CORE is not set # CONFIG_SPI_LANTIQ_SSC is not set # CONFIG_SPI_OC_TINY is not set CONFIG_SPI_PXA2XX=m @@ -3047,6 +3064,7 @@ CONFIG_PINCTRL_BROXTON=m # CONFIG_PINCTRL_JASPERLAKE is not set # CONFIG_PINCTRL_LAKEFIELD is not set # CONFIG_PINCTRL_LEWISBURG is not set +# CONFIG_PINCTRL_METEORLAKE is not set CONFIG_PINCTRL_SUNRISEPOINT=m CONFIG_PINCTRL_TIGERLAKE=m # end of Intel pinctrl drivers @@ -3587,7 +3605,6 @@ CONFIG_MEDIA_USB_SUPPORT=y # CONFIG_USB_GSPCA is not set # CONFIG_USB_PWC is not set # CONFIG_USB_S2255 is not set -# CONFIG_USB_STKWEBCAM is not set # CONFIG_VIDEO_USBTV is not set CONFIG_USB_VIDEO_CLASS=m CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y @@ -3788,9 +3805,11 @@ CONFIG_MEDIA_ATTACH=y # # Camera sensor devices # +# CONFIG_VIDEO_AR0521 is not set # CONFIG_VIDEO_HI556 is not set # CONFIG_VIDEO_HI846 is not set # CONFIG_VIDEO_HI847 is not set +# CONFIG_VIDEO_IMX208 is not set # CONFIG_VIDEO_IMX214 is not set # CONFIG_VIDEO_IMX219 is not set # CONFIG_VIDEO_IMX258 is not set @@ -4191,6 +4210,7 @@ CONFIG_MEDIA_TUNER_XC5000=m # # Graphics support # +CONFIG_APERTURE_HELPERS=y CONFIG_AGP=y CONFIG_AGP_AMD64=y CONFIG_AGP_INTEL=y @@ -4488,7 +4508,9 @@ CONFIG_SND_MAX_CARDS=32 CONFIG_SND_PROC_FS=y CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_VERBOSE_PRINTK is not set +CONFIG_SND_CTL_FAST_LOOKUP=y # CONFIG_SND_DEBUG is not set +# CONFIG_SND_CTL_INPUT_VALIDATION is not set CONFIG_SND_VMASTER=y CONFIG_SND_DMA_SGBUF=y CONFIG_SND_CTL_LED=m @@ -4635,6 +4657,7 @@ CONFIG_SND_SOC_AMD_ACP5x=m # CONFIG_SND_SOC_AMD_ACP6x is not set # CONFIG_SND_AMD_ACP_CONFIG is not set # CONFIG_SND_SOC_AMD_ACP_COMMON is not set +# CONFIG_SND_SOC_AMD_RPL_ACP6x is not set # CONFIG_SND_ATMEL_SOC is not set # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set # CONFIG_SND_DESIGNWARE_I2S is not set @@ -4680,6 +4703,28 @@ CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_ACPI_INTEL_MATCH=m CONFIG_SND_SOC_INTEL_AVS=m + +# +# Intel AVS Machine drivers +# + +# +# Available DSP configurations +# +CONFIG_SND_SOC_INTEL_AVS_MACH_DA7219=m +CONFIG_SND_SOC_INTEL_AVS_MACH_DMIC=m +CONFIG_SND_SOC_INTEL_AVS_MACH_HDAUDIO=m +CONFIG_SND_SOC_INTEL_AVS_MACH_I2S_TEST=m +CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98357A=m +CONFIG_SND_SOC_INTEL_AVS_MACH_MAX98373=m +CONFIG_SND_SOC_INTEL_AVS_MACH_NAU8825=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT274=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT286=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT298=m +CONFIG_SND_SOC_INTEL_AVS_MACH_RT5682=m +CONFIG_SND_SOC_INTEL_AVS_MACH_SSM4567=m +# end of Intel AVS Machine drivers + CONFIG_SND_SOC_INTEL_MACH=y # CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m @@ -4736,6 +4781,8 @@ CONFIG_SND_SOC_SOF_CLIENT=m # CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set CONFIG_SND_SOC_SOF=m CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y +CONFIG_SND_SOC_SOF_IPC3=y +CONFIG_SND_SOC_SOF_INTEL_IPC4=y # CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m @@ -4758,6 +4805,8 @@ CONFIG_SND_SOC_SOF_INTEL_TGL=m CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_ELKHARTLAKE=m CONFIG_SND_SOC_SOF_ALDERLAKE=m +CONFIG_SND_SOC_SOF_INTEL_MTL=m +CONFIG_SND_SOC_SOF_METEORLAKE=m CONFIG_SND_SOC_SOF_HDA_COMMON=m CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y @@ -4840,6 +4889,7 @@ CONFIG_SND_SOC_ES8316=m # CONFIG_SND_SOC_GTM601 is not set CONFIG_SND_SOC_HDAC_HDMI=m CONFIG_SND_SOC_HDAC_HDA=m +CONFIG_SND_SOC_HDA=m # CONFIG_SND_SOC_ICS43432 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set # CONFIG_SND_SOC_MAX98088 is not set @@ -4872,6 +4922,7 @@ CONFIG_SND_SOC_PCM512x_I2C=m # CONFIG_SND_SOC_RK3328 is not set CONFIG_SND_SOC_RL6231=m CONFIG_SND_SOC_RL6347A=m +CONFIG_SND_SOC_RT274=m CONFIG_SND_SOC_RT286=m CONFIG_SND_SOC_RT298=m CONFIG_SND_SOC_RT1011=m @@ -4910,6 +4961,7 @@ CONFIG_SND_SOC_SSM4567=m # CONFIG_SND_SOC_TAS2562 is not set # CONFIG_SND_SOC_TAS2764 is not set # CONFIG_SND_SOC_TAS2770 is not set +# CONFIG_SND_SOC_TAS2780 is not set # CONFIG_SND_SOC_TAS5086 is not set # CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set @@ -5086,6 +5138,7 @@ CONFIG_HID_RMI=m # CONFIG_HID_SMARTJOYPLUS is not set # CONFIG_HID_TIVO is not set # CONFIG_HID_TOPSEED is not set +# CONFIG_HID_TOPRE is not set # CONFIG_HID_THINGM is not set # CONFIG_HID_THRUSTMASTER is not set # CONFIG_HID_UDRAW_PS3 is not set @@ -5333,7 +5386,9 @@ CONFIG_TYPEC_FUSB302=m CONFIG_TYPEC_UCSI=m CONFIG_UCSI_CCG=m CONFIG_UCSI_ACPI=m +# CONFIG_UCSI_STM32G0 is not set CONFIG_TYPEC_TPS6598X=m +# CONFIG_TYPEC_ANX7411 is not set # CONFIG_TYPEC_RT1719 is not set CONFIG_TYPEC_HD3SS3220=m CONFIG_TYPEC_STUSB160X=m @@ -5405,7 +5460,6 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LP3944 is not set # CONFIG_LEDS_LP3952 is not set # CONFIG_LEDS_LP50XX is not set -# CONFIG_LEDS_CLEVO_MAIL is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_DAC124S085 is not set @@ -5415,6 +5469,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_LM355x is not set +# CONFIG_LEDS_IS31FL319X is not set # # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) @@ -5673,9 +5728,10 @@ CONFIG_R8188EU=m # CONFIG_FB_SM750 is not set CONFIG_STAGING_MEDIA=y # CONFIG_INTEL_ATOMISP is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_IPU3_IMGU is not set # CONFIG_DVB_AV7110 is not set +# CONFIG_VIDEO_IPU3_IMGU is not set +# CONFIG_VIDEO_STKWEBCAM is not set +# CONFIG_VIDEO_ZORAN is not set # CONFIG_LTE_GDM724X is not set # CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FB_TFT is not set @@ -5683,10 +5739,15 @@ CONFIG_STAGING_MEDIA=y # CONFIG_PI433 is not set # CONFIG_FIELDBUS_DEV is not set # CONFIG_QLGE is not set - -# -# VME Device Drivers -# +# CONFIG_VME_BUS is not set +# CONFIG_CHROME_PLATFORMS is not set +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_SURFACE_PLATFORMS=y +# CONFIG_SURFACE3_WMI is not set +# CONFIG_SURFACE_3_POWER_OPREGION is not set +# CONFIG_SURFACE_GPE is not set +# CONFIG_SURFACE_HOTPLUG is not set +CONFIG_SURFACE_PRO3_BUTTON=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACPI_WMI=m CONFIG_WMI_BMOF=m @@ -5800,15 +5861,7 @@ CONFIG_INTEL_IPS=m # CONFIG_INTEL_SCU_PLATFORM is not set # CONFIG_SIEMENS_SIMATIC_IPC is not set # CONFIG_WINMATE_FM07_KEYS is not set -CONFIG_PMC_ATOM=y -# CONFIG_CHROME_PLATFORMS is not set -# CONFIG_MELLANOX_PLATFORM is not set -CONFIG_SURFACE_PLATFORMS=y -# CONFIG_SURFACE3_WMI is not set -# CONFIG_SURFACE_3_POWER_OPREGION is not set -# CONFIG_SURFACE_GPE is not set -# CONFIG_SURFACE_HOTPLUG is not set -CONFIG_SURFACE_PRO3_BUTTON=m +CONFIG_P2SB=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -5893,6 +5946,11 @@ CONFIG_IRQ_REMAP=y # # end of NXP/Freescale QorIQ SoC drivers +# +# fujitsu SoC drivers +# +# end of fujitsu SoC drivers + # # i.MX SoC drivers # @@ -5948,7 +6006,6 @@ CONFIG_EXTCON=y # CONFIG_MEMORY is not set # CONFIG_IIO is not set # CONFIG_NTB is not set -# CONFIG_VME_BUS is not set # CONFIG_PWM is not set # @@ -5994,7 +6051,7 @@ CONFIG_INTEL_RAPL=y # # Android # -# CONFIG_ANDROID is not set +# CONFIG_ANDROID_BINDER_IPC is not set # end of Android CONFIG_LIBNVDIMM=y @@ -6186,6 +6243,7 @@ CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_PMSG is not set +# CONFIG_PSTORE_FTRACE is not set CONFIG_PSTORE_RAM=m # CONFIG_PSTORE_BLK is not set # CONFIG_SYSV_FS is not set @@ -6304,6 +6362,7 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity" # Memory initialization # CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y # CONFIG_INIT_STACK_NONE is not set # CONFIG_INIT_STACK_ALL_PATTERN is not set @@ -6395,6 +6454,7 @@ CONFIG_CRYPTO_KEYWRAP=m # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set # CONFIG_CRYPTO_ADIANTUM is not set +# CONFIG_CRYPTO_HCTR2 is not set CONFIG_CRYPTO_ESSIV=y # @@ -6419,6 +6479,7 @@ CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_CRC64_ROCKSOFT=y CONFIG_CRYPTO_GHASH=y +# CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set CONFIG_CRYPTO_POLY1305=m CONFIG_CRYPTO_POLY1305_X86_64=y CONFIG_CRYPTO_MD4=m @@ -6464,6 +6525,7 @@ CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_CHACHA20_X86_64=y CONFIG_CRYPTO_SEED=m +# CONFIG_CRYPTO_ARIA is not set CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m @@ -6586,6 +6648,7 @@ CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y CONFIG_CRYPTO_LIB_POLY1305=y CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_SHA256=y # end of Crypto library routines @@ -6674,7 +6737,6 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y CONFIG_ARCH_HAS_COPY_MC=y CONFIG_ARCH_STACKWALK=y CONFIG_STACKDEPOT=y -CONFIG_STACK_HASH_ORDER=20 CONFIG_SBITMAP=y # end of Library routines @@ -6704,6 +6766,7 @@ CONFIG_DEBUG_MISC=y # # Compile-time checks and compiler options # +CONFIG_AS_HAS_NON_CONST_LEB128=y CONFIG_DEBUG_INFO_NONE=y # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set # CONFIG_DEBUG_INFO_DWARF4 is not set @@ -6765,6 +6828,7 @@ CONFIG_ARCH_HAS_DEBUG_WX=y CONFIG_GENERIC_PTDUMP=y # CONFIG_PTDUMP_DEBUGFS is not set # CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SHRINKER_DEBUG is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_STACK_USAGE is not set @@ -6875,6 +6939,7 @@ CONFIG_NOP_TRACER=y CONFIG_HAVE_RETHOOK=y CONFIG_RETHOOK=y CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y @@ -6885,15 +6950,24 @@ CONFIG_HAVE_FENTRY=y CONFIG_HAVE_OBJTOOL_MCOUNT=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_BUILDTIME_MCOUNT_SORT=y +CONFIG_BUILDTIME_MCOUNT_SORT=y CONFIG_TRACE_CLOCK=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_TRACING=y +CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y # CONFIG_BOOTTIME_TRACING is not set -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_FPROBE=y +# CONFIG_FUNCTION_PROFILER is not set # CONFIG_STACK_TRACER is not set # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set @@ -6902,7 +6976,6 @@ CONFIG_FTRACE=y # CONFIG_OSNOISE_TRACER is not set # CONFIG_TIMERLAT_TRACER is not set # CONFIG_MMIOTRACE is not set -# CONFIG_ENABLE_DEFAULT_TRACERS is not set # CONFIG_FTRACE_SYSCALLS is not set # CONFIG_TRACER_SNAPSHOT is not set CONFIG_BRANCH_PROFILE_NONE=y @@ -6910,21 +6983,28 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_BLK_DEV_IO_TRACE is not set CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_UPROBE_EVENTS=y CONFIG_BPF_EVENTS=y CONFIG_DYNAMIC_EVENTS=y CONFIG_PROBE_EVENTS=y # CONFIG_BPF_KPROBE_OVERRIDE is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_FTRACE_MCOUNT_USE_CC=y # CONFIG_SYNTH_EVENTS is not set # CONFIG_HIST_TRIGGERS is not set # CONFIG_TRACE_EVENT_INJECT is not set # CONFIG_TRACEPOINT_BENCHMARK is not set # CONFIG_RING_BUFFER_BENCHMARK is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_RECORD_RECURSION is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_FTRACE_SORT_STARTUP_TEST is not set # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_KPROBE_EVENT_GEN_TEST is not set +# CONFIG_RV is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_SAMPLE_FTRACE_DIRECT=y diff --git a/meta-citadel/recipes-support/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch b/meta-citadel/recipes-support/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch new file mode 100644 index 0000000..86c44d4 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/files/0001-wayland-info-Fix-build-without-libdrm.patch @@ -0,0 +1,42 @@ +From c79a3fb51718c4286b74edf0f758df9219994844 Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Wed, 14 Sep 2022 09:07:10 +0200 +Subject: [PATCH] wayland-info: Fix build without libdrm + +wayland-info can optionally use libdrm to provide a description of the +dmabuf format modifiers. + +When not using libdrm however, the build fails because "dev_t" is not +defined. + +The definition of "dev_t" comes from which is included +from , which is not included without libdrm support, hence the +build failure. + +Simply include unconditionally to make sure "dev_t" is +defined regardless of libdrm support, to fix the build failure. + +Closes: https://gitlab.freedesktop.org/wayland/wayland-utils/-/issues/6 +Signed-off-by: Olivier Fourdan +Fixes: 240cb739 - "Add support for linux_dmabuf version 4" +Reviewed-by: Simon Ser +Reviewed-by: Pekka Paalanen + +Upstream-Status: Backport [https://gitlab.freedesktop.org/wayland/wayland-utils/-/commit/baa65ba9f62e6a05c32b9202b524158a21f24245] +Signed-off-by: Alexander Kanavin +--- + wayland-info/wayland-info.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wayland-info/wayland-info.c b/wayland-info/wayland-info.c +index 53cd04b..98ff205 100644 +--- a/wayland-info/wayland-info.c ++++ b/wayland-info/wayland-info.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include + #if HAVE_HUMAN_FORMAT_MODIFIER diff --git a/meta-citadel/recipes-support/wayland/libinput/determinism.patch b/meta-citadel/recipes-support/wayland/libinput/determinism.patch new file mode 100644 index 0000000..cb55403 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/libinput/determinism.patch @@ -0,0 +1,21 @@ +This finds our outer git tree and that version information breaks +determinism of this recipe. Disable it. + +RP 2020/2/6 + +Upstream-Status: Pending +Signed-off-by: Richard Purdie + +Index: libinput-1.14.3/meson.build +=================================================================== +--- libinput-1.14.3.orig/meson.build ++++ libinput-1.14.3/meson.build +@@ -387,7 +387,7 @@ pkgconfig.generate( + libraries : lib_libinput + ) + +-git_version_h = vcs_tag(command : ['git', 'describe'], ++git_version_h = vcs_tag(command : ['false'], + fallback : 'unknown', + input : 'src/libinput-git-version.h.in', + output :'libinput-git-version.h') diff --git a/meta-citadel/recipes-support/wayland/libinput/run-ptest b/meta-citadel/recipes-support/wayland/libinput/run-ptest new file mode 100644 index 0000000..d11e6eb --- /dev/null +++ b/meta-citadel/recipes-support/wayland/libinput/run-ptest @@ -0,0 +1,9 @@ +#!/bin/sh + +/usr/libexec/libinput/libinput-test-suite -j1 +if [ $? -eq 0 ]; then + echo 'PASS: libinput-test-suite' +else + echo 'FAIL: libinput-test-suite' +fi + diff --git a/meta-citadel/recipes-support/wayland/libinput_1.19.4.bb b/meta-citadel/recipes-support/wayland/libinput_1.19.4.bb new file mode 100644 index 0000000..a7d0c4b --- /dev/null +++ b/meta-citadel/recipes-support/wayland/libinput_1.19.4.bb @@ -0,0 +1,49 @@ +SUMMARY = "Library to handle input devices in Wayland compositors" +DESCRIPTION = "libinput is a library to handle input devices in Wayland \ +compositors and to provide a generic X.Org input driver. It provides \ +device detection, device handling, input device event processing and \ +abstraction so minimize the amount of custom input code compositors need to \ +provide the common set of functionality that users expect." +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" + +DEPENDS = "libevdev udev mtdev libcheck" + +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://run-ptest \ + file://determinism.patch \ + " +SRC_URI[sha256sum] = "ff33a570b5a936c81e6c08389a8581c2665311d026ce3d225c88d09c49f9b440" + +UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" + +inherit meson pkgconfig lib_package ptest + +# Patch out build directory, otherwise it leaks into ptest binary +do_configure:append() { + sed -i -e "s,${WORKDIR},,g" config.h + if [ -e "litest-config.h" ]; then + sed -i -e "s,${WORKDIR},,g" litest-config.h + fi +} + +PACKAGECONFIG ??= "" +PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" +PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" + +UDEVDIR = "`pkg-config --variable=udevdir udev`" + +EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ + -Ddocumentation=false \ + ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \ + -Dzshcompletiondir=no" + +# package name changed in 1.8.1 upgrade: make sure package upgrades work +RPROVIDES:${PN} = "libinput" +RREPLACES:${PN} = "libinput" +RCONFLICTS:${PN} = "libinput" + +FILES:${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite" diff --git a/meta-citadel/recipes-support/wayland/mtdev_1.1.6.bb b/meta-citadel/recipes-support/wayland/mtdev_1.1.6.bb new file mode 100644 index 0000000..7c1cb5e --- /dev/null +++ b/meta-citadel/recipes-support/wayland/mtdev_1.1.6.bb @@ -0,0 +1,18 @@ +SUMMARY = "Multitouch Protocol Translation Library" + +DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ +multitouch events to the slotted type B protocol. The events put into mtdev may \ +be from any MT device, specifically type A without contact tracking, type A with \ +contact tracking, or type B with contact tracking" + +HOMEPAGE = "http://bitmath.org/code/mtdev/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" + +SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" +SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" +SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" + +inherit autotools pkgconfig diff --git a/meta-citadel/recipes-support/wayland/required-distro-features.inc b/meta-citadel/recipes-support/wayland/required-distro-features.inc new file mode 100644 index 0000000..bb4a0e8 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/required-distro-features.inc @@ -0,0 +1,8 @@ +# distro features required by weston recipes + +inherit features_check + +# requires pam enabled if started via systemd +# +REQUIRED_DISTRO_FEATURES = "wayland opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" + diff --git a/meta-citadel/recipes-support/wayland/wayland-protocols_1.27.bb b/meta-citadel/recipes-support/wayland/wayland-protocols_1.27.bb new file mode 100644 index 0000000..5223a13 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/wayland-protocols_1.27.bb @@ -0,0 +1,25 @@ +SUMMARY = "Collection of additional Wayland protocols" +DESCRIPTION = "Wayland protocols that add functionality not \ +available in the Wayland core protocol. Such protocols either add \ +completely new functionality, or extend the functionality of some other \ +protocol either in Wayland core, or some other protocol in \ +wayland-protocols." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ + file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" + +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" +SRC_URI[sha256sum] = "9046f10a425d4e2a00965a03acfb6b3fb575a56503ac72c2b86821c69653375c" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +inherit meson pkgconfig allarch + +EXTRA_OEMESON += "-Dtests=false" + +PACKAGES = "${PN}" +FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-citadel/recipes-support/wayland/wayland-utils_1.1.0.bb b/meta-citadel/recipes-support/wayland/wayland-utils_1.1.0.bb new file mode 100644 index 0000000..dcee87e --- /dev/null +++ b/meta-citadel/recipes-support/wayland/wayland-utils_1.1.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Wayland utilities" +DESCRIPTION = "Wayland-utils contains (for now) \ +wayland-info, a utility for displaying information about the Wayland \ +protocols supported by a Wayland compositor. \ +wayland-info is basically a standalone version of weston-info as found \ +in weston repository. " +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ + " + +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ + file://0001-wayland-info-Fix-build-without-libdrm.patch \ + " +SRC_URI[sha256sum] = "9e685863025b4feade36d53bbc8e31b43e26498be743dea84c7a84912959410a" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" + +inherit meson pkgconfig + +DEPENDS += "wayland wayland-native wayland-protocols" diff --git a/meta-citadel/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta-citadel/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch new file mode 100644 index 0000000..bc753de --- /dev/null +++ b/meta-citadel/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch @@ -0,0 +1,41 @@ +From b4c64b6f07743e3fb63ce52359bc664ab7d60df0 Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Thu, 20 Feb 2020 15:20:45 -0600 +Subject: [PATCH] build: Fix strndup detection on MinGW + +GCC and meson conspire together to incorrectly detect that strndup() +exists on MinGW as __builtin_strndup, when no such function exists. As a +work around, meson will skip looking for __builtin functions if an +'#include' is in the prefix, so add '#include ' when looking +for strndup(). + +See: https://github.com/mesonbuild/meson/issues/3672 + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] + +Signed-off-by: Joshua Watt +Signed-off-by: Denys Dmytriyenko +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3bc25c9..adde7b9 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,11 +38,11 @@ have_funcs = [ + 'prctl', + 'memfd_create', + 'mremap', +- 'strndup', + ] + foreach f: have_funcs + config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) + endforeach ++config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup')) + config_h.set10('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include ')) + have_broken_msg_cmsg_cloexec = false + if host_machine.system() == 'freebsd' +-- +2.7.4 + diff --git a/meta-citadel/recipes-support/wayland/wayland/run-ptest b/meta-citadel/recipes-support/wayland/wayland/run-ptest new file mode 100644 index 0000000..7e8d9de --- /dev/null +++ b/meta-citadel/recipes-support/wayland/wayland/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +export WAYLAND_SCANNER=wayland-scanner +export TEST_DATA_DIR=tests/data +export TEST_OUTPUT_DIR=tests/output +export SED=sed +export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1 +export NM=nm + +for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do + $i + if [ $? -eq 0 ]; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta-citadel/recipes-support/wayland/wayland_1.21.0.bb b/meta-citadel/recipes-support/wayland/wayland_1.21.0.bb new file mode 100644 index 0000000..ce59e60 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/wayland_1.21.0.bb @@ -0,0 +1,61 @@ +SUMMARY = "Wayland, a protocol between a compositor and clients" +DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ +as well as a C library implementation of that protocol. The compositor can be \ +a standalone display server running on Linux kernel modesetting and evdev \ +input devices, an X application, or a wayland client itself. The clients can \ +be traditional applications, X servers (rootless or fullscreen) or other \ +display servers." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ + file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" + +DEPENDS = "expat libffi wayland-native" + +SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ + file://run-ptest \ + file://0001-build-Fix-strndup-detection-on-MinGW.patch \ + " +SRC_URI[sha256sum] = "6dc64d7fc16837a693a51cfdb2e568db538bfdc9f457d4656285bb9594ef11ac" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" +UPSTREAM_CHECK_REGEX = "wayland-(?P\d+\.\d+\.(?!9\d+)\d+)" + +inherit meson pkgconfig ptest + +PACKAGECONFIG ??= "dtd-validation" +PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," + +EXTRA_OEMESON = "-Ddocumentation=false" +EXTRA_OEMESON:class-native = "-Ddocumentation=false" + +# Wayland installs a M4 macro for other projects to use, which uses the target +# pkg-config to find files. Replace pkg-config with pkg-config-native. +do_install:append:class-native() { + sed -e 's,PKG_CHECK_MODULES(.*),,g' \ + -e 's,$PKG_CONFIG,pkg-config-native,g' \ + -i ${D}/${datadir}/aclocal/wayland-scanner.m4 +} + +do_install_ptest() { + mkdir -p ${D}${PTEST_PATH}/tests/data + cp -rf ${B}/tests/*-test ${B}/tests/*-checker ${D}${PTEST_PATH}/tests + cp -rf ${B}/tests/*-checker ${D}${PTEST_PATH} + cp -rf ${S}/tests/scanner-test.sh ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/data/* ${D}${PTEST_PATH}/tests/data/ + cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ +} + +sysroot_stage_all:append:class-target () { + rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 + cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ +} + +PACKAGES =+ "${PN}-tools" + +FILES:${PN}-tools = "${bindir}/wayland-scanner" +FILES:${PN}-dev += "${datadir}/${BPN}/wayland-scanner.mk" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN}-ptest += "binutils sed ${PN}-tools" diff --git a/meta-citadel/recipes-support/wayland/weston-init.bb b/meta-citadel/recipes-support/wayland/weston-init.bb new file mode 100644 index 0000000..77dda03 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston-init.bb @@ -0,0 +1,97 @@ +SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +SRC_URI = "file://init \ + file://weston.env \ + file://weston.ini \ + file://weston.service \ + file://weston.socket \ + file://weston-autologin \ + file://weston-start" + +S = "${WORKDIR}" + +PACKAGECONFIG ??= "" +PACKAGECONFIG:append:qemuriscv64 = " use-pixman" +PACKAGECONFIG:append:qemuppc64 = " use-pixman" + +PACKAGECONFIG[no-idle-timeout] = ",," +PACKAGECONFIG[use-pixman] = ",," + +DEFAULTBACKEND ??= "" +DEFAULTBACKEND:qemuall ?= "drm" + +do_install() { + if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then + install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston + fi + install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini + install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston + + # Install Weston systemd service and accompanying udev rule + install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service + install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then + install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin + fi + sed -i -e s:/etc:${sysconfdir}:g \ + -e s:/usr/bin:${bindir}:g \ + -e s:/var:${localstatedir}:g \ + ${D}${systemd_system_unitdir}/weston.service + # Install weston-start script + install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start + sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start + sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start + if [ -n "${DEFAULTBACKEND}" ]; then + sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini + fi + + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'yes', 'no', d)}" = "yes" ]; then + sed -i -e "/^\[core\]/a xwayland=true" ${D}${sysconfdir}/xdg/weston/weston.ini + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'no-idle-timeout', 'yes', 'no', d)}" = "yes" ]; then + sed -i -e "/^\[core\]/a idle-time=0" ${D}${sysconfdir}/xdg/weston/weston.ini + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'use-pixman', 'yes', 'no', d)}" = "yes" ]; then + sed -i -e "/^\[core\]/a use-pixman=true" ${D}${sysconfdir}/xdg/weston/weston.ini + fi + + install -dm 755 -o weston -g weston ${D}/home/weston +} + +INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}" + +inherit update-rc.d systemd useradd + +USERADD_PACKAGES = "${PN}" + +# rdepends on weston which depends on virtual/egl +# +require ${THISDIR}/required-distro-features.inc + +RDEPENDS:${PN} = "weston kbd" + +INITSCRIPT_NAME = "weston" +INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." + +FILES:${PN} += "\ + ${sysconfdir}/xdg/weston/weston.ini \ + ${systemd_system_unitdir}/weston.service \ + ${systemd_system_unitdir}/weston.socket \ + ${sysconfdir}/default/weston \ + ${sysconfdir}/pam.d/ \ + /home/weston \ + " + +CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" + +SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" +USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input weston" +GROUPADD_PARAM:${PN} = "-r wayland" + diff --git a/meta-citadel/recipes-support/wayland/weston-init/init b/meta-citadel/recipes-support/wayland/weston-init/init new file mode 100644 index 0000000..d3b0d18 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston-init/init @@ -0,0 +1,54 @@ +#!/bin/sh +# +### BEGIN INIT INFO +# Provides: weston +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +if test -e /etc/default/weston ; then + . /etc/default/weston +fi + +killproc() { + pid=`/bin/pidof $1` + [ "$pid" != "" ] && kill $pid +} + +read CMDLINE < /proc/cmdline +for x in $CMDLINE; do + case $x in + weston=false) + echo "Weston disabled" + exit 0; + ;; + esac +done + +case "$1" in + start) + . /etc/profile + export HOME=ROOTHOME + + WESTON_USER=weston weston-start $OPTARGS & + ;; + + stop) + echo "Stopping Weston" + killproc weston + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 { start | stop | restart }" + ;; +esac + +exit 0 diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston-autologin b/meta-citadel/recipes-support/wayland/weston-init/weston-autologin new file mode 100644 index 0000000..f6e6d10 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston-init/weston-autologin @@ -0,0 +1,11 @@ +auth required pam_nologin.so +auth required pam_unix.so try_first_pass nullok + +account required pam_nologin.so +account required pam_unix.so + +session required pam_env.so +session required pam_unix.so +-session optional pam_systemd.so type=wayland class=user desktop=weston +-session optional pam_loginuid.so + diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston-start b/meta-citadel/recipes-support/wayland/weston-init/weston-start new file mode 100755 index 0000000..01670cd --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston-init/weston-start @@ -0,0 +1,71 @@ +#!/bin/sh +# Copyright (C) 2016 O.S. Systems Software LTDA. +# Copyright (C) 2016 Freescale Semiconductor + +export PATH="/sbin:/usr/sbin:/bin:/usr/bin" + +usage() { + cat <] +EOF +} + +## Module support +modules_dir=@DATADIR@/weston-start + +# Add weston extra argument +add_weston_argument() { + weston_args="$weston_args $1" +} + +## Add module to --modules argument +add_weston_module() { + if [[ "x${weston_modules}" == "x" ]]; then + weston_modules="--modules " + fi; + weston_modules+="${1}," +} + +if [ -n "$WAYLAND_DISPLAY" ]; then + echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." + exit 1 +fi + +if [ -n "$WESTON_USER" ]; then + if [ -z "$WESTON_GROUP" ]; then + # no explicit WESTON_GROUP given, therefore use WESTON_USER + export WESTON_GROUP="${WESTON_USER}" + fi +fi + +weston_args=$* + +# Load and run modules +if [ -d "$modules_dir" ]; then + for m in "$modules_dir"/*; do + # Skip backup files + if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then + continue + fi + + # process module + . $m + if [[ x"{$weston_modules}" != "x" ]]; then + add_weston_argument "${weston_modules}" + fi; + done +fi + +if test -z "$XDG_RUNTIME_DIR"; then + export XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` + if ! test -d "$XDG_RUNTIME_DIR"; then + mkdir --parents $XDG_RUNTIME_DIR + chmod 0700 $XDG_RUNTIME_DIR + fi + if [ -n "$WESTON_USER" ] + then + chown $WESTON_USER:$WESTON_GROUP $XDG_RUNTIME_DIR + fi +fi + +su -c "XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` weston $weston_args --log=/tmp/weston.log" $WESTON_USER diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.env b/meta-citadel/recipes-support/wayland/weston-init/weston.env new file mode 100644 index 0000000..e69de29 diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.ini b/meta-citadel/recipes-support/wayland/weston-init/weston.ini new file mode 100644 index 0000000..6bd5aef --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston-init/weston.ini @@ -0,0 +1,75 @@ +# configuration file for Weston + +[core] +#modules=xwayland.so,cms-colord.so +#shell=desktop-shell.so +#gbm-format=xrgb2101010 +require-input=false + +#[shell] +#background-image=/usr/share/backgrounds/gnome/Aqua.jpg +#background-color=0xff002244 +#background-type=tile +#clock-format=minutes +#panel-color=0x90ff0000 +#locking=true +#animation=zoom +#startup-animation=fade +#binding-modifier=ctrl +#num-workspaces=6 +#cursor-theme=whiteglass +#cursor-size=24 + +#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png +#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg +#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg +#animation=fade + +#[launcher] +#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +#path=/usr/bin/gnome-terminal + +#[launcher] +#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +#path=/usr/bin/weston-terminal + +#[launcher] +#icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png +#path=/usr/bin/google-chrome + +#[launcher] +#icon=/usr/share/icons/gnome/24x24/apps/arts.png +#path=/build/weston-0lEgCh/weston-1.11.0/weston-flower + +#[input-method] +#path=/usr/libexec/weston-keyboard + +#[output] +#name=LVDS1 +#mode=1680x1050 +#transform=90 +#icc_profile=/usr/share/color/icc/colord/Bluish.icc + +#[output] +#name=VGA1 +#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync +#transform=flipped + +#[output] +#name=X1 +#mode=1024x768 +#transform=flipped-90 + +#[libinput] +#enable_tap=true + +#[touchpad] +#constant_accel_factor = 50 +#min_accel_factor = 0.16 +#max_accel_factor = 1.0 + +[screen-share] +command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize + +#[xwayland] +#path=/usr/bin/Xwayland diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.service b/meta-citadel/recipes-support/wayland/weston-init/weston.service new file mode 100644 index 0000000..8074599 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston-init/weston.service @@ -0,0 +1,71 @@ +# This is a system unit for launching Weston with auto-login as the +# user configured here. +# +# Weston must be built with systemd support, and your weston.ini must load +# the plugin systemd-notify.so. +[Unit] +Description=Weston, a Wayland compositor, as a system service +Documentation=man:weston(1) man:weston.ini(5) +Documentation=http://wayland.freedesktop.org/ + +# Make sure we are started after logins are permitted. +Requires=systemd-user-sessions.service +After=systemd-user-sessions.service + +# If Plymouth is used, we want to start when it is on its way out. +After=plymouth-quit-wait.service + +# D-Bus is necessary for contacting logind. Logind is required. +Wants=dbus.socket +After=dbus.socket + +# Ensure the socket is present +Requires=weston.socket + +# Since we are part of the graphical session, make sure we are started before +# it is complete. +Before=graphical.target + +# Prevent starting on systems without virtual consoles, Weston requires one +# for now. +ConditionPathExists=/dev/tty0 + +[Service] +# Requires systemd-notify.so Weston plugin. +Type=notify +EnvironmentFile=/etc/default/weston +ExecStart=/usr/bin/weston --modules=systemd-notify.so + +# Optional watchdog setup +#TimeoutStartSec=60 +#WatchdogSec=20 + +# The user to run Weston as. +User=weston +Group=weston + +# Make sure the working directory is the users home directory +WorkingDirectory=/home/weston + +# Set up a full user session for the user, required by Weston. +PAMName=weston-autologin + +# A virtual terminal is needed. +TTYPath=/dev/tty7 +TTYReset=yes +TTYVHangup=yes +TTYVTDisallocate=yes + +# Fail to start if not controlling the tty. +StandardInput=tty-fail +StandardOutput=journal +StandardError=journal + +# Log this user with utmp, letting it show up with commands 'w' and 'who'. +UtmpIdentifier=tty7 +UtmpMode=user + +[Install] +# Note: If you only want weston to start on-demand, remove this line with a +# service drop file +WantedBy=graphical.target diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.socket b/meta-citadel/recipes-support/wayland/weston-init/weston.socket new file mode 100644 index 0000000..c1bdc83 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston-init/weston.socket @@ -0,0 +1,14 @@ +[Unit] +Description=Weston socket +RequiresMountsFor=/run + +[Socket] +ListenStream=/run/wayland-0 +SocketMode=0775 +SocketUser=weston +SocketGroup=wayland +RemoveOnStop=yes + +[Install] +WantedBy=sockets.target + diff --git a/meta-citadel/recipes-support/wayland/weston/systemd-notify.weston-start b/meta-citadel/recipes-support/wayland/weston/systemd-notify.weston-start new file mode 100644 index 0000000..a97e7b3 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston/systemd-notify.weston-start @@ -0,0 +1,9 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: Huawei Inc. +# SPDX-License-Identifier: Apache-2.0 + + +if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then + add_weston_module "systemd-notify.so" +fi diff --git a/meta-citadel/recipes-support/wayland/weston/weston.desktop b/meta-citadel/recipes-support/wayland/weston/weston.desktop new file mode 100644 index 0000000..1086ae8 --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston/weston.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=Weston +Comment=Wayland Compostitor +Exec=weston +Icon=weston +Terminal=false +Categories=Utility; diff --git a/meta-citadel/recipes-support/wayland/weston/weston.png b/meta-citadel/recipes-support/wayland/weston/weston.png new file mode 100644 index 0000000..ea8b7e0 Binary files /dev/null and b/meta-citadel/recipes-support/wayland/weston/weston.png differ diff --git a/meta-citadel/recipes-support/wayland/weston/xwayland.weston-start b/meta-citadel/recipes-support/wayland/weston/xwayland.weston-start new file mode 100644 index 0000000..342ac8d --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston/xwayland.weston-start @@ -0,0 +1,6 @@ +#!/bin/sh + +if type Xwayland >/dev/null 2>/dev/null; then + mkdir -m 775 -p /tmp/.X11-unix + chown root:video /tmp/.X11-unix +fi diff --git a/meta-citadel/recipes-support/wayland/weston_10.0.2.bb b/meta-citadel/recipes-support/wayland/weston_10.0.2.bb new file mode 100644 index 0000000..786d12b --- /dev/null +++ b/meta-citadel/recipes-support/wayland/weston_10.0.2.bb @@ -0,0 +1,143 @@ +SUMMARY = "Weston, a Wayland compositor" +DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ + file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ + " + +SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ + file://weston.png \ + file://weston.desktop \ + file://xwayland.weston-start \ + file://systemd-notify.weston-start \ + " + +SRC_URI[sha256sum] = "89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7" + +UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" +UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" + +inherit meson pkgconfig useradd + +# depends on virtual/egl +# +require ${THISDIR}/required-distro-features.inc + +DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" +DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" + +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" + +WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" + +EXTRA_OEMESON += "-Dpipewire=false" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ + ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'launcher-libseat', '', d)} \ + image-jpeg \ + screenshare \ + shell-desktop \ + shell-fullscreen \ + shell-ivi" + +# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' +SIMPLECLIENTS ?= "all" + +# +# Compositor choices +# +# Weston on KMS +PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev" +# Weston on Wayland (nested Weston) +PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" +# Weston on X11 +PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcb libxcursor cairo" +# Headless Weston +PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" +# Weston on framebuffer +PACKAGECONFIG[fbdev] = "-Ddeprecated-backend-fbdev=true,-Ddeprecated-backend-fbdev=false,udev mtdev" +# Weston on RDP +PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" +# weston-launch +PACKAGECONFIG[launch] = "-Ddeprecated-weston-launch=true,-Ddeprecated-weston-launch=false,drm" +# VA-API desktop recorder +PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" +# Weston with EGL support +PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" +# Weston with lcms support +PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" +# Weston with webp support +PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" +# Weston with systemd-login support +PACKAGECONFIG[systemd] = "-Dsystemd=true -Dlauncher-logind=true,-Dsystemd=false -Dlauncher-logind=false,systemd dbus" +# Weston with Xwayland support (requires X11 and Wayland) +PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false" +# colord CMS support +PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-colord=false,colord" +# Clients support +PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" +# Virtual remote output with GStreamer on DRM backend +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" +# Weston with screen-share support +PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" +# Traditional desktop shell +PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" +# Fullscreen shell +PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" +# In-Vehicle Infotainment (IVI) shell +PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" +# JPEG image loading support +PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" +# support libseat based launch +PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" + +do_install:append() { + # Weston doesn't need the .la files to load modules, so wipe them + rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la + + # If X11, ship a desktop file to launch it + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then + install -d ${D}${datadir}/applications + install ${WORKDIR}/weston.desktop ${D}${datadir}/applications + + install -d ${D}${datadir}/icons/hicolor/48x48/apps + install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then + chmod u+s ${D}${bindir}/weston-launch + fi +} + +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ + libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" + +FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" +FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" + +FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" +SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." + +FILES:${PN}-examples = "${bindir}/*" + +FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" +RDEPENDS:${PN}-xwayland += "xwayland" + +RDEPENDS:${PN} += "xkeyboard-config" +RRECOMMENDS:${PN} = "weston-init liberation-fonts" +RRECOMMENDS:${PN}-dev += "wayland-protocols" + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM:${PN} = "--system weston-launch" diff --git a/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell/0001-Fix-wayland-scanner-for-cross-compile.patch b/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell/0001-Fix-wayland-scanner-for-cross-compile.patch new file mode 100644 index 0000000..1c8f447 --- /dev/null +++ b/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell/0001-Fix-wayland-scanner-for-cross-compile.patch @@ -0,0 +1,22 @@ +From b3c048882eb119e35a3b03eb53e0769bd2db27aa Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Fri, 23 Sep 2022 11:13:15 -0400 +Subject: [PATCH] Fix wayland-scanner for cross compile + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9a983ee..4433fe5 100644 +--- a/meson.build ++++ b/meson.build +@@ -18,7 +18,7 @@ wayland_client = dependency('wayland-client', version: '>=1.10.0') + wayland_server = dependency('wayland-server', version: '>=1.10.0', required: false) + + # wayland_scanner is required, but we can find it without pkg-config +-wayland_scanner = dependency('wayland-scanner', version: '>=1.10.0', required: false) ++wayland_scanner = dependency('wayland-scanner', version: '>=1.10.0', required: false, native: true) + + # use system xdg-shell protocol when available + wayland_protocols = dependency('wayland-protocols', version: '>=1.16', required: false) diff --git a/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb b/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb index 595f068..5ccabb5 100644 --- a/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb +++ b/meta-citadel/recipes-sway/gtk-layer-shell/gtk-layer-shell_0.5.1.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://LICENSE_LGPL.txt;md5=3000208d539ec061b899bce1d9ce9404 file://test/check-licenses.py;md5=3c4fd5f6d979f739fba5d1f020f81e3e" -SRC_URI = "git://github.com/wmww/gtk-layer-shell;protocol=https;branch=master" +SRC_URI = "git://github.com/wmww/gtk-layer-shell;protocol=https;branch=master \ + file://0001-Fix-wayland-scanner-for-cross-compile.patch \ + " GIR_MESON_OPTION = "" diff --git a/meta-citadel/recipes-sway/sway/files/0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch b/meta-citadel/recipes-sway/sway/files/0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch index 110a1cf..6d24eaa 100644 --- a/meta-citadel/recipes-sway/sway/files/0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch +++ b/meta-citadel/recipes-sway/sway/files/0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch @@ -8,18 +8,18 @@ Subject: [PATCH] Reinstate wayland-0 as starting display socket for Citadel 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/server.c b/sway/server.c -index 5de73b39..095389d3 100644 +index f6720755..a870ca22 100644 --- a/sway/server.c +++ b/sway/server.c -@@ -152,9 +152,9 @@ bool server_init(struct sway_server *server) { - wlr_primary_selection_v1_device_manager_create(server->wl_display); - wlr_viewporter_create(server->wl_display); +@@ -215,9 +215,9 @@ bool server_init(struct sway_server *server) { + wl_signal_add(&server->xdg_activation_v1->events.request_activate, + &server->xdg_activation_v1_request_activate); - // Avoid using "wayland-0" as display socket + // Undo: Avoid using "wayland-0" as display socket char name_candidate[16]; -- for (int i = 1; i <= 32; ++i) { -+ for (int i = 0; i <= 32; ++i) { - sprintf(name_candidate, "wayland-%d", i); +- for (unsigned int i = 1; i <= 32; ++i) { ++ for (unsigned int i = 0; i <= 32; ++i) { + snprintf(name_candidate, sizeof(name_candidate), "wayland-%u", i); if (wl_display_add_socket(server->wl_display, name_candidate) >= 0) { server->socket = strdup(name_candidate); diff --git a/meta-citadel/recipes-sway/sway/sway_1.5.1.bb b/meta-citadel/recipes-sway/sway/sway_1.5.1.bb deleted file mode 100644 index a91c76e..0000000 --- a/meta-citadel/recipes-sway/sway/sway_1.5.1.bb +++ /dev/null @@ -1,34 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea" - -SRCREV = "5ae4f65045c04df7ad2d87142b4064803d97a73e" - -#PV = "1.4+git${SRCPV}" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/swaywm/sway;protocol=https;branch=master \ - file://config \ - file://0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch \ - " - -UPSTREAM_CHECK_COMMITS = "1" - -inherit meson pkgconfig - -DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" - -FILES:${PN} += "\ - ${datadir}/wayland-sessions/sway.desktop \ -" - -do_install:append() { - rm ${D}${sysconfdir}/sway/config - install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config -} - -# Reproducibility issue. Fix me! -CFLAGS:append = " -Wno-error=date-time" - -EXTRA_OEMESON += "-Ddefault-wallpaper=false -Dzsh-completions=false -Dbash-completions=false -Dfish-completions=false" - - diff --git a/meta-citadel/recipes-sway/sway/sway_1.7.bb b/meta-citadel/recipes-sway/sway/sway_1.7.bb new file mode 100644 index 0000000..55ca72e --- /dev/null +++ b/meta-citadel/recipes-sway/sway/sway_1.7.bb @@ -0,0 +1,88 @@ +SUMMARY = "A Wayland WM" +HOMEPAGE = "https://github.com/swaywm/sway" +BUGTRACKER = "https://github.com/swaywm/sway/issues" +SECTION = "graphics" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea" + +REQUIRED_DISTRO_FEATURES = "wayland" + +DEPENDS += " \ + wlroots \ + cairo \ + libevdev \ + json-c \ + libdrm \ + libinput \ + libxkbcommon \ + pango \ + pcre2 \ + pixman \ + virtual/libgles2 \ + wayland \ + wayland-native \ + wayland-protocols \ +" + +#RDEPENDS:${PN} ?= "swaybg python3 python-i3ipc" + +#RRECOMMENDS:${PN} ?= " \ +# foot \ +# jq \ +# grim \ +# slurp \ +# wl-clipboard \ +#" + +SRC_URI = " \ + git://github.com/swaywm/sway.git;protocol=https;branch=master \ + file://config \ + file://0001-Reinstate-wayland-0-as-starting-display-socket-for-C.patch \ +" + +SRCREV = "9d99bb956fea8922f8e0196d67eabbd510c53f1f" +PV = "1.7" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check + +PACKAGECONFIG[basu] = "-Dsd-bus-provider=basu,,basu" +PACKAGECONFIG[default-wallpaper] = "-Ddefault-wallpaper=true,-Ddefault-wallpaper=false" +PACKAGECONFIG[elogind] = "-Dsd-bus-provider=libelogind,,elogind" +PACKAGECONFIG[gdk-pixbuf] = "-Dgdk-pixbuf=enabled,-Dgdk-pixbuf=disabled,gdk-pixbuf" +PACKAGECONFIG[swaybar] = "-Dswaybar=true,-Dswaybar=false" +PACKAGECONFIG[swaynag] = "-Dswaynag=true,-Dswaynag=false" +PACKAGECONFIG[systemd] = "-Dsd-bus-provider=libsystemd,,systemd" +PACKAGECONFIG[tray] = "-Dtray=enabled,-Dtray=disabled" +PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb" + +PACKAGECONFIG ?= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + gdk-pixbuf \ +" + +# Reproducibility issue. Fix me! +CFLAGS:append = " -Wno-error=date-time" +EXTRA_OEMESON += "--buildtype release" + +#do_install:append() { +# install -m 755 ${S}/contrib/grimshot ${D}${bindir} +# install -m 755 ${S}/contrib/autoname-workspaces.py ${D}${bindir} +# install -m 755 ${S}/contrib/inactive-windows-transparency.py ${D}${bindir} +#} + +FILES:${PN} += "\ + ${datadir}/wayland-sessions/sway.desktop \ +" + +do_install:append() { + rm ${D}${sysconfdir}/sway/config + install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config +} + +FILES:${PN}:append = " \ + ${datadir} \ +" + +BBCLASSEXTEND = "" diff --git a/meta-citadel/recipes-sway/sway/sway_git.bb b/meta-citadel/recipes-sway/sway/sway_git.bb deleted file mode 100644 index a81d9bd..0000000 --- a/meta-citadel/recipes-sway/sway/sway_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dfc67e5b1fa10ebb4b70eb0c0ca67bea" - -SRCREV = "ab77efc6caba50acc4c87e02ae3e6712ea808772" - -PV = "1.4+git${SRCPV}" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/swaywm/sway;protocol=https;branch=master \ - file://config \ - " - -UPSTREAM_CHECK_COMMITS = "1" - -inherit meson - -DEPENDS = "dbus cairo pango wlroots libinput libxkbcommon wayland wayland-native libpam libcap json-c libpcre gdk-pixbuf" - -FILES:${PN} += "\ - ${datadir}/wayland-sessions/sway.desktop \ -" - -do_install:append() { - rm ${D}${sysconfdir}/sway/config - install -m 644 ${WORKDIR}/config ${D}${sysconfdir}/sway/config -} - -EXTRA_OEMESON += "-Ddefault-wallpaper=false -Dzsh-completions=false -Dbash-completions=false -Dfish-completions=false" - - diff --git a/meta-citadel/recipes-sway/swaylock/swaylock/0001-Fix-wayland-scanner-for-cross-compile.patch b/meta-citadel/recipes-sway/swaylock/swaylock/0001-Fix-wayland-scanner-for-cross-compile.patch new file mode 100644 index 0000000..9462944 --- /dev/null +++ b/meta-citadel/recipes-sway/swaylock/swaylock/0001-Fix-wayland-scanner-for-cross-compile.patch @@ -0,0 +1,22 @@ +From c9ae85074b238151b153ab67bab6d81b48f77acf Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Fri, 23 Sep 2022 11:12:34 -0400 +Subject: [PATCH] Fix wayland-scanner for cross compile + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 48c43fc..5d71288 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,7 @@ endif + + wayland_client = dependency('wayland-client') + wayland_protos = dependency('wayland-protocols', version: '>=1.25', fallback: 'wayland-protocols') +-wayland_scanner = dependency('wayland-scanner', version: '>=1.15.0') ++wayland_scanner = dependency('wayland-scanner', version: '>=1.15.0', native: true) + xkbcommon = dependency('xkbcommon') + cairo = dependency('cairo') + gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf')) diff --git a/meta-citadel/recipes-sway/swaylock/swaylock_git.bb b/meta-citadel/recipes-sway/swaylock/swaylock_git.bb index 19536c4..ecc5833 100644 --- a/meta-citadel/recipes-sway/swaylock/swaylock_git.bb +++ b/meta-citadel/recipes-sway/swaylock/swaylock_git.bb @@ -16,9 +16,9 @@ DEPENDS = " \ wayland-protocols \ " -SRC_URI = " \ - git://github.com/swaywm/swaylock.git;protocol=https;branch=master \ -" +SRC_URI = "git://github.com/swaywm/swaylock.git;protocol=https;branch=master \ + file://0001-Fix-wayland-scanner-for-cross-compile.patch \ + " S = "${WORKDIR}/git" PV = "1.6" diff --git a/meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb b/meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb deleted file mode 100644 index 1544c7e..0000000 --- a/meta-citadel/recipes-sway/wlroots/wlroots_0.12.0.bb +++ /dev/null @@ -1,15 +0,0 @@ - -inherit meson pkgconfig - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" - -SRCREV = "238d1c078fb03338e9f271d98f7bf6b1fc399285" - -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/swaywm/wlroots;protocol=https;branch=master \ - " - -DEPENDS = "libx11 libdrm dbus libxcb xcb-util-wm xcb-util-image virtual/egl mesa wayland wayland-native libxkbcommon libinput systemd pixman" - - diff --git a/meta-citadel/recipes-sway/wlroots/wlroots_0.15.1.bb b/meta-citadel/recipes-sway/wlroots/wlroots_0.15.1.bb new file mode 100644 index 0000000..851a6f6 --- /dev/null +++ b/meta-citadel/recipes-sway/wlroots/wlroots_0.15.1.bb @@ -0,0 +1,49 @@ +SUMMARY = "A modular Wayland compositor library" +DESCRIPTION = "Pluggable, composable, unopinionated modules for building a \ +Wayland compositor; or about 50,000 lines of code you were \ +going to write anyway." +HOMEPAGE = "https://gitlab.freedesktop.org/wlroots" +BUGTRACKER = "https://gitlab.freedesktop.org/wlroots/wlroots/-/issues" +SECTION = "graphics" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" + +REQUIRED_DISTRO_FEATURES = "wayland" + +DEPENDS += " \ + libdrm \ + libxkbcommon \ + pixman \ + seatd \ + wayland \ + wayland-native \ + wayland-protocols \ +" + +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false,libpng ffmpeg" +PACKAGECONFIG[opengl] = ",,virtual/egl virtual/libgles2" +PACKAGECONFIG[gbm] = ",,virtual/libgbm" +PACKAGECONFIG[libinput] = ",,libinput" +PACKAGECONFIG[systemd] = ",,systemd" +PACKAGECONFIG[sysvinit] = ",,eudev elogind" +PACKAGECONFIG[vulkan] = ",,vulkan-loader vulkan-headers glslang-native" +PACKAGECONFIG[x11] = ",,xcb-util-renderutil" +PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,xwayland xcb-util-wm,xwayland" + +PACKAGECONFIG ?= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd sysvinit vulkan x11 xwayland opengl', d)} \ + libinput \ +" + +SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https" +SRCREV = "a773231c42812e56c5966fc6a035aa9c6108175a" +PV = "0.15.1" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check + +EXTRA_OEMESON += "--buildtype release" + +BBCLASSEXTEND = "" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 264c65f..84c35a8 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -1,7 +1,7 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -LAYERSERIES_COMPAT_meta-gnome = "kirkstone" +LAYERSERIES_COMPAT_meta-gnome = "langdale" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ diff --git a/meta-gnome/recipes-connectivity/iwd/iwd_1.27.bb b/meta-gnome/recipes-connectivity/iwd/iwd_1.30.bb similarity index 94% rename from meta-gnome/recipes-connectivity/iwd/iwd_1.27.bb rename to meta-gnome/recipes-connectivity/iwd/iwd_1.30.bb index dc29bc3..1f0bcd4 100644 --- a/meta-gnome/recipes-connectivity/iwd/iwd_1.27.bb +++ b/meta-gnome/recipes-connectivity/iwd/iwd_1.30.bb @@ -8,7 +8,7 @@ DEPENDS = "ell" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "013b4a0a79629c20d915954fc3b5d0620ef6e0d6065db3c342f4b3f9111f46ec" +SRC_URI[sha256sum] = "9fd13512dc27d83efb8d341f7df98f5488f70131686021fcd0d93fc97af013b8" inherit autotools manpages pkgconfig python3native systemd diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch b/meta-gnome/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch similarity index 55% rename from meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch rename to meta-gnome/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch index 7c3e775..9147605 100644 --- a/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch +++ b/meta-gnome/recipes-connectivity/modemmanager/files/0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch @@ -1,42 +1,44 @@ -From f7a3292c1c753b29384e216693f51a4213fea7d0 Mon Sep 17 00:00:00 2001 +From 35173fa04d0116ba30a86dc1a19f859f2be14a24 Mon Sep 17 00:00:00 2001 From: "Bruce A. Johnson" Date: Wed, 22 Dec 2021 14:24:02 -0500 -Subject: [PATCH 1/2] core: switch bash shell scripts to use /bin/sh for use +Subject: [PATCH] core: switch bash shell scripts to use /bin/sh for use w/Busybox. Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/483 + +%% original patch: 0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch --- - data/fcc-unlock/105b | 2 +- - data/fcc-unlock/1199 | 2 +- - data/fcc-unlock/1eac | 2 +- - test/mmcli-test-sms | 2 +- - tools/tests/test-wrapper.sh.in | 2 +- + data/dispatcher-fcc-unlock/105b | 2 +- + data/dispatcher-fcc-unlock/1199 | 2 +- + data/dispatcher-fcc-unlock/1eac | 2 +- + test/mmcli-test-sms | 2 +- + tools/tests/test-wrapper.sh.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/data/fcc-unlock/105b b/data/fcc-unlock/105b -index 21fe5329..f276050f 100644 ---- a/data/fcc-unlock/105b -+++ b/data/fcc-unlock/105b +diff --git a/data/dispatcher-fcc-unlock/105b b/data/dispatcher-fcc-unlock/105b +index 444bd51f..772c90f4 100644 +--- a/data/dispatcher-fcc-unlock/105b ++++ b/data/dispatcher-fcc-unlock/105b @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # SPDX-License-Identifier: CC0-1.0 # 2021 Aleksander Morgado -diff --git a/data/fcc-unlock/1199 b/data/fcc-unlock/1199 -index 0109c6ab..e1d3804c 100644 ---- a/data/fcc-unlock/1199 -+++ b/data/fcc-unlock/1199 +diff --git a/data/dispatcher-fcc-unlock/1199 b/data/dispatcher-fcc-unlock/1199 +index 83ab2c9e..6dbf8d1b 100644 +--- a/data/dispatcher-fcc-unlock/1199 ++++ b/data/dispatcher-fcc-unlock/1199 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # SPDX-License-Identifier: CC0-1.0 # 2021 Aleksander Morgado -diff --git a/data/fcc-unlock/1eac b/data/fcc-unlock/1eac -index 1068d9c2..d9342852 100644 ---- a/data/fcc-unlock/1eac -+++ b/data/fcc-unlock/1eac +diff --git a/data/dispatcher-fcc-unlock/1eac b/data/dispatcher-fcc-unlock/1eac +index 1a048dc8..44ce46d7 100644 +--- a/data/dispatcher-fcc-unlock/1eac ++++ b/data/dispatcher-fcc-unlock/1eac @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh @@ -64,5 +66,5 @@ index d64ea4cb..fcdb56de 100644 # For debugging behavior of test-modemmanager-service.py, you can modify # this line to add --log-file option -- -2.34.1 +2.35.3 diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch b/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch deleted file mode 100644 index d911d54..0000000 --- a/meta-gnome/recipes-connectivity/modemmanager/modemmanager/0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch +++ /dev/null @@ -1,100 +0,0 @@ -From ddf634b92bf96b35f521db6da329628b4525c2eb Mon Sep 17 00:00:00 2001 -From: Sven Schwermer -Date: Fri, 25 Feb 2022 21:37:13 +0100 -Subject: [PATCH 2/2] fcc-unlock: Make scripts POSIX shell compatible - -This allows us to not rely on bash which may not be available on -constrained systems, e.g. Yocto-built embedded systems. The scripts now -pass shellcheck. - -Signed-off-by: Sven Schwermer ---- - data/fcc-unlock/105b | 8 ++++---- - data/fcc-unlock/1199 | 6 +++--- - data/fcc-unlock/1eac | 8 ++++---- - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/data/fcc-unlock/105b b/data/fcc-unlock/105b -index f276050f..772c90f4 100644 ---- a/data/fcc-unlock/105b -+++ b/data/fcc-unlock/105b -@@ -15,20 +15,20 @@ shift - # second and next arguments are control port names - for PORT in "$@"; do - # match port type in Linux 5.14 and newer -- grep -q MBIM /sys/class/wwan/${PORT}/type 2>/dev/null && { -+ grep -q MBIM "/sys/class/wwan/$PORT/type" 2>/dev/null && { - MBIM_PORT=$PORT - break - } - # match port name in Linux 5.13 -- [[ $PORT == *"MBIM"* ]] && { -+ echo "$PORT" | grep -q MBIM && { - MBIM_PORT=$PORT - break - } - done - - # fail if no MBIM port exposed --[ -n "${MBIM_PORT}" ] || exit 2 -+[ -n "$MBIM_PORT" ] || exit 2 - - # run qmicli operation over MBIM --qmicli --device-open-proxy --device=/dev/${MBIM_PORT} --dms-foxconn-set-fcc-authentication=0 -+qmicli --device-open-proxy --device="/dev/$MBIM_PORT" --dms-foxconn-set-fcc-authentication=0 - exit $? -diff --git a/data/fcc-unlock/1199 b/data/fcc-unlock/1199 -index e1d3804c..6dbf8d1b 100644 ---- a/data/fcc-unlock/1199 -+++ b/data/fcc-unlock/1199 -@@ -19,15 +19,15 @@ shift - # second and next arguments are control port names - for PORT in "$@"; do - # match port name -- [[ $PORT == *"cdc-wdm"* ]] && { -+ echo "$PORT" | grep -q cdc-wdm && { - CDC_WDM_PORT=$PORT - break - } - done - - # fail if no cdc-wdm port exposed --[ -n "${CDC_WDM_PORT}" ] || exit 2 -+[ -n "$CDC_WDM_PORT" ] || exit 2 - - # run qmicli operation --qmicli --device-open-proxy --device=/dev/${CDC_WDM_PORT} --dms-set-fcc-authentication -+qmicli --device-open-proxy --device="/dev/$CDC_WDM_PORT" --dms-set-fcc-authentication - exit $? -diff --git a/data/fcc-unlock/1eac b/data/fcc-unlock/1eac -index d9342852..44ce46d7 100644 ---- a/data/fcc-unlock/1eac -+++ b/data/fcc-unlock/1eac -@@ -15,20 +15,20 @@ shift - # second and next arguments are control port names - for PORT in "$@"; do - # match port type in Linux 5.14 and newer -- grep -q MBIM /sys/class/wwan/${PORT}/type 2>/dev/null && { -+ grep -q MBIM "/sys/class/wwan/$PORT/type" 2>/dev/null && { - MBIM_PORT=$PORT - break - } - # match port name in Linux 5.13 -- [[ $PORT == *"MBIM"* ]] && { -+ echo "$PORT" | grep -q MBIM && { - MBIM_PORT=$PORT - break - } - done - - # fail if no MBIM port exposed --[ -n "${MBIM_PORT}" ] || exit 2 -+[ -n "$MBIM_PORT" ] || exit 2 - - # run mbimcli operation --mbimcli --device-open-proxy --device=/dev/${MBIM_PORT} --quectel-set-radio-state=on -+mbimcli --device-open-proxy --device="/dev/$MBIM_PORT" --quectel-set-radio-state=on - exit $? --- -2.34.1 - diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.6.bb b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb similarity index 92% rename from meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.6.bb rename to meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb index 14d9942..b06e3eb 100644 --- a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.6.bb +++ b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb @@ -12,13 +12,12 @@ inherit gnomebase gettext systemd gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev libxslt-native dbus" -SRCREV ?= "a7bcf2036b34d5043dbc33fee7d98bae5859c4d3" +SRCREV ?= "c234bd55c9d9618c1478b5e80aaf4b8f965be181" -# Patches 0001, 0002 will be in ModemManager > 1.18.6 +# Patch 0001 will be in ModemManager > 1.19 SRC_URI = " \ git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-18 \ file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \ - file://0002-fcc-unlock-Make-scripts-POSIX-shell-compatible.patch \ " S = "${WORKDIR}/git" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.0.bb similarity index 94% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.0.bb index 1d0c38e..1fcb435 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.8.18.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.0.bb @@ -10,7 +10,7 @@ inherit gnomebase useradd gettext systemd SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" -SRC_URI[sha256sum] = "53dfb0acf64478adc728074f162f62e60bff62a605bd897eb88b267e7057927a" +SRC_URI[sha256sum] = "5745d4107f3398a97afbb93f69239b510c9e45eb7fb62d60d9ed0a7297f4d101" S = "${WORKDIR}/NetworkManager-openvpn-${PV}" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch deleted file mode 100644 index 92b1293..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-do-not-ask-host-for-ifcfg-defaults.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 37559b659e22886d5f55837d4f167ba5fda73e85 Mon Sep 17 00:00:00 2001 -From: Adrian Freihofer -Date: Sun, 29 Aug 2021 15:50:35 +0200 -Subject: [PATCH] do-not-ask-host-for-ifcfg-defaults - ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index d0cec83..289aa1b 100644 ---- a/meson.build -+++ b/meson.build -@@ -304,8 +304,8 @@ else - distro = 'unknown' - endif - --enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat') --enable_ifupdown = get_option('ifupdown') or (distro == 'debian') -+enable_ifcfg_rh = get_option('ifcfg_rh') -+enable_ifupdown = get_option('ifupdown') - - config_plugins_default = get_option('config_plugins_default') - config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default) diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch b/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch deleted file mode 100644 index 6be2d4b..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager/0001-libnm-client-test-add-dependency-libnm_client_public.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b5dc04e1fcc28dc653fb7bf0e9dda3700d93218 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Tue, 3 May 2022 15:30:37 +0800 -Subject: [PATCH] libnm-client-test: add dependency libnm_client_public_dep - -Fix parallel build error: -| In file included from ../NetworkManager-1.36.0/src/libnm-client-test/nm-test-utils-impl.c:10: -| ../NetworkManager-1.36.0/src/libnm-client-public/NetworkManager.h:47:10: fatal error: nm-enum-types.h: No such file or directory -| 47 | #include "nm-enum-types.h" -| | ^~~~~~~~~~~~~~~~~ - -Upstream-Status: Submitted -[https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1206] - -Signed-off-by: Yi Zhao ---- - src/libnm-client-test/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libnm-client-test/meson.build b/src/libnm-client-test/meson.build -index 8e2fba1130..bcac437702 100644 ---- a/src/libnm-client-test/meson.build -+++ b/src/libnm-client-test/meson.build -@@ -13,6 +13,7 @@ libnm_client_test = static_library( - ], - dependencies: [ - libnm_core_public_dep, -+ libnm_client_public_dep, - glib_dep, - ], - ) --- -2.25.1 - diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb deleted file mode 100644 index 6c665d5..0000000 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.36.2.bb +++ /dev/null @@ -1,249 +0,0 @@ -SUMMARY = "NetworkManager" -HOMEPAGE = "https://wiki.gnome.org/Projects/NetworkManager" -SECTION = "net/misc" - -LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ -" - -DEPENDS = " \ - coreutils-native \ - intltool-native \ - libxslt-native \ - libnl \ - udev \ - util-linux \ - libndp \ - libnewt \ - curl \ - dbus \ -" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext update-rc.d systemd 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://enable-dhcpcd.conf \ - file://enable-iwd.conf \ - file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ - file://0001-libnm-client-test-add-dependency-libnm_client_public.patch \ -" -SRC_URI[sha256sum] = "ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab" - -S = "${WORKDIR}/NetworkManager-${PV}" - -# ['auto', 'symlink', 'file', 'netconfig', 'resolvconf'] -NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT ??= "auto" - -# ['dhcpcanon', 'dhclient', 'dhcpcd', 'internal', 'nettools'] -NETWORKMANAGER_DHCP_DEFAULT ??= "internal" - -EXTRA_OEMESON = "\ - -Difcfg_rh=false \ - -Dtests=yes \ - -Dnmtui=true \ - -Dudev_dir=${nonarch_base_libdir}/udev \ - -Dlibpsl=false \ - -Dqt=false \ - -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ - -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ - -Ddhcpcanon=false \ -" - -# 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 \ -" - -do_compile:prepend() { - export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" -} - -PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ - ${@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)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ -" - -inherit ${@bb.utils.contains('PACKAGECONFIG', 'nmcli', 'bash-completion', '', d)} -inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} - -PACKAGECONFIG[systemd] = "\ - -Dsystemdsystemunitdir=${systemd_unitdir}/system -Dsession_tracking=systemd,\ - -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsession_tracking=no\ -" -PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" -PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" -# consolekit is not picked by shlibs, so add it to RDEPENDS too -PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" -PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp,ppp" -PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" -PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" -PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" -PACKAGECONFIG[gnutls] = "-Dcrypto=gnutls,,gnutls" -PACKAGECONFIG[wifi] = "-Dwext=true -Dwifi=true,-Dwext=false -Dwifi=false" -PACKAGECONFIG[iwd] = "-Diwd=true,-Diwd=false" -PACKAGECONFIG[ifupdown] = "-Difupdown=true,-Difupdown=false" -PACKAGECONFIG[cloud-setup] = "-Dnm_cloud_setup=true,-Dnm_cloud_setup=false" -PACKAGECONFIG[nmcli] = "-Dnmcli=true,-Dnmcli=false" -PACKAGECONFIG[readline] = "-Dreadline=libreadline,,readline" -PACKAGECONFIG[libedit] = "-Dreadline=libedit,,libedit" -PACKAGECONFIG[ovs] = "-Dovs=true,-Dovs=false,jansson" -PACKAGECONFIG[audit] = "-Dlibaudit=yes,-Dlibaudit=no" -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux" -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" -PACKAGECONFIG[dhcpcd] = "-Ddhcpcd=yes,-Ddhcpcd=no,,dhcpcd" -PACKAGECONFIG[dhclient] = "-Ddhclient=yes,-Ddhclient=no,,dhcp" -PACKAGECONFIG[concheck] = "-Dconcheck=true,-Dconcheck=false" - - -PACKAGES =+ " \ - ${PN}-adsl \ - ${PN}-bluetooth \ - ${PN}-cloud-setup \ - ${PN}-nmcli ${PN}-nmcli-doc \ - ${PN}-nmtui ${PN}-nmtui-doc \ - ${PN}-wifi \ - ${PN}-wwan \ - ${PN}-ovs ${PN}-ovs-doc \ - ${PN}-ppp \ -" - -SYSTEMD_PACKAGES = "${PN} ${PN}-cloud-setup" - -NETWORKMANAGER_PLUGINDIR = "${libdir}/NetworkManager/${PV}" - -FILES:${PN}-adsl = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-adsl.so" - -FILES:${PN}-bluetooth = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-bluetooth.so" - -FILES:${PN}-cloud-setup = " \ - ${libexecdir}/nm-cloud-setup \ - ${systemd_system_unitdir}/nm-cloud-setup.service \ - ${systemd_system_unitdir}/nm-cloud-setup.timer \ - ${libdir}/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh \ - ${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}-nmcli = " \ - ${bindir}/nmcli \ -" - -FILES:${PN}-nmcli-doc = " \ - ${mandir}/man1/nmcli* \ -" - -FILES:${PN}-nmtui = " \ - ${bindir}/nmtui \ - ${bindir}/nmtui-edit \ - ${bindir}/nmtui-connect \ - ${bindir}/nmtui-hostname \ -" - -FILES:${PN}-nmtui-doc = " \ - ${mandir}/man1/nmtui* \ -" - -FILES:${PN}-wifi = "${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wifi.so" - -FILES:${PN}-wwan = "\ - ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-wwan.so \ - ${NETWORKMANAGER_PLUGINDIR}/libnm-wwan.so \ -" - -FILES:${PN}-ovs = "\ - ${NETWORKMANAGER_PLUGINDIR}/libnm-device-plugin-ovs.so \ - ${systemd_system_unitdir}/NetworkManager.service.d/NetworkManager-ovs.conf \ -" - -FILES:${PN}-ovs-doc = "\ - ${mandir}/man7/nm-openvswitch.7* \ -" - -FILES:${PN}-ppp = "\ - ${NETWORKMANAGER_PLUGINDIR}/libnm-ppp-plugin.so \ - ${libdir}/pppd/*/nm-pppd-plugin.so \ -" - -FILES:${PN}-dev += " \ - ${libdir}/pppd/*/*.la \ - ${libdir}/NetworkManager/*.la \ - ${NETWORKMANAGER_PLUGINDIR}/*.la \ -" - -FILES:${PN} += " \ - ${libexecdir} \ - ${libdir}/NetworkManager \ - ${nonarch_libdir}/firewalld/zones \ - ${nonarch_libdir}/NetworkManager/conf.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ - ${nonarch_libdir}/NetworkManager/VPN \ - ${nonarch_libdir}/NetworkManager/system-connections \ - ${datadir}/polkit-1 \ - ${datadir}/dbus-1 \ - ${nonarch_base_libdir}/udev/* \ - ${systemd_system_unitdir} \ -" - -RRECOMMENDS:${PN} += "\ - iptables \ - ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ - ${@bb.utils.contains('PACKAGECONFIG','adsl','${PN}-adsl','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','bluez5','${PN}-bluetooth','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','cloud-setup','${PN}-cloud-setup','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','nmcli','${PN}-nmcli','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','nmtui','${PN}-nmtui','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','wifi','${PN}-wifi','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','wwan','${PN}-wwan','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','ovs','${PN}-ovs','',d)} \ - ${@bb.utils.contains('PACKAGECONFIG','ppp','${PN}-ppp','',d)} \ -" -RCONFLICTS:${PN} = "connman" - - -INITSCRIPT_NAME = "network-manager" -SYSTEMD_SERVICE:${PN} = "\ - NetworkManager.service \ - NetworkManager-dispatcher.service \ -" - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','resolv-conf','',d)}" -ALTERNATIVE_TARGET[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv-conf.NetworkManager','',d)}" -ALTERNATIVE_LINK_NAME[resolv-conf] = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${sysconfdir}/resolv.conf','',d)}" - -do_install:append() { - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/network-manager - - rm -rf ${D}/run ${D}${localstatedir}/run - - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - # For read-only filesystem, do not create links during bootup - ln -sf ../run/NetworkManager/resolv.conf ${D}${sysconfdir}/resolv-conf.NetworkManager - - # systemd v210 and newer do not need this rule file - rm ${D}/${nonarch_base_libdir}/udev/rules.d/84-nm-drivers.rules - fi - - # Enable iwd if compiled - if ${@bb.utils.contains('PACKAGECONFIG','iwd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/enable-iwd.conf ${D}${libdir}/NetworkManager/conf.d/enable-iwd.conf - fi - - # Enable dhcpd if compiled - if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/enable-dhcpcd.conf ${D}${libdir}/NetworkManager/conf.d/enable-dhcpcd.conf - fi -} diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb similarity index 96% rename from meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb index d52ad6e..10241e1 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.38.0.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb @@ -29,9 +29,8 @@ SRC_URI = " \ file://${BPN}.initd \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ - file://0001-do-not-ask-host-for-ifcfg-defaults.patch \ " -SRC_URI[sha256sum] = "82a4cf07ddfeb0816787b67c0f5058ae6c50d6259c0b0541a24e35156062b2ef" +SRC_URI[sha256sum] = "aee7e057bc2cca5dab84e41f15f1da8b795eb290747b04cbeee822bad9e9fc03" S = "${WORKDIR}/NetworkManager-${PV}" @@ -55,6 +54,8 @@ EXTRA_OEMESON = "\ -Dconfig_dns_rc_manager_default=${NETWORKMANAGER_DNS_RC_MANAGER_DEFAULT} \ -Dconfig_dhcp_default=${NETWORKMANAGER_DHCP_DEFAULT} \ -Ddhcpcanon=false \ + -Diptables=${sbindir}/iptables \ + -Dnft=${sbindir}/nft \ " # stolen from https://github.com/void-linux/void-packages/blob/master/srcpkgs/NetworkManager/template @@ -86,7 +87,7 @@ PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" -PACKAGECONFIG[ppp] = "-Dppp=true,-Dppp=false,ppp" +PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp" PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" PACKAGECONFIG[resolvconf] = "-Dresolvconf=${base_sbindir}/resolvconf,-Dresolvconf=no,,resolvconf" @@ -231,16 +232,21 @@ FILES:${PN}-daemon += " \ ${nonarch_base_libdir}/udev/* \ ${nonarch_libdir}/firewalld \ ${nonarch_libdir}/NetworkManager/conf.d \ + ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-down.d \ ${nonarch_libdir}/NetworkManager/dispatcher.d/pre-up.d \ - ${nonarch_libdir}/NetworkManager/dispatcher.d/no-wait.d \ ${nonarch_libdir}/NetworkManager/system-connections \ ${nonarch_libdir}/NetworkManager/VPN \ ${sbindir}/NetworkManager \ ${sysconfdir}/init.d/network-manager \ ${sysconfdir}/NetworkManager \ + ${sysconfdir}/resolv-conf.NetworkManager \ + ${sysconfdir}/sysconfig/network-scripts \ ${systemd_system_unitdir} \ " +RDEPENDS:${PN}-daemon += "\ + ${@bb.utils.contains('PACKAGECONFIG', 'ifupdown', 'bash', '', d)} \ +" RRECOMMENDS:${PN}-daemon += "\ ${NETWORKMANAGER_FIREWALL_DEFAULT} \ ${@bb.utils.filter('PACKAGECONFIG', 'dnsmasq', d)} \ diff --git a/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.10.bb b/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.10.bb new file mode 100644 index 0000000..5f52429 --- /dev/null +++ b/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.10.bb @@ -0,0 +1,14 @@ +SUMMARY = "GUsb is a GObject wrapper for libusb1" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "glib-2.0 libusb1" + +inherit meson gobject-introspection gtk-doc gettext vala + +PACKAGECONFIG ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" +PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false" + +SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https" +SRCREV = "332d5b987ffecb824426e88518e05547faf2b520" +S = "${WORKDIR}/git" diff --git a/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb b/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb deleted file mode 100644 index ab3c06c..0000000 --- a/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.3.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "GUsb is a GObject wrapper for libusb1" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "glib-2.0 libusb1" - -inherit meson gobject-introspection gtk-doc gettext vala - -SRC_URI = "git://github.com/hughsie/libgusb.git;branch=master;protocol=https" -SRCREV = "ff9c606d9d72c7dd369ad220d92729556faaaf0c" -S = "${WORKDIR}/git" diff --git a/meta-gnome/recipes-freedesktop/upower/upower_0.99.13.bb b/meta-gnome/recipes-freedesktop/upower/upower_0.99.13.bb deleted file mode 100644 index b1dfcbf..0000000 --- a/meta-gnome/recipes-freedesktop/upower/upower_0.99.13.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "UPower is an abstraction for enumerating power devices, listening to device events and querying history and statistics. " -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=0de8fbf1d97a140d1d93b9f14dcfbf08" - -DEPENDS = "intltool-native libusb1 libgudev glib-2.0 dbus-glib" - -# Version 0.99.13 -SRCREV = "0f6cc0a10be22d7ddd684e1cd851e4364a440494" -SRC_URI = " \ - git://gitlab.freedesktop.org/upower/upower.git;branch=master;protocol=https \ -" - -S = "${WORKDIR}/git" - - -inherit autotools pkgconfig gettext gobject-introspection systemd gtk-doc - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" -PACKAGECONFIG[systemd] = "--with-systemdutildir=${systemd_unitdir} --with-systemdsystemunitdir=${systemd_system_unitdir}, \ - --without-systemdutildir --without-systemdsystemunitdir,systemd" - -EXTRA_OECONF = " --with-backend=linux" - -SYSTEMD_SERVICE:${PN} = "upower.service" -# don't start on boot by default - dbus does that on demand -SYSTEMD_AUTO_ENABLE = "disable" - -do_configure:prepend() { - touch ${S}/ABOUT-NLS - mkdir -p ${S}/build-aux - touch ${S}/build-aux/config.rpath - - #sed -i -e s:-nonet:\:g ${S}/doc/man/Makefile.am - #sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -RDEPENDS:${PN} += "dbus" -RRECOMMENDS:${PN} += "pm-utils" -FILES:${PN} += "${datadir}/dbus-1/ \ - ${base_libdir}/udev/* \ -" diff --git a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch index 5afba3c..0a1487f 100644 --- a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch +++ b/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch @@ -1,4 +1,4 @@ -From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001 +From e1a12b73c25d1ad0f267b22ac5d799bc1fbd0fa4 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 30 May 2017 14:55:49 +0300 Subject: [PATCH] Don't use AC_CANONICAL_HOST @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index f2659a5..1e8b016 100644 +index 6ddc49b..39752bb 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,6 @@ AC_PREREQ(2.53) - AC_INIT([adwaita-icon-theme], [41.0], + AC_INIT([adwaita-icon-theme], [43], [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme]) -AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) diff --git a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch deleted file mode 100644 index a1d39cf..0000000 --- a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 13 Jun 2017 18:10:06 +0300 -Subject: [PATCH] Run installation commands as shell jobs - -This greatly speeds up installation time on multi-core systems. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39] -Signed-off-by: Alexander Kanavin - ---- - src/fullcolor/Makefile.am | 5 +++-- - src/spinner/Makefile.am | 7 ++++--- - src/symbolic/Makefile.am | 11 ++++++----- - 3 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am -index d73529b..b7d0808 100644 ---- a/src/fullcolor/Makefile.am -+++ b/src/fullcolor/Makefile.am -@@ -9,9 +9,10 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done; -+ done; \ -+ wait - - ## FIXME we should add a way to remove links generated by icon mapping - uninstall-local: -diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am -index c14caf6..322dc0d 100644 ---- a/src/spinner/Makefile.am -+++ b/src/spinner/Makefile.am -@@ -24,13 +24,14 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \ -- done -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \ -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \ -diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am -index 957c0ee..e1f8818 100644 ---- a/src/symbolic/Makefile.am -+++ b/src/symbolic/Makefile.am -@@ -34,18 +34,19 @@ install-data-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \ - done; \ -- done -+ done; \ - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ - context="`dirname $$file`"; \ - $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \ -- $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \ -+ $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \ - for size in $(symbolic_encode_sizes); do \ - $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \ -- $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \ -+ $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \ - done \ -- done -+ done; \ -+ wait - - uninstall-local: - for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \ diff --git a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_42.0.bb b/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_43.bb similarity index 90% rename from meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_42.0.bb rename to meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_43.bb index ba57fb7..8cb4d14 100644 --- a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_42.0.bb +++ b/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_43.bb @@ -12,11 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase -SRC_URI += " \ - file://0001-Don-t-use-AC_CANONICAL_HOST.patch \ - " +SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch" -SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0" +SRC_URI[archive.sha256sum] = "2e3ac77d32a6aa5554155df37e8f0a0dd54fc5a65fd721e88d505f970da32ec6" DEPENDS += "librsvg-native" diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb similarity index 74% rename from meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb rename to meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb index df401f7..2b1ecad 100644 --- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb @@ -14,7 +14,6 @@ DEPENDS = " \ libsoup-2.4 \ " -SRC_URI[archive.md5sum] = "e1ef140a11a543643d170dc701009e39" -SRC_URI[archive.sha256sum] = "01fe84cfa0be50c6e401147a2bc5e2f1574326e2293b55c69879be3e82030fd1" +SRC_URI[archive.sha256sum] = "2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa" EXTRA_OEMESON = "-Denable-installed-tests=false" diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.73.2.bb similarity index 90% rename from meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb rename to meta-gnome/recipes-gnome/gjs/gjs_1.73.2.bb index 95e4bd5..ded9140 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.73.2.bb @@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" GNOMEBASEBUILDCLASS = "meson" -DEPENDS = "mozjs-91 cairo" +DEPENDS = "mozjs-102 cairo" inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig -SRC_URI[archive.sha256sum] = "3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad" +SRC_URI[archive.sha256sum] = "cf2b84b174a049c911a69ec619f4c5ca6b96d609be5200ca3db5131c98beda75" SRC_URI += " \ file://0001-Support-cross-builds-a-bit-better.patch \ file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb similarity index 91% rename from meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb index 36fe9cf..75e1244 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb @@ -26,7 +26,7 @@ inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" +SRC_URI[archive.sha256sum] = "1d6fcf1cdb6cc9923ab334a2c0bc37a2c1bba9d18de153d484eedc04f3c0bcdc" BT_PULSE_PACKS = " \ pulseaudio-lib-bluez5-util \ diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch index 1944518..bbde11d 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch @@ -1,23 +1,22 @@ -From 34269016c3d438e2f84119c779ebdcf032307ed4 Mon Sep 17 00:00:00 2001 +From 2f5368dd4eef27ee3afaed761932601393e4875e Mon Sep 17 00:00:00 2001 From: Bruce Leidl -Date: Fri, 27 May 2022 15:06:26 -0400 +Date: Thu, 22 Sep 2022 20:31:50 -0400 Subject: [PATCH] Add options for Citadel and disabling GOA/CUPS --- - meson.build | 14 ++++++++++++++ - meson_options.txt | 5 +++++ - panels/background/meson.build | 4 +++- - panels/meson.build | 23 ++++++++++++++++------- - shell/cc-panel-list.c | 14 ++++++++++++++ - shell/cc-panel-loader.c | 28 ++++++++++++++++++++++++++++ - tests/meson.build | 2 +- - 7 files changed, 81 insertions(+), 9 deletions(-) + meson.build | 14 ++++++++++++++ + meson_options.txt | 5 +++++ + panels/meson.build | 23 ++++++++++++++++------- + shell/cc-panel-list.c | 14 ++++++++++++++ + shell/cc-panel-loader.c | 28 ++++++++++++++++++++++++++++ + tests/meson.build | 2 +- + 6 files changed, 78 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build -index 09aa30f..7835bc7 100644 +index b7b595e..9c86afb 100644 --- a/meson.build +++ b/meson.build -@@ -99,6 +99,15 @@ libgvc = subproject( +@@ -110,6 +110,15 @@ libgvc = subproject( ) libgvc_dep = libgvc.get_variable('libgvc_dep') @@ -33,7 +32,7 @@ index 09aa30f..7835bc7 100644 goa_req_version = '>= 3.25.3' pulse_req_version = '>= 2.0' -@@ -118,7 +127,9 @@ gnome_desktop_dep = dependency('gnome-desktop-4') +@@ -129,7 +138,9 @@ gnome_desktop_dep = dependency('gnome-desktop-4') gnome_bg_dep = dependency('gnome-bg-4') gnome_rr_dep = dependency('gnome-rr-4') gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 41.0') @@ -43,7 +42,7 @@ index 09aa30f..7835bc7 100644 gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 42.alpha') libxml_dep = dependency('libxml-2.0') pulse_dep = dependency('libpulse', version: pulse_req_version) -@@ -153,6 +164,8 @@ foreach polkit_file: polkit_files +@@ -164,6 +175,8 @@ foreach polkit_file: polkit_files endforeach # Check for CUPS 1.4 or newer @@ -52,7 +51,7 @@ index 09aa30f..7835bc7 100644 cups_dep = dependency('cups', version : '>= 1.4', required: false) assert(cups_dep.found(), 'CUPS 1.4 or newer not found') -@@ -175,6 +188,7 @@ endforeach +@@ -186,6 +199,7 @@ endforeach config_h.set10('HAVE_CUPS_HTTPCONNECT2', cc.has_function('httpConnect2', dependencies: cups_dep), description: 'Define if httpConnect2() is available in CUPS') @@ -61,20 +60,20 @@ index 09aa30f..7835bc7 100644 # IBus support enable_ibus = get_option('ibus') diff --git a/meson_options.txt b/meson_options.txt -index dbca723..1f65b82 100644 +index 0a6f12b..4435bd3 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -7,3 +7,8 @@ option('tracing', type: 'boolean', value: false, description: 'add extra debuggi - option('wayland', type: 'boolean', value: true, description: 'build with Wayland support') - option('profile', type: 'combo', choices: ['default','development'], value: 'default') +@@ -10,3 +10,8 @@ option('profile', type: 'combo', choices: ['default','development'], value: 'def option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support') + option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel') + option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant') +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') +option('citadel', type: 'boolean', value: true, description: 'build with Citadel support, which removes unneeded components') diff --git a/panels/meson.build b/panels/meson.build -index 75941ed..b3fe923 100644 +index cb732f2..26f6465 100644 --- a/panels/meson.build +++ b/panels/meson.build @@ -1,12 +1,10 @@ @@ -89,8 +88,8 @@ index 75941ed..b3fe923 100644 - 'default-apps', 'diagnostics', 'display', - 'info-overview', -@@ -17,17 +15,12 @@ panels = [ + 'firmware-security', +@@ -17,18 +15,13 @@ panels = [ 'mouse', 'multitasking', 'notifications', @@ -99,6 +98,7 @@ index 75941ed..b3fe923 100644 - 'printers', 'region', - 'removable-media', + 'screen', 'search', - 'sharing', 'sound', @@ -108,7 +108,7 @@ index 75941ed..b3fe923 100644 'wwan', ] -@@ -43,6 +36,22 @@ if host_is_linux_not_s390 +@@ -44,6 +37,22 @@ if host_is_linux_not_s390 ] endif @@ -132,10 +132,10 @@ index 75941ed..b3fe923 100644 panels_libs = [] foreach cappletname: panels diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c -index 6cbc16b..41d6722 100644 +index 185b16d..a893018 100644 --- a/shell/cc-panel-list.c +++ b/shell/cc-panel-list.c -@@ -385,10 +385,16 @@ static const gchar * const panel_order[] = { +@@ -395,10 +395,16 @@ static const gchar * const panel_order[] = { "notifications", "search", "multitasking", @@ -152,7 +152,7 @@ index 6cbc16b..41d6722 100644 /* Privacy page */ "location", -@@ -405,16 +411,24 @@ static const gchar * const panel_order[] = { +@@ -416,16 +422,24 @@ static const gchar * const panel_order[] = { "display", "mouse", "keyboard", @@ -178,7 +178,7 @@ index 6cbc16b..41d6722 100644 "datetime", "info-overview", diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 66c513e..97eea5b 100644 +index 17f9601..db30bac 100644 --- a/shell/cc-panel-loader.c +++ b/shell/cc-panel-loader.c @@ -31,14 +31,18 @@ @@ -205,7 +205,7 @@ index 66c513e..97eea5b 100644 #endif /* BUILD_NETWORK */ extern GType cc_notifications_panel_get_type (void); +#ifdef WITH_GOA - extern GType cc_goa_panel_get_type (void); + extern GType cc_online_accounts_panel_get_type (void); +#endif extern GType cc_power_panel_get_type (void); +#ifdef WITH_CUPS @@ -230,7 +230,7 @@ index 66c513e..97eea5b 100644 #ifdef BUILD_WACOM extern GType cc_wacom_panel_get_type (void); #endif /* BUILD_WACOM */ -@@ -97,7 +111,9 @@ extern void cc_wwan_panel_static_init_func (void); +@@ -99,7 +113,9 @@ extern void cc_firmware_security_panel_static_init_func (void); static CcPanelLoaderVtable default_panels[] = { @@ -240,7 +240,7 @@ index 66c513e..97eea5b 100644 PANEL_TYPE("background", cc_background_panel_get_type, NULL), #ifdef BUILD_BLUETOOTH PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type, NULL), -@@ -105,7 +121,9 @@ static CcPanelLoaderVtable default_panels[] = +@@ -107,7 +123,9 @@ static CcPanelLoaderVtable default_panels[] = PANEL_TYPE("camera", cc_camera_panel_get_type, NULL), PANEL_TYPE("color", cc_color_panel_get_type, NULL), PANEL_TYPE("datetime", cc_date_time_panel_get_type, NULL), @@ -250,12 +250,12 @@ index 66c513e..97eea5b 100644 PANEL_TYPE("diagnostics", cc_diagnostics_panel_get_type, cc_diagnostics_panel_static_init_func), PANEL_TYPE("display", cc_display_panel_get_type, NULL), PANEL_TYPE("info-overview", cc_info_overview_panel_get_type, NULL), -@@ -120,20 +138,30 @@ static CcPanelLoaderVtable default_panels[] = +@@ -122,21 +140,31 @@ 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), + PANEL_TYPE("online-accounts", cc_online_accounts_panel_get_type, NULL), +#endif PANEL_TYPE("power", cc_power_panel_get_type, NULL), +#ifdef WITH_CUPS @@ -265,6 +265,7 @@ index 66c513e..97eea5b 100644 +#ifndef CITADEL PANEL_TYPE("removable-media", cc_removable_media_panel_get_type, NULL), +#endif + PANEL_TYPE("screen", cc_screen_panel_get_type, NULL), PANEL_TYPE("search", cc_search_panel_get_type, NULL), +#ifndef CITADEL PANEL_TYPE("sharing", cc_sharing_panel_get_type, NULL), @@ -282,13 +283,14 @@ index 66c513e..97eea5b 100644 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 d4fe361..b879160 100644 +index 69667ac..0910162 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -6,5 +6,5 @@ endif +@@ -6,6 +6,6 @@ endif subdir('interactive-panels') -subdir('printers') +#subdir('printers') subdir('info') + subdir('keyboard') diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Don-t-update-icon-cache.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Don-t-update-icon-cache.patch new file mode 100644 index 0000000..da8a53b --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Don-t-update-icon-cache.patch @@ -0,0 +1,22 @@ +From 2b1c7399ee9f0e8c1eefbb5f5cda23afac3028f2 Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Fri, 23 Sep 2022 10:34:36 -0400 +Subject: [PATCH] Don't update icon cache + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 9c86afb..138b10a 100644 +--- a/meson.build ++++ b/meson.build +@@ -311,7 +311,7 @@ endif + + gnome.post_install( + glib_compile_schemas: true, +- gtk_update_icon_cache: true, ++ gtk_update_icon_cache: false, + ) + + configure_file( diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.0.bb similarity index 90% rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.1.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.0.bb index 73df0f1..4433711 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check +inherit gnomebase gtk-icon-cache gsettings gettext vala upstream-version-is-even bash-completion features_check DEPENDS = " \ gdk-pixbuf-native \ @@ -35,7 +35,8 @@ REQUIRED_DISTRO_FEATURES += " pulseaudio systemd x11" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" SRC_URI += " file://0001-Add-options-for-Citadel-and-disabling-GOA-CUPS.patch" -SRC_URI[archive.sha256sum] = "fb30aff90fbe1d2ad56107d6e9f5f8a4a3aaf3635bbd88920d75b568bb776785" +SRC_URI += " file://0001-Don-t-update-icon-cache.patch" +SRC_URI[archive.sha256sum] = "988c933592cbdc4e7f0dba9a93262e617b739e25927aa16e177960c754e31c48" # diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.rc.bb similarity index 92% rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.1.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.rc.bb index d23056e..303522c 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.1.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_43.rc.bb @@ -16,7 +16,7 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI[archive.sha256sum] = "2433ab606d244c3524de5b812094db8a670fb11ed9ff7180c2d021ae1fc9fc05" +SRC_URI[archive.sha256sum] = "2a203d76e04f0ebba3dd17bf33474ac19fc4768b6e84fc9177132ed4ceca6ced" SRC_URI += " \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb similarity index 90% rename from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb index 671b0c4..be8633f 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb @@ -26,7 +26,7 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI[archive.sha256sum] = "ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb" +SRC_URI[archive.sha256sum] = "3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0" SRC_URI += "file://0001-disable-power-tests-and-sharing.patch" PACKAGECONFIG ??= " \ @@ -43,7 +43,7 @@ PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" FILES:${PN} += " \ ${systemd_user_unitdir} \ - ${libdir}/gnome-settings-daemon-42/libgsd.so \ + ${libdir}/gnome-settings-daemon-43/libgsd.so \ " EXTRA_OEMESON += "\ diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.0.bb similarity index 93% rename from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.1.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.0.bb index 8a17a05..3803b86 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.0.bb @@ -6,10 +6,10 @@ REQUIRED_DISTRO_FEATURES = "x11 systemd pam" GIR_MESON_OPTION = "" GTKIC_VERSION = "4" -SRCREV = "2f4a1ed647467f3342094394be1443bf3d94dc20" +SRCREV = "2c8f4aeaa4ffb9b80b1965b8cfadfb3be9205b1e" EXTERNAL_TREE_VAR="CITADEL_GNOME_SHELL_PATH" -GIT_URI = "gitsm://github.com/brl/gnome-shell.git;branch=citadel-42.1;protocol=https" +GIT_URI = "gitsm://github.com/brl/gnome-shell.git;branch=citadel-43.0;protocol=https" GNOMEBASEBUILDCLASS = "meson" @@ -18,9 +18,9 @@ DEPENDS = " \ sassc-native \ gtk4 \ mutter \ - gcr \ + gcr4 \ gjs \ - mozjs-91 \ + mozjs-102 \ network-manager-applet \ gnome-autoar \ polkit \ diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_41.0.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_43.0.bb similarity index 86% rename from meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_41.0.bb rename to meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_43.0.bb index 55cf362..5e5af99 100644 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_41.0.bb +++ b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_43.0.bb @@ -17,5 +17,5 @@ def gnome_verdir(v): SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" -SRC_URI[archive.sha256sum] = "77289972e596d044583f0c056306d8f1dbd8adcf912910a50da0a663e65332ed" +SRC_URI[archive.sha256sum] = "5d5568282ab38b95759d425401f7476e56f8cbf2629885587439f43bd0b84bbe" diff --git a/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb b/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.7.bb similarity index 98% rename from meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb rename to meta-gnome/recipes-gnome/gtk4/gtk4_4.6.7.bb index 9f47371..c71be23 100644 --- a/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.4.bb +++ b/meta-gnome/recipes-gnome/gtk4/gtk4_4.6.7.bb @@ -33,7 +33,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" UPSTREAM_CHECK_REGEX = "gtk-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "a79a2bbcc7931b703fc4fa1fcbe1b906e229a1522d854d522801766a79bcac9f" +SRC_URI[sha256sum] = "effd2e7c4b5e2a5c7fad43e0f24adea68baa4092abb0b752caff278e6bb010e8" S = "${WORKDIR}/gtk-${PV}" diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb similarity index 94% rename from meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb rename to meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb index 93f7f57..e8d9f16 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.2.bb @@ -12,10 +12,9 @@ RDEPENDS:${PN} += "gsettings-desktop-schemas" SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.sha256sum] = "cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd" +SRC_URI[archive.sha256sum] = "03d72b8c15ef438110f0cf457b5655266c8b515d0412b30f4d55cfa0da06ac5e" -# depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" EXTRA_OEMESON = " \ -Dbluray=false \ diff --git a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb b/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.0.bb similarity index 86% rename from meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb rename to meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.0.bb index 8ca3be3..7a1f86a 100644 --- a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb +++ b/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.2.0.bb @@ -11,7 +11,7 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gtk-doc vala features_check -SRC_URI[archive.sha256sum] = "491169d4f6a11765328996bc088272d05c7235453bc0ee73c20dfd4bd67b401c" +SRC_URI[archive.sha256sum] = "322f3e1be39ba67981d9fe7228a85818eccaa2ed0aa42bcafe263af881c6460c" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb b/meta-gnome/recipes-gnome/libgee/libgee_0.20.6.bb similarity index 77% rename from meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb rename to meta-gnome/recipes-gnome/libgee/libgee_0.20.6.bb index 0011b04..f7b54b9 100644 --- a/meta-gnome/recipes-gnome/libgee/libgee_0.20.4.bb +++ b/meta-gnome/recipes-gnome/libgee/libgee_0.20.6.bb @@ -18,5 +18,4 @@ do_configure:prepend() { done } -SRC_URI[archive.md5sum] = "4d7d6f1f8054f1b3466c752ac2e50946" -SRC_URI[archive.sha256sum] = "524c1bf390f9cdda4fbd9a47b269980dc64ab5280f0801b53bc69d782c72de0e" +SRC_URI[archive.sha256sum] = "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d" diff --git a/meta-gnome/recipes-gnome/mutter/mutter_42.1.bb b/meta-gnome/recipes-gnome/mutter/mutter_43.0.bb similarity index 93% rename from meta-gnome/recipes-gnome/mutter/mutter_42.1.bb rename to meta-gnome/recipes-gnome/mutter/mutter_43.0.bb index 0af2748..ff00c79 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_42.1.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_43.0.bb @@ -37,10 +37,10 @@ DEPENDS = " \ RDEPENDS:${PN} += " xwayland zenity" -SRCREV = "3d11fd8cc0a3d64071ac1cdec34aabd795fe6a5d" +SRCREV = "901190c5a5edbef9c41f8101f3b9ded50ea26c9e" EXTERNAL_TREE_VAR="CITADEL_MUTTER_PATH" -GIT_URI = "git://github.com/brl/mutter.git;branch=citadel-42.1;protocol=https" +GIT_URI = "git://github.com/brl/mutter.git;branch=citadel-43.0;protocol=https" GNOMEBASEBUILDCLASS = "meson" @@ -65,7 +65,7 @@ EXTRA_OEMESON += " \ -Dgles2_libname=libGLESv2.so.2 \ " -MUTTER_API_NAME = "mutter-10" +MUTTER_API_NAME = "mutter-11" do_install:append() { # Add gir links in standard paths. That makes dependents life much easier diff --git a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb b/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb deleted file mode 100644 index 1ee6ddb..0000000 --- a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SRC_URI[archive.md5sum] = "ece4547298a81105f307369d73c21b9d" -SRC_URI[archive.sha256sum] = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9" - -DEPENDS = "glib-2.0 libsoup-2.4 libxml2" - -inherit gnomebase gtk-icon-cache gconf mime - -EXTRA_OECONF = "--enable-introspection=no" - diff --git a/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb new file mode 100644 index 0000000..2256a18 --- /dev/null +++ b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "library to access web services that claim to be "RESTful"" +HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + gi-docgen \ + gi-docgen-native \ + glib-2.0 \ + glib-2.0-native \ + json-glib \ + libxml2-native \ +" + +inherit gnomebase gobject-introspection vala pkgconfig + +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" + +PACKAGECONFIG[soup2] = "-Dsoup2=true,,libsoup-2.4" +PACKAGECONFIG[soup3] = "-Dsoup2=false,,libsoup-3.0" + +SRC_URI[archive.sha256sum] = "85b2bc9341128139539b53ee53f0533310bc96392fd645863a040410b81ebe66" diff --git a/meta-gnome/recipes-support/ell/ell_0.50.bb b/meta-gnome/recipes-support/ell/ell_0.50.bb deleted file mode 100644 index 243ac01..0000000 --- a/meta-gnome/recipes-support/ell/ell_0.50.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Embedded Linux Library" -HOMEPAGE = "https://01.org/ell" -DESCRIPTION = "The Embedded Linux Library (ELL) provides core, \ -low-level functionality for system daemons. It typically has no \ -dependencies other than the Linux kernel, C standard library, and \ -libdl (for dynamic linking). While ELL is designed to be efficient \ -and compact enough for use on embedded Linux platforms, it is not \ -limited to resource-constrained systems." -SECTION = "libs" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" - -DEPENDS = "dbus" - -inherit autotools pkgconfig - -SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ - " -SRC_URI[sha256sum] = "0fe51d51c6eddc2a2784092f1dfdd1143a5ef27f15c274ecfbadd680d3a72fd9" - -do_configure:prepend () { - mkdir -p ${S}/build-aux -} diff --git a/meta-gnome/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch b/meta-gnome/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch new file mode 100644 index 0000000..96146a1 --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch @@ -0,0 +1,40 @@ +From 04d5f4805a86302a0e135a28d58a6c1ff6a68d52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 30 Jul 2020 23:03:51 +0200 +Subject: [PATCH] Use compiler -fcf-protection only if compiler/arch supports + it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There have been some PRs they were either rejected or some general suggestion +for more flags suggested. So + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + cmake/compilerFlags.cmake | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake +index 12caf42..455525e 100644 +--- a/cmake/compilerFlags.cmake ++++ b/cmake/compilerFlags.cmake +@@ -26,7 +26,12 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN + # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0 + if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) ) + if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) +- add_compile_options(-fstack-clash-protection -fcf-protection) ++ # Gcc does support -fcf-protection on few arches only ++ CHECK_CXX_COMPILER_FLAG(-fcf-protection COMPILER_SUPPORTS_FCF_PROTECTION) ++ if (COMPILER_SUPPORTS_FCF_PROTECTION) ++ add_compile_options(-fcf-protection) ++ endif() ++ add_compile_options(-fstack-clash-protection) + endif() + + if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8 +-- +2.21.3 + diff --git a/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29457.patch b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29457.patch new file mode 100644 index 0000000..e5d0694 --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29457.patch @@ -0,0 +1,26 @@ +From 13e5a3e02339b746abcaee6408893ca2fd8e289d Mon Sep 17 00:00:00 2001 +From: Pydera +Date: Thu, 8 Apr 2021 17:36:16 +0200 +Subject: [PATCH] Fix out of buffer access in #1529 + +--- + src/jp2image.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index 88ab9b2d6..12025f966 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -776,9 +776,10 @@ static void boxes_check(size_t b,size_t m) + #endif + box.length = (uint32_t) (io_->size() - io_->tell() + 8); + } +- if (box.length == 1) ++ if (box.length < 8) + { +- // FIXME. Special case. the real box size is given in another place. ++ // box is broken, so there is nothing we can do here ++ throw Error(kerCorruptedMetadata); + } + + // Read whole box : Box header + Box data (not fixed size - can be null). diff --git a/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29458.patch b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29458.patch new file mode 100644 index 0000000..285f6fe --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29458.patch @@ -0,0 +1,37 @@ +From 9b7a19f957af53304655ed1efe32253a1b11a8d0 Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Fri, 9 Apr 2021 13:37:48 +0100 +Subject: [PATCH] Fix integer overflow. +--- + src/crwimage_int.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp +index aefaf22..2e3e507 100644 +--- a/src/crwimage_int.cpp ++++ b/src/crwimage_int.cpp +@@ -559,7 +559,7 @@ namespace Exiv2 { + void CiffComponent::setValue(DataBuf buf) + { + if (isAllocated_) { +- delete pData_; ++ delete[] pData_; + pData_ = 0; + size_ = 0; + } +@@ -1167,7 +1167,11 @@ namespace Exiv2 { + pCrwMapping->crwDir_); + if (edX != edEnd || edY != edEnd || edO != edEnd) { + uint32_t size = 28; +- if (cc && cc->size() > size) size = cc->size(); ++ if (cc) { ++ if (cc->size() < size) ++ throw Error(kerCorruptedMetadata); ++ size = cc->size(); ++ } + DataBuf buf(size); + std::memset(buf.pData_, 0x0, buf.size_); + if (cc) std::memcpy(buf.pData_ + 8, cc->pData() + 8, cc->size() - 8); +-- +2.25.1 + diff --git a/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29463.patch b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29463.patch new file mode 100644 index 0000000..5ab64a7 --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29463.patch @@ -0,0 +1,120 @@ +From 783b3a6ff15ed6f82a8f8e6c8a6f3b84a9b04d4b Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Mon, 19 Apr 2021 18:06:00 +0100 +Subject: [PATCH] Improve bound checking in WebPImage::doWriteMetadata() + +--- + src/webpimage.cpp | 41 ++++++++++++++++++++++++++++++----------- + 1 file changed, 30 insertions(+), 11 deletions(-) + +diff --git a/src/webpimage.cpp b/src/webpimage.cpp +index 4ddec544c..fee110bca 100644 +--- a/src/webpimage.cpp ++++ b/src/webpimage.cpp +@@ -145,7 +145,7 @@ namespace Exiv2 { + DataBuf chunkId(WEBP_TAG_SIZE+1); + chunkId.pData_ [WEBP_TAG_SIZE] = '\0'; + +- io_->read(data, WEBP_TAG_SIZE * 3); ++ readOrThrow(*io_, data, WEBP_TAG_SIZE * 3, Exiv2::kerCorruptedMetadata); + uint64_t filesize = Exiv2::getULong(data + WEBP_TAG_SIZE, littleEndian); + + /* Set up header */ +@@ -185,13 +185,20 @@ namespace Exiv2 { + case we have any exif or xmp data, also check + for any chunks with alpha frame/layer set */ + while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { +- io_->read(chunkId.pData_, WEBP_TAG_SIZE); +- io_->read(size_buff, WEBP_TAG_SIZE); +- long size = Exiv2::getULong(size_buff, littleEndian); ++ readOrThrow(*io_, chunkId.pData_, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); ++ readOrThrow(*io_, size_buff, WEBP_TAG_SIZE, Exiv2::kerCorruptedMetadata); ++ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); ++ ++ // Check that `size_u32` is safe to cast to `long`. ++ enforce(size_u32 <= static_cast(std::numeric_limits::max()), ++ Exiv2::kerCorruptedMetadata); ++ const long size = static_cast(size_u32); + DataBuf payload(size); +- io_->read(payload.pData_, payload.size_); +- byte c; +- if ( payload.size_ % 2 ) io_->read(&c,1); ++ readOrThrow(*io_, payload.pData_, payload.size_, Exiv2::kerCorruptedMetadata); ++ if ( payload.size_ % 2 ) { ++ byte c; ++ readOrThrow(*io_, &c, 1, Exiv2::kerCorruptedMetadata); ++ } + + /* Chunk with information about features + used in the file. */ +@@ -199,6 +206,7 @@ namespace Exiv2 { + has_vp8x = true; + } + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X) && !has_size) { ++ enforce(size >= 10, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf[WEBP_TAG_SIZE]; + +@@ -227,6 +235,7 @@ namespace Exiv2 { + } + #endif + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8) && !has_size) { ++ enforce(size >= 10, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf[2]; + +@@ -244,11 +253,13 @@ namespace Exiv2 { + + /* Chunk with with lossless image data. */ + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_alpha) { ++ enforce(size >= 5, Exiv2::kerCorruptedMetadata); + if ((payload.pData_[4] & WEBP_VP8X_ALPHA_BIT) == WEBP_VP8X_ALPHA_BIT) { + has_alpha = true; + } + } + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8L) && !has_size) { ++ enforce(size >= 5, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf_w[2]; + byte size_buf_h[3]; +@@ -276,11 +287,13 @@ namespace Exiv2 { + + /* Chunk with animation frame. */ + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_alpha) { ++ enforce(size >= 6, Exiv2::kerCorruptedMetadata); + if ((payload.pData_[5] & 0x2) == 0x2) { + has_alpha = true; + } + } + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_ANMF) && !has_size) { ++ enforce(size >= 12, Exiv2::kerCorruptedMetadata); + has_size = true; + byte size_buf[WEBP_TAG_SIZE]; + +@@ -309,16 +322,22 @@ namespace Exiv2 { + + io_->seek(12, BasicIo::beg); + while ( !io_->eof() && (uint64_t) io_->tell() < filesize) { +- io_->read(chunkId.pData_, 4); +- io_->read(size_buff, 4); ++ readOrThrow(*io_, chunkId.pData_, 4, Exiv2::kerCorruptedMetadata); ++ readOrThrow(*io_, size_buff, 4, Exiv2::kerCorruptedMetadata); ++ ++ const uint32_t size_u32 = Exiv2::getULong(size_buff, littleEndian); + +- long size = Exiv2::getULong(size_buff, littleEndian); ++ // Check that `size_u32` is safe to cast to `long`. ++ enforce(size_u32 <= static_cast(std::numeric_limits::max()), ++ Exiv2::kerCorruptedMetadata); ++ const long size = static_cast(size_u32); + + DataBuf payload(size); +- io_->read(payload.pData_, size); ++ readOrThrow(*io_, payload.pData_, size, Exiv2::kerCorruptedMetadata); + if ( io_->tell() % 2 ) io_->seek(+1,BasicIo::cur); // skip pad + + if (equalsWebPTag(chunkId, WEBP_CHUNK_HEADER_VP8X)) { ++ enforce(size >= 1, Exiv2::kerCorruptedMetadata); + if (has_icc){ + payload.pData_[0] |= WEBP_VP8X_ICC_BIT; + } else { diff --git a/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29464.patch b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29464.patch new file mode 100644 index 0000000..f0c4824 --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29464.patch @@ -0,0 +1,72 @@ +From 61734d8842cb9cc59437463e3bac54d6231d9487 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Tue, 18 May 2021 10:52:54 +0900 +Subject: [PATCH] modify + +Signed-off-by: Wang Mingyu +--- + src/jp2image.cpp | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index 52723a4..0ac4f50 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -643,11 +643,11 @@ static void boxes_check(size_t b,size_t m) + void Jp2Image::encodeJp2Header(const DataBuf& boxBuf,DataBuf& outBuf) + { + DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space +- int outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? +- int inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? ++ long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? ++ long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? + Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; +- int32_t length = getLong((byte*)&pBox->length, bigEndian); +- int32_t count = sizeof (Jp2BoxHeader); ++ uint32_t length = getLong((byte*)&pBox->length, bigEndian); ++ uint32_t count = sizeof (Jp2BoxHeader); + char* p = (char*) boxBuf.pData_; + bool bWroteColor = false ; + +@@ -664,6 +664,7 @@ static void boxes_check(size_t b,size_t m) + #ifdef EXIV2_DEBUG_MESSAGES + std::cout << "Jp2Image::encodeJp2Header subbox: "<< toAscii(subBox.type) << " length = " << subBox.length << std::endl; + #endif ++ enforce(subBox.length <= length - count, Exiv2::kerCorruptedMetadata); + count += subBox.length; + newBox.type = subBox.type; + } else { +@@ -672,12 +673,13 @@ static void boxes_check(size_t b,size_t m) + count = length; + } + +- int32_t newlen = subBox.length; ++ uint32_t newlen = subBox.length; + if ( newBox.type == kJp2BoxTypeColorHeader ) { + bWroteColor = true ; + if ( ! iccProfileDefined() ) { + const char* pad = "\x01\x00\x00\x00\x00\x00\x10\x00\x00\x05\x1cuuid"; + uint32_t psize = 15; ++ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + ul2Data((byte*)&newBox.length,psize ,bigEndian); + ul2Data((byte*)&newBox.type ,newBox.type,bigEndian); + ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox)); +@@ -686,6 +688,7 @@ static void boxes_check(size_t b,size_t m) + } else { + const char* pad = "\0x02\x00\x00"; + uint32_t psize = 3; ++ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + ul2Data((byte*)&newBox.length,psize+iccProfile_.size_,bigEndian); + ul2Data((byte*)&newBox.type,newBox.type,bigEndian); + ::memcpy(output.pData_+outlen ,&newBox ,sizeof(newBox) ); +@@ -694,6 +697,7 @@ static void boxes_check(size_t b,size_t m) + newlen = psize + iccProfile_.size_; + } + } else { ++ enforce(newlen <= output.size_ - outlen, Exiv2::kerCorruptedMetadata); + ::memcpy(output.pData_+outlen,boxBuf.pData_+inlen,subBox.length); + } + +-- +2.25.1 + diff --git a/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29470.patch b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29470.patch new file mode 100644 index 0000000..eedf9d7 --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29470.patch @@ -0,0 +1,32 @@ +From 6628a69c036df2aa036290e6cd71767c159c79ed Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Wed, 21 Apr 2021 12:06:04 +0100 +Subject: [PATCH] Add more bounds checks in Jp2Image::encodeJp2Header +--- + src/jp2image.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index b424225..349a9f0 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -645,13 +645,16 @@ static void boxes_check(size_t b,size_t m) + DataBuf output(boxBuf.size_ + iccProfile_.size_ + 100); // allocate sufficient space + long outlen = sizeof(Jp2BoxHeader) ; // now many bytes have we written to output? + long inlen = sizeof(Jp2BoxHeader) ; // how many bytes have we read from boxBuf? ++ enforce(sizeof(Jp2BoxHeader) <= static_cast(output.size_), Exiv2::kerCorruptedMetadata); + Jp2BoxHeader* pBox = (Jp2BoxHeader*) boxBuf.pData_; + uint32_t length = getLong((byte*)&pBox->length, bigEndian); ++ enforce(length <= static_cast(output.size_), Exiv2::kerCorruptedMetadata); + uint32_t count = sizeof (Jp2BoxHeader); + char* p = (char*) boxBuf.pData_; + bool bWroteColor = false ; + + while ( count < length || !bWroteColor ) { ++ enforce(sizeof(Jp2BoxHeader) <= length - count, Exiv2::kerCorruptedMetadata); + Jp2BoxHeader* pSubBox = (Jp2BoxHeader*) (p+count) ; + + // copy data. pointer could be into a memory mapped file which we will decode! +-- +2.25.1 + diff --git a/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29473.patch b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29473.patch new file mode 100644 index 0000000..4afedf8 --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-29473.patch @@ -0,0 +1,21 @@ +From e6a0982f7cd9282052b6e3485a458d60629ffa0b Mon Sep 17 00:00:00 2001 +From: Kevin Backhouse +Date: Fri, 23 Apr 2021 11:44:44 +0100 +Subject: [PATCH] Add bounds check in Jp2Image::doWriteMetadata(). + +--- + src/jp2image.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index 1694fed27..ca8c9ddbb 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -908,6 +908,7 @@ static void boxes_check(size_t b,size_t m) + + case kJp2BoxTypeUuid: + { ++ enforce(boxBuf.size_ >= 24, Exiv2::kerCorruptedMetadata); + if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, 16) == 0) + { + #ifdef EXIV2_DEBUG_MESSAGES diff --git a/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-3482.patch b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-3482.patch new file mode 100644 index 0000000..e7c5e1b --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2/CVE-2021-3482.patch @@ -0,0 +1,54 @@ +From 22ea582c6b74ada30bec3a6b15de3c3e52f2b4da Mon Sep 17 00:00:00 2001 +From: Robin Mills +Date: Mon, 5 Apr 2021 20:33:25 +0100 +Subject: [PATCH] fix_1522_jp2image_exif_asan + +--- + src/jp2image.cpp | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/jp2image.cpp b/src/jp2image.cpp +index eb31cea4a..88ab9b2d6 100644 +--- a/src/jp2image.cpp ++++ b/src/jp2image.cpp +@@ -28,6 +28,7 @@ + #include "image.hpp" + #include "image_int.hpp" + #include "basicio.hpp" ++#include "enforce.hpp" + #include "error.hpp" + #include "futils.hpp" + #include "types.hpp" +@@ -353,7 +354,7 @@ static void boxes_check(size_t b,size_t m) + if (io_->error()) throw Error(kerFailedToReadImageData); + if (bufRead != rawData.size_) throw Error(kerInputDataReadFailed); + +- if (rawData.size_ > 0) ++ if (rawData.size_ > 8) // "II*\0long" + { + // Find the position of Exif header in bytes array. + long pos = ( (rawData.pData_[0] == rawData.pData_[1]) +@@ -497,6 +498,7 @@ static void boxes_check(size_t b,size_t m) + position = io_->tell(); + box.length = getLong((byte*)&box.length, bigEndian); + box.type = getLong((byte*)&box.type, bigEndian); ++ enforce(box.length <= io_->size()-io_->tell() , Exiv2::kerCorruptedMetadata); + + if (bPrint) { + out << Internal::stringFormat("%8ld | %8ld | ", (size_t)(position - sizeof(box)), +@@ -581,12 +583,13 @@ static void boxes_check(size_t b,size_t m) + throw Error(kerInputDataReadFailed); + + if (bPrint) { +- out << Internal::binaryToString(makeSlice(rawData, 0, 40)); ++ out << Internal::binaryToString( ++ makeSlice(rawData, 0, rawData.size_>40?40:rawData.size_)); + out.flush(); + } + lf(out, bLF); + +- if (bIsExif && bRecursive && rawData.size_ > 0) { ++ if (bIsExif && bRecursive && rawData.size_ > 8) { // "II*\0long" + if ((rawData.pData_[0] == rawData.pData_[1]) && + (rawData.pData_[0] == 'I' || rawData.pData_[0] == 'M')) { + BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(rawData.pData_, rawData.size_)); diff --git a/meta-gnome/recipes-support/exiv2/exiv2_0.26.bb b/meta-gnome/recipes-support/exiv2/exiv2_0.26.bb deleted file mode 100644 index b12d963..0000000 --- a/meta-gnome/recipes-support/exiv2/exiv2_0.26.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat" - -SRC_URI = "http://www.exiv2.org/releases/${BPN}-${PV}-trunk.tar.gz" -SRC_URI[md5sum] = "5399e3b570d7f9205f0e76d47582da4c" -SRC_URI[sha256sum] = "c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb" - -inherit cmake gettext - -S = "${WORKDIR}/${BPN}-trunk" - -INSANE_SKIP:${PN} = "useless-rpaths" - -do_install:preend() { - install -d ${D}${mandir} -} diff --git a/meta-gnome/recipes-support/exiv2/exiv2_0.27.3.bb b/meta-gnome/recipes-support/exiv2/exiv2_0.27.3.bb new file mode 100644 index 0000000..1380638 --- /dev/null +++ b/meta-gnome/recipes-support/exiv2/exiv2_0.27.3.bb @@ -0,0 +1,30 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat" + +SRC_URI = "https://exiv2.org/releases/${BPN}-${PV}-Source.tar.gz" +SRC_URI[sha256sum] = "a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778" + +# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either +inherit dos2unix +SRC_URI += "file://0001-Use-compiler-fcf-protection-only-if-compiler-arch-su.patch \ + file://CVE-2021-29457.patch \ + file://CVE-2021-29458.patch \ + file://CVE-2021-29463.patch \ + file://CVE-2021-29464.patch \ + file://CVE-2021-29470.patch \ + file://CVE-2021-29473.patch \ + file://CVE-2021-3482.patch" + +S = "${WORKDIR}/${BPN}-${PV}-Source" + +inherit cmake gettext + +do_install:append:class-target() { + # reproducibility: remove build host path + sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ + -e 's:${STAGING_DIR_HOST}::g' +} + diff --git a/meta-gnome/recipes-support/gcr4/gcr4/0001-Don-t-require-ssh-binaries-for-build.patch b/meta-gnome/recipes-support/gcr4/gcr4/0001-Don-t-require-ssh-binaries-for-build.patch new file mode 100644 index 0000000..0863578 --- /dev/null +++ b/meta-gnome/recipes-support/gcr4/gcr4/0001-Don-t-require-ssh-binaries-for-build.patch @@ -0,0 +1,35 @@ +From eadb72985d59d66684225591ec395610a3877c0b Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 22 Sep 2022 18:01:51 -0400 +Subject: [PATCH] Don't require ssh binaries for build + +--- + meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index ad41582..d16ef48 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,8 +58,8 @@ if p11_system_config_modules == '' + error('Couldn\'t find location for pkcs11 module config') + endif + libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent')) +-ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path() +-ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path() ++#ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path() ++#ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path() + + with_systemd = false + libsystemd_deps = [] +@@ -96,8 +96,8 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm')) + conf.set('HAVE_MLOCK', cc.has_function('mlock')) + conf.set_quoted('GPG_EXECUTABLE', gpg_path) + conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version()) +-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) +-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) ++#conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path) ++#conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path) + conf.set10('WITH_SYSTEMD', with_systemd) + config_file = configure_file( + output: 'config.h', diff --git a/meta-gnome/recipes-support/gcr4/gcr4/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/meta-gnome/recipes-support/gcr4/gcr4/0001-gcr-meson.build-fix-one-parallel-build-failure.patch new file mode 100644 index 0000000..81c4bdb --- /dev/null +++ b/meta-gnome/recipes-support/gcr4/gcr4/0001-gcr-meson.build-fix-one-parallel-build-failure.patch @@ -0,0 +1,37 @@ +From cb3708bad88e713e4ccf705cb8c14c5996cd9d06 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 23 Apr 2021 16:32:38 +0800 +Subject: [PATCH] gcr/meson.build: fix one parallel build failure + +ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing +dependency, following error occurred intermittently during doing parallel +build: + + -o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c ../gcr-3.38.1/ui/gcr-live-search.c +../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No such file or directory + 32 | #include "gcr/gcr-marshal.h" + | ^~~~~~~~~~~~~~~~~~~ +compilation terminated. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/68/diffs] + +Signed-off-by: Changqing Li +--- + gcr/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gcr/meson.build b/gcr/meson.build +index 06c3a63..d9d4b8f 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -181,6 +181,7 @@ gcr_base_dep = declare_dependency( + sources: [ + gcr_enums_gen[1], + gcr_oids[1], ++ gcr_marshal_gen[1], + ], + ) + +-- +2.17.1 + diff --git a/meta-gnome/recipes-support/gcr4/gcr4/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/meta-gnome/recipes-support/gcr4/gcr4/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch new file mode 100644 index 0000000..ae4e2ac --- /dev/null +++ b/meta-gnome/recipes-support/gcr4/gcr4/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch @@ -0,0 +1,61 @@ +From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001 +From: Jakub Jirutka +Date: Wed, 12 Jan 2022 00:24:20 +0100 +Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir + +This argument has been removed in Meson 0.61.0: + + gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages" + +https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de: + +> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it. + +Fixes #89 +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + gck/meson.build | 1 - + gcr/meson.build | 1 - + ui/meson.build | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/gck/meson.build b/gck/meson.build +index 756b486..a21a1e9 100644 +--- a/gck/meson.build ++++ b/gck/meson.build +@@ -131,7 +131,6 @@ if get_option('introspection') + sources: gck_gir_sources, + namespace: 'Gck', + nsversion: '@0@'.format(gck_major_version), +- packages: gck_deps, + export_packages: 'gck-@0@'.format(gck_major_version), + includes: [ 'GObject-2.0', 'Gio-2.0' ], + header: 'gck/gck.h', +diff --git a/gcr/meson.build b/gcr/meson.build +index 2233a44..c83641b 100644 +--- a/gcr/meson.build ++++ b/gcr/meson.build +@@ -190,7 +190,6 @@ if get_option('introspection') + sources: [ gcr_base_public_sources, gcr_base_headers ], + namespace: 'Gcr', + nsversion: '@0@'.format(gcr_major_version), +- packages: gcr_base_deps, + export_packages: 'gcr-base-@0@'.format(gcr_major_version), + includes: [ + 'GObject-2.0', +diff --git a/ui/meson.build b/ui/meson.build +index e656ea2..32ee057 100644 +--- a/ui/meson.build ++++ b/ui/meson.build +@@ -152,7 +152,6 @@ if get_option('introspection') + export_packages: 'gcr-ui-@0@'.format(gcr_major_version), + identifier_prefix: 'Gcr', + symbol_prefix: 'gcr', +- packages: gcr_ui_deps, + includes: [ + 'GObject-2.0', + 'Gio-2.0', +-- +GitLab + diff --git a/meta-gnome/recipes-support/gcr4/gcr4_3.92.0.bb b/meta-gnome/recipes-support/gcr4/gcr4_3.92.0.bb new file mode 100644 index 0000000..7977f34 --- /dev/null +++ b/meta-gnome/recipes-support/gcr4/gcr4_3.92.0.bb @@ -0,0 +1,52 @@ +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 = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" + +DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" + +CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" + +CFLAGS += "-D_GNU_SOURCE" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg +UPSTREAM_CHECK_REGEX = "[^\d\.](?P\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar" + +SRC_URI = "https://download.gnome.org/sources/gcr/3.92/gcr-3.92.0.tar.xz;name=archive" +SRC_URI += " file://0001-Don-t-require-ssh-binaries-for-build.patch" +SRC_URI[archive.sha256sum] = "896abf8e1db0f40eb28073f364f36a72385ac8abf8cd1362b1016e97721ff518" + +S="${WORKDIR}/gcr-${PV}" + +PACKAGECONFIG ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ +" +PACKAGECONFIG[gtk] = "-Dgtk4=true,-Dgtk4=false,gtk4" + +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" + +EXTRA_OEMESON += "--cross-file ${WORKDIR}/meson-${PN}.cross" +EXTRA_OEMESON += "-Dssh_agent=false" +do_write_config:append() { + cat >${WORKDIR}/meson-${PN}.cross < -Date: Sat, 20 Mar 2021 09:22:18 -0700 -Subject: [PATCH] Set vapidir - -Use parentheses instead of braces, it makes automake and perl happy -newer perl does not like ${} for VALAFLAGS - -Unescaped left brace in regex is deprecated here (and will be fatal in Perl 5.30), passed through in regex; marked by <-- HERE in m/^${ <-- HERE abs_top_builddir}/gsound$/ at TOPDIR/build/tmp/work/mips32r2-yoe-linux/gsound/1.0.2-r0/recipe-sysroot-native/usr/bin/automake line 5759. -autoreconf: error: automake failed with exit status: 255 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - tools/Makefile.am | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -8,7 +8,7 @@ bin_PROGRAMS = gsound-play - gsound_play_SOURCES = gsound-play.vala - - gsound_play_VALAFLAGS = \ -- --vapidir ${abs_top_builddir}/gsound \ -+ --vapidir $(abs_top_builddir)/gsound \ - --pkg gsound \ - ${NULL} - diff --git a/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb b/meta-gnome/recipes-support/gsound/gsound_1.0.3.bb similarity index 56% rename from meta-gnome/recipes-support/gsound/gsound_1.0.2.bb rename to meta-gnome/recipes-support/gsound/gsound_1.0.3.bb index 768f1bd..bdef603 100644 --- a/meta-gnome/recipes-support/gsound/gsound_1.0.2.bb +++ b/meta-gnome/recipes-support/gsound/gsound_1.0.3.bb @@ -7,9 +7,8 @@ DEPENDS = " \ libcanberra \ " +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase gettext gobject-introspection vala -SRC_URI += "file://0001-Set-vapidir.patch" - -SRC_URI[archive.md5sum] = "c26fd21c21b9ef6533a202a73fab21db" -SRC_URI[archive.sha256sum] = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53" +SRC_URI[archive.sha256sum] = "ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a" diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index 23f565f..47787c5 100644 --- a/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -10,7 +10,7 @@ PV = "1.5.23+git${SRCPV}" DEPENDS = "unicode-ucd" SRC_URI = " \ - git://github.com/ibus/ibus.git;branch=master;protocol=https \ + git://github.com/ibus/ibus.git;branch=main;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ " SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" diff --git a/meta-gnome/recipes-support/jansson/jansson/0001-Fix-overwriting-linker-flags.patch b/meta-gnome/recipes-support/jansson/jansson/0001-Fix-overwriting-linker-flags.patch new file mode 100644 index 0000000..5eee6f8 --- /dev/null +++ b/meta-gnome/recipes-support/jansson/jansson/0001-Fix-overwriting-linker-flags.patch @@ -0,0 +1,29 @@ +From fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687 Mon Sep 17 00:00:00 2001 +From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> +Date: Thu, 28 Apr 2022 17:36:54 +0200 +Subject: [PATCH] Fix overwriting linker flags + +Upstream-Status: Backport +[https://github.com/akheron/jansson/commit/fe6e8eec7e7df4f1e72f0c9d9337b1fe11236687] +Signed-off-by: Alex Kiernan + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b9ad365f78..ed33e3c47f70 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -342,7 +342,7 @@ if(JANSSON_BUILD_SHARED_LIBS) + ) + list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + if (VSCRIPT_WORKS) +- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/jansson.sym") + endif() + endif() + +-- +2.35.1 + diff --git a/meta-gnome/recipes-support/jansson/jansson/0001-Honour-multilib-paths.patch b/meta-gnome/recipes-support/jansson/jansson/0001-Honour-multilib-paths.patch new file mode 100644 index 0000000..513d109 --- /dev/null +++ b/meta-gnome/recipes-support/jansson/jansson/0001-Honour-multilib-paths.patch @@ -0,0 +1,63 @@ +From e66885e66a2ce7fd916933b12d1ba523a25141e4 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Mon, 3 Oct 2022 13:25:05 +0100 +Subject: [PATCH] Honour multilib paths + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + CMakeLists.txt | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b9ad365f78..bf297e936a72 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,8 +20,8 @@ endif () + + # Set some nicer output dirs. + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin) +-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) +-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib) ++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) ++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) + set(JANSSON_TEMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/tmp) + + # Give the debug version a different postfix for windows, +@@ -573,14 +573,14 @@ endif () + # + + # Allow the user to override installation directories. +-set(JANSSON_INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries") ++set(JANSSON_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries") + set(JANSSON_INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables") + set(JANSSON_INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") + + if(WIN32 AND NOT CYGWIN) + set(DEF_INSTALL_CMAKE_DIR cmake) + else() +- set(DEF_INSTALL_CMAKE_DIR lib/cmake/jansson) ++ set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/jansson) + endif() + + set(JANSSON_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") +@@ -633,8 +633,8 @@ option(JANSSON_INSTALL "Generate installation target" ON) + if (JANSSON_INSTALL) + install(TARGETS jansson + EXPORT janssonTargets +- LIBRARY DESTINATION "lib" +- ARCHIVE DESTINATION "lib" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "bin" + INCLUDES DESTINATION "include") + +@@ -644,7 +644,7 @@ if (JANSSON_INSTALL) + # Install the pkg-config. + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/jansson.pc +- DESTINATION lib/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + # Install the configs. + install(FILES diff --git a/meta-gnome/recipes-support/jansson/jansson_2.12.bb b/meta-gnome/recipes-support/jansson/jansson_2.12.bb deleted file mode 100644 index 3cc353e..0000000 --- a/meta-gnome/recipes-support/jansson/jansson_2.12.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data" -HOMEPAGE = "http://www.digip.org/jansson/" -BUGTRACKER = "https://github.com/akheron/jansson/issues" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=fc2548c0eb83800f29330040e18b5a05" - -SRC_URI = "http://www.digip.org/jansson/releases/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "0ed1f3a924604aae68067c214b0010ef" -SRC_URI[sha256sum] = "5f8dec765048efac5d919aded51b26a32a05397ea207aa769ff6b53c7027d2c9" - -inherit autotools pkgconfig - diff --git a/meta-gnome/recipes-support/jansson/jansson_2.14.bb b/meta-gnome/recipes-support/jansson/jansson_2.14.bb new file mode 100644 index 0000000..8330606 --- /dev/null +++ b/meta-gnome/recipes-support/jansson/jansson_2.14.bb @@ -0,0 +1,20 @@ +SUMMARY = "Jansson is a C library for encoding, decoding and manipulating JSON data" +HOMEPAGE = "http://www.digip.org/jansson/" +BUGTRACKER = "https://github.com/akheron/jansson/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" + +SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ + file://0001-Fix-overwriting-linker-flags.patch \ + file://0001-Honour-multilib-paths.patch \ + " +SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" + +UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P\d+(\.\d+)+)\.tar" + +inherit cmake pkgconfig + +EXTRA_OECMAKE = "-DJANSSON_BUILD_SHARED_LIBS=${@ 'OFF' if d.getVar('DISABLE_STATIC') == '' else 'ON' }" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-support/lcms/lcms_2.9.bb b/meta-gnome/recipes-support/lcms/lcms_2.14.bb similarity index 55% rename from meta-gnome/recipes-support/lcms/lcms_2.9.bb rename to meta-gnome/recipes-support/lcms/lcms_2.14.bb index 433e4e6..eb67144 100644 --- a/meta-gnome/recipes-support/lcms/lcms_2.9.bb +++ b/meta-gnome/recipes-support/lcms/lcms_2.14.bb @@ -1,10 +1,10 @@ SUMMARY = "Little cms is a small-footprint, speed optimized color management engine" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516" +LIC_FILES_CHKSUM = "file://COPYING;md5=ac638b4bc6b67582a11379cfbaeb93dd" + SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz" -SRC_URI[md5sum] = "8de1b7724f578d2995c8fdfa35c3ad0e" -SRC_URI[sha256sum] = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20" +SRC_URI[sha256sum] = "28474ea6f6591c4d4cee972123587001a4e6e353412a41b3e9e82219818d5740" DEPENDS = "tiff" diff --git a/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb b/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.3.bb similarity index 72% rename from meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb rename to meta-gnome/recipes-support/libdvdread/libdvdread_6.1.3.bb index db6cc25..9090cab 100644 --- a/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb +++ b/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.3.bb @@ -4,8 +4,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" -SRC_URI[md5sum] = "09c7423568fb679279fd2a2bc6b10b6e" -SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796" +SRC_URI[sha256sum] = "ce35454997a208cbe50e91232f0e73fb1ac3471965813a13b8730a8f18a15369" inherit autotools lib_package binconfig pkgconfig diff --git a/meta-gnome/recipes-support/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch b/meta-gnome/recipes-support/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch deleted file mode 100644 index 15aa94e..0000000 --- a/meta-gnome/recipes-support/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 94e9a082d76414f82794b0c9817d0c24e3868275 Mon Sep 17 00:00:00 2001 -From: Kylie McClain -Date: Sat, 21 May 2016 21:24:36 -0400 -Subject: [PATCH] ndptool: Fix compilation on musl libc - -FD_ZERO, fd_set, etc are defined within sys/select.h on musl. - -Signed-off-by: Kylie McClain -Signed-off-by: Jiri Pirko ---- - utils/ndptool.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/ndptool.c b/utils/ndptool.c -index 1d96f4c..96479fa 100644 ---- a/utils/ndptool.c -+++ b/utils/ndptool.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - enum verbosity_level { - VERB1, diff --git a/meta-gnome/recipes-support/libndp/libndp_1.6.bb b/meta-gnome/recipes-support/libndp/libndp_1.8.bb similarity index 69% rename from meta-gnome/recipes-support/libndp/libndp_1.6.bb rename to meta-gnome/recipes-support/libndp/libndp_1.8.bb index f924edd..4d4d3e5 100644 --- a/meta-gnome/recipes-support/libndp/libndp_1.6.bb +++ b/meta-gnome/recipes-support/libndp/libndp_1.8.bb @@ -4,10 +4,9 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ - file://0001-include-sys-select.h-for-fd_-definitions.patch \ " -# tag for v1.6 -SRCREV = "2f721c4ff519f38f46695a60d9f9d88f35bf3c1d" +# tag for v1.8 +SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-gnome/recipes-support/mozjs/files/0001-Cargo.toml-do-not-abort-on-panic.patch similarity index 74% rename from meta-gnome/recipes-support/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch rename to meta-gnome/recipes-support/mozjs/files/0001-Cargo.toml-do-not-abort-on-panic.patch index e09848f..d705673 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-Cargo.toml-do-not-abort-on-panic.patch +++ b/meta-gnome/recipes-support/mozjs/files/0001-Cargo.toml-do-not-abort-on-panic.patch @@ -1,4 +1,4 @@ -From 9e37248870b2b955293754933c789ca00bca06ef Mon Sep 17 00:00:00 2001 +From c6e7e983a82b86c08a52bfd11056c1d7e12a3405 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:00:24 +0200 Subject: [PATCH] Cargo.toml: do not abort on panic @@ -7,13 +7,16 @@ OE's rust is configured to unwind, and this setting clashes with it/ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin ---- - Cargo.toml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) +--- + Cargo.toml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index f576534bf3..5ecc17c319 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -51,13 +51,11 @@ opt-level = 1 +@@ -56,13 +56,11 @@ opt-level = 1 rpath = false lto = false debug-assertions = true diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-gnome/recipes-support/mozjs/files/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch similarity index 84% rename from meta-gnome/recipes-support/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch rename to meta-gnome/recipes-support/mozjs/files/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch index a2ccf6b..e68ef1a 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ b/meta-gnome/recipes-support/mozjs/files/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch @@ -1,4 +1,4 @@ -From e5b95b3918588e2930c9af7ba304c57e871b2d55 Mon Sep 17 00:00:00 2001 +From 69ed1f6a4b0199a8c546d7cf4e96b40c13c53e91 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 7 Oct 2021 12:44:18 +0200 Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' @@ -9,15 +9,16 @@ target definitions, and the build fails. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- build/moz.configure/init.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 3a164c6558..99dfc9054a 100644 +index 81f500a0b7..0b7a2ff60f 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -823,7 +823,7 @@ def help_host_target(help, host, target): +@@ -585,7 +585,7 @@ def help_host_target(help, host, target): def config_sub(shell, triplet): config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-gnome/recipes-support/mozjs/files/0001-rewrite-cargo-host-linker-in-python3.patch similarity index 92% rename from meta-gnome/recipes-support/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch rename to meta-gnome/recipes-support/mozjs/files/0001-rewrite-cargo-host-linker-in-python3.patch index 7b93817..2e81b83 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-rewrite-cargo-host-linker-in-python3.patch +++ b/meta-gnome/recipes-support/mozjs/files/0001-rewrite-cargo-host-linker-in-python3.patch @@ -1,4 +1,4 @@ -From 9eceb43dd676afe2f675bd65ab369ba4d14f6537 Mon Sep 17 00:00:00 2001 +From ceb1a6e510b51196005f3df32f12d67a3357a0a1 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 18 Nov 2021 07:16:39 +0000 Subject: [PATCH] Rewrite cargo-host-linker in python3 @@ -18,12 +18,13 @@ rewrite cargo-host-linker in python3 Upstream-Status: Inappropriate [oe specific] Signed-off-by: Changqing Li + --- - build/cargo-host-linker | 24 +++++++--- + build/cargo-host-linker | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/build/cargo-host-linker b/build/cargo-host-linker -index cbd0472bf7..ccd8bffec1 100755 +index cbd0472bf7..87d43ce9ec 100755 --- a/build/cargo-host-linker +++ b/build/cargo-host-linker @@ -1,3 +1,21 @@ @@ -51,6 +52,3 @@ index cbd0472bf7..ccd8bffec1 100755 + args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] + +os.execvp(binary, args) --- -2.33.1 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-gnome/recipes-support/mozjs/files/0001-util.configure-fix-one-occasionally-reproduced-confi.patch similarity index 91% rename from meta-gnome/recipes-support/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch rename to meta-gnome/recipes-support/mozjs/files/0001-util.configure-fix-one-occasionally-reproduced-confi.patch index 5472edd..b56dda3 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0001-util.configure-fix-one-occasionally-reproduced-confi.patch +++ b/meta-gnome/recipes-support/mozjs/files/0001-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -1,4 +1,4 @@ -From b13cad4abc53f816f64c8b0af70cb46820746c72 Mon Sep 17 00:00:00 2001 +From d31fd9daf96809c352c2d701e90665d2f7fe7ffe Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 11 Nov 2021 16:05:54 +0800 Subject: [PATCH] util.configure: fix one occasionally reproduced configure @@ -28,15 +28,16 @@ It should be another process that deleted this file by using Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] Signed-off-by: Changqing Li + --- build/moz.configure/util.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure -index 8f35e89c73..84e256647d 100644 +index 80c3a34522..0ac0c6b611 100644 --- a/build/moz.configure/util.configure +++ b/build/moz.configure/util.configure -@@ -222,7 +222,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): +@@ -216,7 +216,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): "C++": ".cpp", }[language] @@ -45,6 +46,3 @@ index 8f35e89c73..84e256647d 100644 try: source = source.encode("ascii", "replace") --- -2.17.1 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-gnome/recipes-support/mozjs/files/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch similarity index 91% rename from meta-gnome/recipes-support/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch rename to meta-gnome/recipes-support/mozjs/files/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch index c440bf1..db2abd5 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch +++ b/meta-gnome/recipes-support/mozjs/files/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch @@ -1,4 +1,4 @@ -From 749ba11fd6a69c8180945d4866415d16ae06a9c0 Mon Sep 17 00:00:00 2001 +From 129835dbbee86723b3778027026f8df94f40c671 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:02:17 +0200 Subject: [PATCH] rust.configure: do not try to find a suitable upstream target @@ -7,15 +7,16 @@ OE is using custom targets and so this is bound to fail. Upstream-Status: Inapppropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- build/moz.configure/rust.configure | 34 ++---------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure -index cd77d72bb7..4b6481cbe3 100644 +index e64dc5d5ec..edf21baca6 100644 --- a/build/moz.configure/rust.configure +++ b/build/moz.configure/rust.configure -@@ -459,33 +459,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): +@@ -471,33 +471,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): def rust_host_triple( rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target ): @@ -50,7 +51,7 @@ index cd77d72bb7..4b6481cbe3 100644 @depends( -@@ -495,11 +469,7 @@ def rust_host_triple( +@@ -507,11 +481,7 @@ def rust_host_triple( def rust_target_triple( rustc, target, compiler_info, rust_supported_targets, arm_target ): diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch b/meta-gnome/recipes-support/mozjs/files/0004-use-asm-sgidefs.h.patch similarity index 79% rename from meta-gnome/recipes-support/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch rename to meta-gnome/recipes-support/mozjs/files/0004-use-asm-sgidefs.h.patch index b56f0b9..45d64be 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0004-use-asm-sgidefs.h.patch +++ b/meta-gnome/recipes-support/mozjs/files/0004-use-asm-sgidefs.h.patch @@ -1,4 +1,4 @@ -From 65acc8800dba7e10da882871d4648241805c47ce Mon Sep 17 00:00:00 2001 +From 25b9913133c004a263a4951b391046ba80746017 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 Subject: [PATCH] use @@ -18,13 +18,16 @@ Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] Signed-off-by: Andre McCurdy Signed-off-by: Khem Raj Signed-off-by: Vicente Olivert Riera + --- - gdb/mips-linux-nat.c | 2 +- + mfbt/RandomNum.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp +index 23381db0cd..7f127c0715 100644 --- a/mfbt/RandomNum.cpp +++ b/mfbt/RandomNum.cpp -@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PV +@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, # elif defined(__s390__) # define GETRANDOM_NR 349 # elif defined(__mips__) diff --git a/meta-gnome/recipes-support/mozjs/files/0009-moz.configure-do-not-look-for-llvm-dump.patch b/meta-gnome/recipes-support/mozjs/files/0009-moz.configure-do-not-look-for-llvm-dump.patch new file mode 100644 index 0000000..f583fee --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/files/0009-moz.configure-do-not-look-for-llvm-dump.patch @@ -0,0 +1,38 @@ +From bc8a4a04aec1c52ffd28b17ef593f61ef2d84e0d Mon Sep 17 00:00:00 2001 +From: Bruce Leidl +Date: Thu, 22 Sep 2022 19:57:38 -0400 +Subject: [PATCH] moz.configure do not look for llvm-dump + +--- + moz.configure | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/moz.configure b/moz.configure +index 8b74afbabe..d43afbaf2b 100755 +--- a/moz.configure ++++ b/moz.configure +@@ -785,15 +785,15 @@ def llvm_tool(name): + return llvm_tool + + +-llvm_objdump = check_prog( +- "LLVM_OBJDUMP", +- llvm_tool("llvm-objdump"), +- what="llvm-objdump", +- when="--enable-compile-environment", +- paths=clang_search_path, +-) +- +-add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) ++#llvm_objdump = check_prog( ++# "LLVM_OBJDUMP", ++# llvm_tool("llvm-objdump"), ++# what="llvm-objdump", ++# when="--enable-compile-environment", ++# paths=clang_search_path, ++#) ++# ++#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) + + + @depends(llvm_tool("llvm-readelf"), toolchain_prefix) diff --git a/meta-gnome/recipes-support/mozjs/files/fix-musl-build.patch b/meta-gnome/recipes-support/mozjs/files/fix-musl-build.patch new file mode 100644 index 0000000..c8ff37e --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/files/fix-musl-build.patch @@ -0,0 +1,25 @@ +From 3f1b8cef1ba7132d3ffdcf884d799be110eb0636 Mon Sep 17 00:00:00 2001 +From: OpenEmbedded +Date: Thu, 22 Sep 2022 23:20:43 +0000 +Subject: [PATCH] Upstream: No Reason: mozjs60 miscompiles on musl if built + with HAVE_THREAD_TLS_KEYWORD: + https://github.com/void-linux/void-packages/issues/2598 + +--- + js/src/old-configure.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/js/src/old-configure.in b/js/src/old-configure.in +index 8dfd75c63d..c82e580428 100644 +--- a/js/src/old-configure.in ++++ b/js/src/old-configure.in +@@ -839,6 +839,9 @@ if test "$ac_cv_thread_keyword" = yes; then + *-android*|*-linuxandroid*) + : + ;; ++ *-musl*) ++ : ++ ;; + *) + AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) + ;; diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/riscv32.patch b/meta-gnome/recipes-support/mozjs/files/riscv32.patch similarity index 56% rename from meta-gnome/recipes-support/mozjs/mozjs-91/riscv32.patch rename to meta-gnome/recipes-support/mozjs/files/riscv32.patch index fe9c332..e738bd8 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/riscv32.patch +++ b/meta-gnome/recipes-support/mozjs/files/riscv32.patch @@ -1,11 +1,22 @@ -Add RISCV32 support +From 5b595a31c53f9a4e660be9f1c28520d89c1386db Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 22 Sep 2022 23:20:45 +0000 +Subject: [PATCH] Add RISCV32 support Upstream-Status: Pending Signed-off-by: Khem Raj +--- + build/moz.configure/init.configure | 3 +++ + python/mozbuild/mozbuild/configure/constants.py | 2 ++ + .../mozbuild/test/configure/test_toolchain_configure.py | 1 + + 3 files changed, 6 insertions(+) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 0b7a2ff60f..54f8325b44 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -765,6 +765,9 @@ def split_triplet(triplet, allow_msvc=Fa +@@ -524,6 +524,9 @@ def split_triplet(triplet, allow_msvc=False, allow_wasi=False): elif cpu.startswith("aarch64"): canonical_cpu = "aarch64" endianness = "little" @@ -15,9 +26,11 @@ Signed-off-by: Khem Raj elif cpu in ("riscv64", "riscv64gc"): canonical_cpu = "riscv64" endianness = "little" +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index c71460cb20..15bef93e19 100644 --- a/python/mozbuild/mozbuild/configure/constants.py +++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -52,6 +52,7 @@ CPU_bitness = { +@@ -53,6 +53,7 @@ CPU_bitness = { "mips64": 64, "ppc": 32, "ppc64": 64, @@ -25,17 +38,19 @@ Signed-off-by: Khem Raj "riscv64": 64, "s390": 32, "s390x": 64, -@@ -94,6 +95,7 @@ CPU_preprocessor_checks = OrderedDict( +@@ -95,6 +96,7 @@ CPU_preprocessor_checks = OrderedDict( ("m68k", "__m68k__"), ("mips64", "__mips64"), ("mips32", "__mips__"), + ("riscv32", "__riscv && __riscv_xlen == 32"), ("riscv64", "__riscv && __riscv_xlen == 64"), + ("loongarch64", "__loongarch64"), ("sh4", "__sh__"), - ("wasm32", "__wasm32__"), +diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +index 059cde0139..4f9986eb31 100644 --- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py +++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -@@ -1186,6 +1186,7 @@ class LinuxCrossCompileToolchainTest(Bas +@@ -1192,6 +1192,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest): "m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1}, "mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1}, "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91_91.8.0.bb b/meta-gnome/recipes-support/mozjs/mozjs-102_102.3.0.bb similarity index 86% rename from meta-gnome/recipes-support/mozjs/mozjs-91_91.8.0.bb rename to meta-gnome/recipes-support/mozjs/mozjs-102_102.3.0.bb index 9b990ec..6ed9c3a 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-91_91.8.0.bb +++ b/meta-gnome/recipes-support/mozjs/mozjs-102_102.3.0.bb @@ -5,18 +5,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ file://0001-Cargo.toml-do-not-abort-on-panic.patch \ - file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ file://0004-use-asm-sgidefs.h.patch \ file://fix-musl-build.patch \ file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ file://riscv32.patch \ - file://0005-nojit-32bit-arch-fix.patch \ - file://0006-Fix-build-on-powerpc.patch \ file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ - file://0001-rewrite-cargo-host-linker-in-python3.patch \ + file://0001-rewrite-cargo-host-linker-in-python3.patch \ + file://0009-moz.configure-do-not-look-for-llvm-dump.patch \ " -SRC_URI[sha256sum] = "d483a853cbf5c7f93621093432e3dc0b7ed847f2a5318b964828d19f9f087f3a" +SRC_URI[sha256sum] = "308e23b6dcf964e342cf95fd0c8a386127371b620a489ae26e537d728341b55a" S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" @@ -50,7 +48,7 @@ do_configure() { cd ${B} python3 ${S}/configure.py \ --enable-project=js \ - --target=${HOST_SYS} \ + --target=${RUST_HOST_SYS} \ --host=${BUILD_SYS} \ --prefix=${prefix} \ --libdir=${libdir} \ @@ -69,9 +67,9 @@ inherit multilib_script multilib_header MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js91-config" do_install:append() { - oe_multilib_header mozjs-91/js-config.h + oe_multilib_header mozjs-102/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js91-config + -i ${D}${bindir}/js102-config rm -f ${D}${libdir}/libjs_static.ajs } diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch deleted file mode 100644 index 6ff83e3..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0002-moz.configure-do-not-look-for-llvm-objdump.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0133ddb86eb6e0741e02b0032c41468db6438530 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 1 Oct 2021 13:01:10 +0200 -Subject: [PATCH] moz.configure: do not look for llvm-objdump - -This avoid dragging in a dependency that isn't even needed -for js builds. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - moz.configure | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/moz.configure b/moz.configure -index fc66b520d0..15de9a2ee0 100755 ---- a/moz.configure -+++ b/moz.configure -@@ -994,15 +994,15 @@ def llvm_objdump(host_c_compiler, c_compiler, bindgen_config_paths): - return (llvm_objdump,) - - --llvm_objdump = check_prog( -- "LLVM_OBJDUMP", -- llvm_objdump, -- what="llvm-objdump", -- when="--enable-compile-environment", -- paths=clang_search_path, --) -- --add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) -+#llvm_objdump = check_prog( -+# "LLVM_OBJDUMP", -+# llvm_objdump, -+# what="llvm-objdump", -+# when="--enable-compile-environment", -+# paths=clang_search_path, -+#) -+ -+#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) - - - option("--enable-dtrace", help="Build with dtrace support") diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch deleted file mode 100644 index f308b48..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0005-nojit-32bit-arch-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix build when JIT is disabled on 32bit systems - -This fixes a compile time assert -js/src/wasm/WasmFrame.cpp:57:3: error: static_assert failed due to requirement '(__builtin_offsetof(js::wasm::DebugFrame, frame_) + sizeof(js::wasm::Frame)) % Alignment == 0' "Aligned after pushing DebugFrame" - static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, - ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- a/js/src/wasm/WasmFrame.h -+++ b/js/src/wasm/WasmFrame.h -@@ -230,6 +230,8 @@ class DebugFrame { - // Avoid -Wunused-private-field warnings. - protected: - #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ -+ (defined(JS_CODEGEN_NONE) && \ -+ (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ - defined(JS_CODEGEN_X86) || defined(__wasi__) - // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only - // 4-byte aligned, so we add another word to get up to 8-byte diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch deleted file mode 100644 index 80bf746..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/0006-Fix-build-on-powerpc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0e0548e3f95e22a39db8d5b934afe0672a3f801b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 1 Nov 2021 08:13:29 +0100 -Subject: [PATCH] Fix build on powerpc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Another fix for (this time JIT enabled) -| <...>/irefox-91.2.0/js/src/wasm/WasmFrame.cpp:57:76: error: static assertion failed: Aligned after pushing DebugFrame -| 57 | static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, -| | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller ---- - js/src/wasm/WasmFrame.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h -index 893762e..2d90656 100644 ---- a/js/src/wasm/WasmFrame.h -+++ b/js/src/wasm/WasmFrame.h -@@ -232,7 +232,7 @@ class DebugFrame { - #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ - (defined(JS_CODEGEN_NONE) && \ - (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ -- defined(JS_CODEGEN_X86) || defined(__wasi__) -+ defined(JS_CODEGEN_X86) || defined(__wasi__) || defined(__powerpc__) - // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only - // 4-byte aligned, so we add another word to get up to 8-byte - // alignment. --- -2.31.1 - diff --git a/meta-gnome/recipes-support/mozjs/mozjs-91/fix-musl-build.patch b/meta-gnome/recipes-support/mozjs/mozjs-91/fix-musl-build.patch deleted file mode 100644 index c0834af..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-91/fix-musl-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream: No -Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: -https://github.com/void-linux/void-packages/issues/2598 ---- a/js/src/old-configure.in -+++ b/js/src/old-configure.in -@@ -1072,6 +1072,9 @@ if test "$ac_cv_thread_keyword" = yes; t - *-android*|*-linuxandroid*) - : - ;; -+ *-musl*) -+ : -+ ;; - *) - AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) - ;; diff --git a/meta-gnome/recipes-support/power-profiles-daemon/power-profiles-daemon_0.12.bb b/meta-gnome/recipes-support/power-profiles-daemon/power-profiles-daemon_0.12.bb new file mode 100644 index 0000000..d4b05b7 --- /dev/null +++ b/meta-gnome/recipes-support/power-profiles-daemon/power-profiles-daemon_0.12.bb @@ -0,0 +1,26 @@ +SUMMARY = "Makes power profiles handling available over D-Bus." +DESCRIPTION = "power-profiles-daemon offers to modify system behaviour based upon user-selected power profiles." +HOMEPAGE = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/archive/${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "4c01dc51cd734403af868cff2d13923c83076c477d7f02c601f3a5127dd82a18" + +DEPENDS = "polkit upower" +inherit meson systemd gtk-doc features_check +REQUIRED_DISTRO_FEATURES = "polkit systemd" +GTKDOC_MESON_OPTION = "gtk_doc" + +SYSTEMD_SERVICE:${PN} = "power-profiles-daemon.service" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ +" + +do_install:append () { + # remove unneeded python utility + rm ${D}${bindir}/powerprofilesctl + rm -rf ${D}${bindir} +} diff --git a/meta-gnome/recipes-support/xwayland/xwayland_22.1.4.bb b/meta-gnome/recipes-support/xwayland/xwayland_22.1.4.bb new file mode 100644 index 0000000..8597d07 --- /dev/null +++ b/meta-gnome/recipes-support/xwayland/xwayland_22.1.4.bb @@ -0,0 +1,45 @@ +SUMMARY = "XWayland is an X Server that runs under Wayland." +DESCRIPTION = "XWayland is an X Server running as a Wayland client, \ +and thus is capable of displaying native X11 client applications in a \ +Wayland compositor environment. The goal of XWayland is to facilitate \ +the transition from X Window System to Wayland environments, providing \ +a way to run unported applications in the meantime." +HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" + +SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" +SRC_URI[sha256sum] = "5c39bdd77444c3fa7a0e2ef317ae69ddde89a901dc8914dbc8eac39a9313512a" + +UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" + +inherit meson features_check pkgconfig +REQUIRED_DISTRO_FEATURES = "x11 opengl" + +DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" + +OPENGL_PKGCONFIGS = "glx glamor dri3" +PACKAGECONFIG ??= "${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ +" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" +PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" +PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" +PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" +PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" + +# Xorg requires a SHA1 implementation, pick one +XORG_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" + +do_install:append() { + # remove files not needed and clashing with xserver-xorg + rm -rf ${D}/${libdir}/xorg/ +} + +FILES:${PN} += "${libdir}/xorg/protocol.txt" + +RDEPENDS:${PN} += "xkbcomp" diff --git a/meta-intel b/meta-intel index fb23bc3..323fee2 160000 --- a/meta-intel +++ b/meta-intel @@ -1 +1 @@ -Subproject commit fb23bc3e661685383edd3026e21ca25825c48bc4 +Subproject commit 323fee2ce0efd8f3f152236d973b80f79eb3933a diff --git a/poky b/poky index 8c48960..5200799 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit 8c489602f218bcf21de0d3c9f8cf620ea5f06430 +Subproject commit 5200799866b92259e855051112520006e1aaaac0 diff --git a/setup-build-env b/setup-build-env index d4bee60..54f7fc5 100644 --- a/setup-build-env +++ b/setup-build-env @@ -13,6 +13,6 @@ if [ -z "$ZSH_NAME" ] && [ "$0" = "$THIS_SCRIPT" ]; then exit 1 fi -TEMPLATECONF=../meta-citadel/conf +TEMPLATECONF=../meta-citadel/conf/templates/default . poky/oe-init-build-env