From 5980b354c07fc53845ee8e5f65be910ad576029b Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 22 Jan 2021 11:41:39 +0000 Subject: [PATCH 1/7] gdk-pixbuf: update to 2.42.4 --- .../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 563a28821f..4adc6da95c 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.2" -PKG_SHA256="83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15" +PKG_VERSION="2.42.4" +PKG_SHA256="fe9c5dd88f486194ea2bc09b8814c1ed895bb6c530f37cbbf259757c4e482e4d" 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 86f4306ef84355d9d2a53bddc52c1119be28f042 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 4 Apr 2021 00:00:26 +0000 Subject: [PATCH 2/7] gtk3: disable use of to-pixdata during build to-pixdata is not available during build. errors shown below. if pixdata is made available, then subsequent errors with shared-mime occur. this disable rebuild of pngs. [3/665] Generating gtkresources_c with a custom command FAILED: gtk/gtkresources.c /storage/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-10.0-devel/toolchain/bin/glib-compile-resources gtk/gtk.gresources.xml --sourcedir /storage/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-10.0-devel/build/gtk3-3.24.28/.x86_64-libreelec-linux-gnu/gtk --sourcedir /storage/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-10.0-devel/build/gtk3-3.24.28/gtk --sourcedir ../gtk --c-name _gtk --internal --generate --target gtk/gtkresources.c --manual-register --dependency-file gtk/gtkresources.c.d gtk/gtk.gresources.xml: to-pixdata preprocessing requested, but GDK_PIXBUF_PIXDATA is not set, and gdk-pixbuf-pixdata is not in PATH. [4/665] Generating gtkresources_h with a custom command FAILED: gtk/gtkresources.h /storage/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-10.0-devel/toolchain/bin/glib-compile-resources gtk/gtk.gresources.xml --sourcedir /storage/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-10.0-devel/build/gtk3-3.24.28/.x86_64-libreelec-linux-gnu/gtk --sourcedir /storage/home-rudi/LibreELEC.tv/build.LibreELEC-Generic.x86_64-10.0-devel/build/gtk3-3.24.28/gtk --sourcedir ../gtk --c-name _gtk --internal --generate --target gtk/gtkresources.h --manual-register gtk/gtk.gresources.xml: to-pixdata preprocessing requested, but GDK_PIXBUF_PIXDATA is not set, and gdk-pixbuf-pixdata is not in PATH. --- .../patches/disable-to-pixdata-build.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/addons/addon-depends/chrome-depends/gtk3/patches/disable-to-pixdata-build.patch diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/patches/disable-to-pixdata-build.patch b/packages/addons/addon-depends/chrome-depends/gtk3/patches/disable-to-pixdata-build.patch new file mode 100644 index 0000000000..c42f8a854c --- /dev/null +++ b/packages/addons/addon-depends/chrome-depends/gtk3/patches/disable-to-pixdata-build.patch @@ -0,0 +1,26 @@ +--- a/gtk/gen-gtk-gresources-xml.py 2021-02-24 19:13:19.000000000 +0000 ++++ b/gtk/gen-gtk-gresources-xml.py 2021-04-03 23:52:35.000000000 +0000 +@@ -23,11 +23,6 @@ + theme/Adwaita/gtk-contained-dark.css + ''' + +-for f in get_files('theme/Adwaita/assets', '.png'): +- xml += ' theme/Adwaita/assets/{0}\n'.format(f) +- +-xml += '\n' +- + for f in get_files('theme/Adwaita/assets', '.svg'): + xml += ' theme/Adwaita/assets/{0}\n'.format(f) + +@@ -38,11 +33,6 @@ + theme/HighContrast/gtk-contained-inverse.css + ''' + +-for f in get_files('theme/HighContrast/assets', '.png'): +- xml += ' theme/HighContrast/assets/{0}\n'.format(f) +- +-xml += '\n' +- + for f in get_files('theme/HighContrast/assets', '.svg'): + xml += ' theme/HighContrast/assets/{0}\n'.format(f) + From aaa10b26758bef388b808e35c3dbb7591a5ea734 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 22 Jan 2021 11:37:39 +0000 Subject: [PATCH 3/7] gtk3: update to 3.24.28 --- .../addons/addon-depends/chrome-depends/gtk3/package.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk index 0d5f8ce001..b4f754f5ef 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.23" -PKG_SHA256="5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1" +PKG_VERSION="3.24.28" +PKG_SHA256="b04e09763367f1ce932cd2ee3a359d4de150e1c38e7bef7d29aa72557a6b47c6" 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" @@ -18,10 +18,11 @@ PKG_MESON_OPTS_TARGET="-Dbroadway_backend=false \ -Dcloudproviders=false \ -Dcolord=no \ -Ddemos=false \ + -Dexamples=false \ -Dgtk_doc=false \ -Dintrospection=false \ -Dman=false \ - -Dprint_backends=auto \ + -Dprint_backends=file,lpr \ -Dquartz_backend=false \ -Dtests=false \ -Dwayland_backend=false \ From 2ca14f21dfbb36021ed8270e1964760ecff3239c Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 22 Jan 2021 11:38:00 +0000 Subject: [PATCH 4/7] pango: update to 1.48.4 update 1.48.0 to 1.48.4 news: https://gitlab.gnome.org/GNOME/pango/-/blob/master/NEWS --- 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 d7c5416d95..036d771c8c 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.48.0" -PKG_SHA256="391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6" +PKG_VERSION="1.48.4" +PKG_SHA256="418913fb062071a075846244989d4a67aa5c80bf0eae8ee4555a092fd566a37a" PKG_LICENSE="GPL" PKG_SITE="http://www.pango.org/" PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz" From ffe688ca30e24f2bbde426f38ae3277abfdb396e Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 3 Apr 2021 09:38:42 +0000 Subject: [PATCH 5/7] at-spi2-core: update to 2.40.0 --- .../addon-depends/chrome-depends/at-spi2-core/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 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 a8466e68c5..c74be64753 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,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="at-spi2-core" -PKG_VERSION="2.39.1" -PKG_SHA256="44d2b042e47d25571581efff673af0a8cd79531babbad2b043784879e15e4228" +PKG_VERSION="2.40.0" +PKG_SHA256="4196a7d30a0051e52a67b8ce4283fe79ae5e4e14a725719934565adf1d333429" 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" From 3f11a26d56a05fd28d1974fa3b193eaca5ac9526 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 4 Apr 2021 00:43:33 +0000 Subject: [PATCH 6/7] chrome: update to 89.0.4389.114 and fix gtk3 compile issues and addon (105) --- packages/addons/browser/chrome/changelog.txt | 8 ++++++++ packages/addons/browser/chrome/package.mk | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/addons/browser/chrome/changelog.txt b/packages/addons/browser/chrome/changelog.txt index 9001948a5b..0b637fe436 100644 --- a/packages/addons/browser/chrome/changelog.txt +++ b/packages/addons/browser/chrome/changelog.txt @@ -1,3 +1,11 @@ +105 +- at-spi2-core: update to 2.40.0 +- chrome: update to 89.0.4389.114 +- gdk-pixbuf: update to 2.42.4 +- gtk3: disable use of to-pixdata during build +- gtk3: update to 3.24.28 +- pango: update to 1.48.4 + 104 - updated to 87.0.4280 diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 448c98db8f..1eafbf88d0 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="87.0.4280.66" -PKG_REV="104" +PKG_VERSION_NUMBER="89.0.4389.114" +PKG_REV="105" PKG_ARCH="x86_64" PKG_LICENSE="Custom" PKG_SITE="http://www.google.com/chrome" From d9b32ac07550ee498cd2d173290ef170e8f2764b Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 4 Apr 2021 22:18:09 +0000 Subject: [PATCH 7/7] chrome-libxshmfence: initial package --- .../chrome-libxshmfence/package.mk | 19 +++++++++++++++++++ packages/addons/browser/chrome/package.mk | 6 ++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 packages/addons/addon-depends/chrome-depends/chrome-libxshmfence/package.mk diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxshmfence/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxshmfence/package.mk new file mode 100644 index 0000000000..283d649455 --- /dev/null +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxshmfence/package.mk @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) + +. $(get_pkg_directory libxshmfence)/package.mk + +PKG_NAME="chrome-libxshmfence" +PKG_LONGDESC="libxshmfence for chrome" +PKG_URL="" +PKG_DEPENDS_UNPACK+=" libxshmfence" +PKG_BUILD_FLAGS="-sysroot" + +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ + --disable-static \ + --enable-shared" + +unpack() { + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} +} diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index 1eafbf88d0..fa974b98f0 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -11,8 +11,9 @@ PKG_LICENSE="Custom" PKG_SITE="http://www.google.com/chrome" PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo chrome-libXcomposite \ chrome-libXdamage chrome-libXfixes chrome-libXi chrome-libXrender \ - chrome-libXtst chrome-libxcb chrome-libxkbcommon cups gdk-pixbuf gtk3 harfbuzz-icu \ - libXcursor libxss nss pango scrnsaverproto unclutter" + chrome-libXtst chrome-libxcb chrome-libxkbcommon chrome-libxshmfence cups \ + gdk-pixbuf gtk3 harfbuzz-icu libXcursor libxss nss pango \ + scrnsaverproto unclutter" PKG_SECTION="browser" PKG_SHORTDESC="Google Chrome Browser" PKG_LONGDESC="Google Chrome Browser" @@ -56,6 +57,7 @@ addon() { $(get_install_dir chrome-libXi)/usr/lib/libXi.so.6 \ $(get_install_dir chrome-libxkbcommon)/usr/lib/libxkbcommon.so.0 \ $(get_install_dir chrome-libXrender)/usr/lib/libXrender.so.1 \ + $(get_install_dir chrome-libxshmfence)/usr/lib/libxshmfence.so.1 \ $(get_install_dir libxss)/usr/lib/libXss.so.1 \ $(get_install_dir chrome-libXtst)/usr/lib/libXtst.so.6 \ $(get_install_dir pango)/usr/lib/{libpangocairo-1.0.so.0,libpango-1.0.so.0,libpangoft2-1.0.so.0} \