From aa1fe591c28edef204ba0bfa27aa32c2f373593e Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 28 Jan 2022 11:37:03 +0000 Subject: [PATCH 01/14] cups: update to 2.4.2 --- packages/addons/addon-depends/chrome-depends/cups/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/cups/package.mk b/packages/addons/addon-depends/chrome-depends/cups/package.mk index 0130e1dea6..7f22110acd 100644 --- a/packages/addons/addon-depends/chrome-depends/cups/package.mk +++ b/packages/addons/addon-depends/chrome-depends/cups/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cups" -PKG_VERSION="2.4.0" -PKG_SHA256="36338ebdc6e8b1d4af26471230c479ce4d691a11f90bb42ac6822d4f2bf002c5" +PKG_VERSION="2.4.2" +PKG_SHA256="7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682" PKG_LICENSE="GPL" PKG_SITE="http://www.cups.org" PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz" From 6c90b4fa1350eefc0724eb695c7074ce54a729d1 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 6 Feb 2022 12:32:44 +0000 Subject: [PATCH 02/14] gdk-pixbuf: reintroduce conditional libX11 to support chrome update to conditionally build the /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders when building with libX11 for DISPLAYSERVER = x11. These are required for the chrome addon. Co-authored-by: mglae --- .../chrome-depends/gdk-pixbuf/package.mk | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk index 64e73464cd..b885e3a92a 100644 --- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk @@ -12,10 +12,21 @@ PKG_DEPENDS_TARGET="toolchain glib libjpeg-turbo libpng jasper shared-mime-info PKG_DEPENDS_CONFIG="shared-mime-info" PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation." -PKG_MESON_OPTS_TARGET="-Dbuiltin_loaders=all \ - -Dgtk_doc=false \ - -Ddocs=false \ - -Dintrospection=disabled \ - -Dman=false \ - -Drelocatable=false \ - -Dinstalled_tests=false" +configure_package() { + if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libX11" + fi +} + +pre_configure_target() { + PKG_MESON_OPTS_TARGET="-Dgtk_doc=false \ + -Ddocs=false \ + -Dintrospection=disabled \ + -Dman=false \ + -Drelocatable=false \ + -Dinstalled_tests=false" + + if [ "${DISPLAYSERVER}" != "x11" ]; then + PKG_MESON_OPTS_TARGET+=" -Dbuiltin_loaders=all" + fi +} From f245a8fbd09ff0114059b5347c950987f13ab3e9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 4 Mar 2022 21:00:56 +0000 Subject: [PATCH 03/14] gtk3: update to 3.24.34 --- packages/addons/addon-depends/chrome-depends/gtk3/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk index 402dd3c9cf..305a4c2ccc 100644 --- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gtk3" -PKG_VERSION="3.24.31" -PKG_SHA256="423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9" +PKG_VERSION="3.24.34" +PKG_SHA256="dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz" From ccca7222cf8e6c640d2e3a91b3a5862c19dec94b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 8 Apr 2022 12:20:04 +0000 Subject: [PATCH 04/14] icu: update to 71.1 --- packages/addons/addon-depends/icu/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/icu/package.mk b/packages/addons/addon-depends/icu/package.mk index ed9d30f935..f186213823 100644 --- a/packages/addons/addon-depends/icu/package.mk +++ b/packages/addons/addon-depends/icu/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="icu" -PKG_VERSION="70.1" -PKG_SHA256="f30d670bdc03ba999638a2d2511952ab94adf204d0e14898666f2e0cacb7fef1" +PKG_VERSION="71.1" +PKG_SHA256="d88a4ea7a4a28b445bb073a6cfeb2a296bf49a4a2fe5f1b49f87ecb4fc55c51d" PKG_LICENSE="Custom" PKG_SITE="https://icu.unicode.org" PKG_URL="https://github.com/unicode-org/icu/archive/release-${PKG_VERSION//./-}.tar.gz" From fdc377fd8a139ccc020ad503de1e1c5f8b75d775 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 11 Feb 2022 08:51:18 +0000 Subject: [PATCH 05/14] pango: update to 1.50.8 --- packages/addons/addon-depends/chrome-depends/pango/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/pango/package.mk b/packages/addons/addon-depends/chrome-depends/pango/package.mk index debf52eeba..674fad3328 100644 --- a/packages/addons/addon-depends/chrome-depends/pango/package.mk +++ b/packages/addons/addon-depends/chrome-depends/pango/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pango" -PKG_VERSION="1.50.3" -PKG_SHA256="4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c" +PKG_VERSION="1.50.8" +PKG_SHA256="cf626f59dd146c023174c4034920e9667f1d25ac2c1569516d63136c311255fa" PKG_LICENSE="GPL" PKG_SITE="http://www.pango.org/" PKG_URL="https://download.gnome.org/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz" From ed1a003f5082fb0724514f45268e613e3839a84f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 18 Mar 2022 20:25:07 +0000 Subject: [PATCH 06/14] at-spi2-core: update to 2.45.1 --- .../addon-depends/chrome-depends/at-spi2-core/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk index 577f641499..e4b0ef2a8f 100644 --- a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk +++ b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="at-spi2-core" -PKG_VERSION="2.42.0" -PKG_SHA256="4b5da10e94fa3c6195f95222438f63a0234b99ef9df772c7640e82baeaa6e386" +PKG_VERSION="2.45.1" +PKG_SHA256="ba95f346e93108fbb3462c62437081d582154db279b4052dedc52a706828b192" PKG_LICENSE="OSS" PKG_SITE="http://www.gnome.org/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz" +PKG_URL="https://download.gnome.org/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst" PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi." From aac20b0ba42ee9d4d72c35b92459cccacc7d05ef Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 24 Mar 2022 15:58:14 +0000 Subject: [PATCH 07/14] atk: update to 2.38.0 --- packages/addons/addon-depends/chrome-depends/atk/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/atk/package.mk b/packages/addons/addon-depends/chrome-depends/atk/package.mk index 456b6617b4..c47f79d889 100644 --- a/packages/addons/addon-depends/chrome-depends/atk/package.mk +++ b/packages/addons/addon-depends/chrome-depends/atk/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="atk" -PKG_VERSION="2.36.0" -PKG_SHA256="fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788" +PKG_VERSION="2.38.0" +PKG_SHA256="ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36" PKG_LICENSE="GPL" PKG_SITE="http://library.gnome.org/devel/atk/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-${PKG_VERSION}.tar.xz" From 1abe35aeda85064d4323a2930541e13bd479bb9c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 18 Mar 2022 20:27:52 +0000 Subject: [PATCH 08/14] gdk-pixbuf: update to 2.42.8 --- .../addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk index b885e3a92a..a7b47f5bef 100644 --- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gdk-pixbuf" -PKG_VERSION="2.42.6" -PKG_SHA256="c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" +PKG_VERSION="2.42.8" +PKG_SHA256="84acea3acb2411b29134b32015a5b1aaa62844b19c4b1ef8b8971c6b0759f4c6" PKG_LICENSE="OSS" PKG_SITE="http://www.gtk.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-${PKG_VERSION}.tar.xz" From bc005a1cfb222cd81f88ae96cf6c1e02d6d6161a Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 4 Apr 2022 10:17:36 +0000 Subject: [PATCH 09/14] libXcursor: update to 1.2.1 --- .../addon-depends/chrome-depends/libXcursor/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk index 52ffe61876..3649bb06bb 100644 --- a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXcursor" -PKG_VERSION="1.2.0" -PKG_SHA256="3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782" +PKG_VERSION="1.2.1" +PKG_SHA256="46c143731610bafd2070159a844571b287ac26192537d047a39df06155492104" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender" PKG_LONGDESC="X11 Cursor management library.s" PKG_BUILD_FLAGS="+pic -sysroot" From 8de0e5db59cd75361e7697f645dc9593549ab261 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 24 Jul 2022 02:33:26 +0000 Subject: [PATCH 10/14] harfbuzz: update to 5.0.1 release notes: https://github.com/harfbuzz/harfbuzz/releases/tag/5.0.0 https://github.com/harfbuzz/harfbuzz/releases/tag/5.0.1 --- packages/graphics/harfbuzz/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/harfbuzz/package.mk b/packages/graphics/harfbuzz/package.mk index 667ae01e0a..9990895c05 100644 --- a/packages/graphics/harfbuzz/package.mk +++ b/packages/graphics/harfbuzz/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="harfbuzz" -PKG_VERSION="4.4.1" -PKG_SHA256="c5bc33ac099b2e52f01d27cde21cee4281b9d5bfec7684135e268512478bc9ee" +PKG_VERSION="5.0.1" +PKG_SHA256="d0094299a36346b9f5540aa159b358425c022b19fcdf72165eaf94046a179166" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PKG_VERSION}/harfbuzz-${PKG_VERSION}.tar.xz" From 743564f32e6f50ca3b9734e7f8f07bf248c97650 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 13 Feb 2022 08:31:17 +0000 Subject: [PATCH 11/14] jasper: update to 3.0.6 --- packages/addons/addon-depends/jasper/package.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/jasper/package.mk b/packages/addons/addon-depends/jasper/package.mk index 102781e9b6..757694e6cb 100644 --- a/packages/addons/addon-depends/jasper/package.mk +++ b/packages/addons/addon-depends/jasper/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="jasper" -PKG_VERSION="2.0.33" -PKG_SHA256="38b8f74565ee9e7fec44657e69adb5c9b2a966ca5947ced5717cde18a7d2eca6" +PKG_VERSION="3.0.6" +PKG_SHA256="c79961bc00158f5b5dc5f5fcfa792fde9bebb024432689d0f9e3f95a097d0ec3" PKG_LICENSE="OpenSource" PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/" PKG_URL="https://github.com/jasper-software/jasper/archive/refs/tags/version-${PKG_VERSION}.tar.gz" @@ -14,4 +14,9 @@ PKG_BUILD_FLAGS="+pic" PKG_CMAKE_OPTS_TARGET="-DJAS_ENABLE_DOC=false \ -DJAS_ENABLE_PROGRAMS=false \ - -DJAS_ENABLE_SHARED=false" + -DJAS_ENABLE_SHARED=false \ + -DJAS_STDC_VERSION=201710L" + +pre_configure_target() { + export CFLAGS="${CFLAGS} -std=gnu17" +} From f64ae4f2233eda1d124a5be4173e1f10f60ebcfa Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 6 Feb 2022 11:19:13 +0000 Subject: [PATCH 12/14] chrome: update to 103.0.5060.134 and addon (113) Signed-off-by: Rudi Heitbaum --- packages/addons/browser/chrome/changelog.txt | 15 ++++++++++++++- packages/addons/browser/chrome/package.mk | 4 ++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/addons/browser/chrome/changelog.txt b/packages/addons/browser/chrome/changelog.txt index ef1e3670c2..6512ab9068 100644 --- a/packages/addons/browser/chrome/changelog.txt +++ b/packages/addons/browser/chrome/changelog.txt @@ -1,6 +1,19 @@ +113 +- at-spi2-core: update to 2.45.1 +- atk: update to 2.38.0 +- chrome: update to 103.0.5060.134 +- cups: update to 2.4.2 +- gdk-pixbuf: update to 2.42.8 +- gtk3: update to 3.24.34 +- harfbuzz: update to 5.0.1 +- icu: update to 71.1 +- jasper: update to 3.0.6 +- libXcursor: update to 1.2.1 +- pango: update to 1.50.8 + 112 - chrome: update to 97.0.4692.71 -- cups: update to 2.4.02 +- cups: update to 2.4.0 - gtk3: update to 3.24.31 - harfbuzz: update to 3.2.0 - icu: update to 70.1 and PKG_SITE diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 03005b3beb..7d8f93384f 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -4,8 +4,8 @@ PKG_NAME="chrome" PKG_VERSION="1.0" # curl -s http://dl.google.com/linux/chrome/deb/dists/stable/main/binary-amd64/Packages | grep -B 1 Version -PKG_VERSION_NUMBER="97.0.4692.71" -PKG_REV="111" +PKG_VERSION_NUMBER="103.0.5060.134" +PKG_REV="113" PKG_ARCH="x86_64" PKG_LICENSE="Custom" PKG_SITE="http://www.google.com/chrome" From d081d58df37beda5f130ce8ed6e31901cbdde651 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 8 May 2022 14:11:02 +0000 Subject: [PATCH 13/14] chrome: gdk-pixbuf-modules are now included in the gdk-pixbuf shared library note: - https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/179 --- packages/addons/browser/chrome/package.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 7d8f93384f..8333fd3c8b 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -29,14 +29,11 @@ make_target() { } addon() { - mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,config,gdk-pixbuf-modules,lib} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,config,lib} # config cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config - # gdk-pixbuf modules - cp -PL $(get_install_dir gdk-pixbuf)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* ${ADDON_BUILD}/${PKG_ADDON_ID}/gdk-pixbuf-modules - # unclutter cp -P $(get_install_dir unclutter)/usr/bin/unclutter ${ADDON_BUILD}/${PKG_ADDON_ID}/bin From 54099db87321e80ae0b3e02517b62b75fef2f6df Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 26 Jul 2022 22:19:26 +0000 Subject: [PATCH 14/14] json-glib: build depends on glib-mkenums from glib:host --- .../addons/addon-depends/chrome-depends/json-glib/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/chrome-depends/json-glib/package.mk b/packages/addons/addon-depends/chrome-depends/json-glib/package.mk index cf13889458..684b32d0db 100644 --- a/packages/addons/addon-depends/chrome-depends/json-glib/package.mk +++ b/packages/addons/addon-depends/chrome-depends/json-glib/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="bf4d1cd6c343ce13b9258e6703a0411a3b659887b65877e85a2aa488ae18b865" PKG_LICENSE="LGPL-2.1" PKG_SITE="https://github.com/GNOME/json-glib" PKG_URL="https://github.com/GNOME/json-glib/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain glib" +PKG_DEPENDS_TARGET="toolchain glib glib:host" PKG_LONGDESC="JSON-GLib implements a full suite of JSON-related tools using GLib and GObject." PKG_MESON_OPTS_TARGET="-Dintrospection=disabled \