Skip to contentSkip to conversation

package/libsoup3: bump to 3.6.0

PATCH Applied Thomas Devoogdt 4 participants 18 messages Aug 29, 2024 – Sep 17, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libsoup3: bump to 3.6.0

From: Thomas Devoogdt <[email protected]>

News:
- https://download.gnome.org/sources/libsoup/3.5/libsoup-3.5.2.news
- https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.0.news

---
 package/libsoup3/libsoup3.hash | 4 ++--
 package/libsoup3/libsoup3.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/libsoup3/libsoup3.hash +2 -2
index 139771a11e..37ecd2db84 100644
@@ -1,4 +1,4 @@
-# From https://download.gnome.org/sources/libsoup/3.5/libsoup-3.5.1.sha256sum
-sha256  c1d7cfb89832d35c271f37d544f2cfe21fa60ae9faad4a7ac58996ae4031f7ba  libsoup-3.5.1.tar.xz
+# From https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.0.sha256sum
+sha256  62959f791e8e8442f8c13cedac8c4919d78f9120d5bb5301be67a5e53318b4a3  libsoup-3.6.0.tar.xz
 # Locally calculated
 sha256  b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
package/libsoup3/libsoup3.mk +2 -2
index bc3ae4d0cb..f8a7e26159 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSOUP3_VERSION_MAJOR = 3.5
-LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).1
+LIBSOUP3_VERSION_MAJOR = 3.6
+LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).0
 LIBSOUP3_SOURCE = libsoup-$(LIBSOUP3_VERSION).tar.xz
 LIBSOUP3_SITE = https://download.gnome.org/sources/libsoup/$(LIBSOUP3_VERSION_MAJOR)
 LIBSOUP3_LICENSE = LGPL-2.0+
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/1 package/midori: drop package

From: Thomas Devoogdt <[email protected]>

The original WebKitGTK-based Midori is no longer maintained and doesn't build since WebKitGTK moved to libsoup3 as of commit 38a098df133aaa2ebf09742054b02db5a44f58e5.

Last WebKitGTK based release: https://github.com/midori-browser/core/tree/v9.0.
New browser, based on Gecko/Firefox: https://github.com/goastian/midori-desktop.

The intention is also to start migrating WebKitGTK to GTK4, as this is now the default version. See: https://webkitgtk.org/2024/03/27/webkigit-2.44.html.

---
 .checkpackageignore                           |  2 -
 Config.in.legacy                              |  8 +++
 package/Config.in                             |  1 -
 .../0001-disable-vala-fatal-warnings.patch    | 30 -----------
 ...ion-to-specify-path-to-g-ir-compiler.patch | 37 -------------
 package/midori/Config.in                      | 52 -------------------
 package/midori/midori.hash                    |  3 --
 package/midori/midori.mk                      | 35 -------------
 8 files changed, 8 insertions(+), 160 deletions(-)
 delete mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch
 delete mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch
 delete mode 100644 package/midori/Config.in
 delete mode 100644 package/midori/midori.hash
 delete mode 100644 package/midori/midori.mk
.checkpackageignore +0 -2
index 4cfc202153..86a8f9bade 100644
@@ -893,8 +893,6 @@ package/metacity/0001-add-libm-reference.patch lib_patch.Upstream
 package/metacity/0002-gconf.patch lib_patch.Upstream
 package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream
 package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream
-package/midori/0001-disable-vala-fatal-warnings.patch lib_patch.Upstream
-package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch lib_patch.Upstream
 package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream
 package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch lib_patch.Upstream
 package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream
Config.in.legacy +8 -0
index d8480106ba..d1f892dded 100644
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2024.08"
 
+config BR2_PACKAGE_MIDORI
+	bool "midori has been removed"
+	select BR2_LEGACY
+	help
+	  The original WebKitGTK-based Midori is no longer maintained
+	  and doesn't build since WebKitGTK moved to libsoup3 as of
+	  commit 38a098df133aaa2ebf09742054b02db5a44f58e5.
+
 config BR2_PACKAGE_FROTZ
 	bool "frotz has been removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index cacba7faa1..deaac48a56 100644
@@ -332,7 +332,6 @@ comment "Graphic applications"
 	source "package/kmscube/Config.in"
 	source "package/libva-utils/Config.in"
 	source "package/mesa3d-demos/Config.in"
-	source "package/midori/Config.in"
 	source "package/netsurf/Config.in"
 	source "package/pngquant/Config.in"
 	source "package/qt5cinex/Config.in"
package/midori/0001-disable-vala-fatal-warnings.patch deleted +0 -30
deleted file mode 100644
index c3f245f141..0000000000
@@ -1,30 +0,0 @@
-From be91b1260d3215119e4ab5b19012ab80d6ff788d Mon Sep 17 00:00:00 2001
-From: Adam Duskett <[email protected]>
-Date: Mon, 11 Oct 2021 16:58:34 -0700
-Subject: [PATCH] disable vala fatal warnings
-
-When building midori in a buildroot directory cloned from git, the git
-descript --tags command return tags from buildroot, which in turn sets
-the --fatal-warnings flag. Disable --fatal-warnings unconditionally.
-
-Signed-off-by: Adam Duskett <[email protected]>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e72f08..39941e2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@ execute_process(COMMAND "git" "describe" "--tags"
- if (REVISION)
-     set(CORE_VERSION "${REVISION}")
-     # All warnings are errors in development builds
--    set(VALAFLAGS ${VALAFLAGS} --fatal-warnings)
-+    set(VALAFLAGS ${VALAFLAGS} --disable-assert)
- else ()
-     # No runtime type checks
-     set(VALAFLAGS ${VALAFLAGS} --disable-assert)
--- 
-2.30.2
-
package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch deleted +0 -37
deleted file mode 100644
index 4bbcbaaf12..0000000000
@@ -1,37 +0,0 @@
-From 118ac24b2c488f490ee8814336291a58eae45395 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <[email protected]>
-Date: Tue, 12 Oct 2021 13:21:19 -0700
-Subject: [PATCH] add option to specify path to g-ir-compiler
-
-By default, find_program (GIR_COMPILER_BIN g-ir-compiler) returns the host path
-to g-ir-compiler, which is undesirable in a cross-compile environment.
-
-Add an option to manually specify a path to the g-ir-compiler.
-
-Signed-off-by: Adam Duskett <[email protected]>
----
- core/CMakeLists.txt | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index c4982de..6584229 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -66,7 +66,13 @@ set_target_properties("${LIBCORE}" PROPERTIES
-                       VERSION ${LIBCORE_VERSION}
-                       )
- 
--find_program (GIR_COMPILER_BIN g-ir-compiler)
-+option(GIR_COMPILER_PATH "Specify a path to g-ir-compiler" OFF)
-+if(GIR_COMPILER_PATH)
-+  set(GIR_COMPILER_BIN "${GIR_COMPILER_PATH}")
-+else()
-+  find_program (GIR_COMPILER_BIN g-ir-compiler)
-+endif(GIR_COMPILER_PATH)
-+
- add_custom_target(${LIBCORE_GIR}.typelib ALL
-                   COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir
-                   --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib
--- 
-2.30.2
-
package/midori/Config.in deleted +0 -52

52 lines not on this page · raw message

package/midori/midori.hash deleted +0 -3
deleted file mode 100644
index f14ec6d929..0000000000
@@ -1,3 +0,0 @@
-# Locally computed
-sha256  5e0a531455c47b0ff7589940aa2b0d9c16f59c99ba933e5fcdcab68114262016  midori-v9.0.tar.gz
-sha256  5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING
package/midori/midori.mk deleted +0 -35
deleted file mode 100644
index aeafa9bfdc..0000000000
@@ -1,35 +0,0 @@
-################################################################################
-#
-# midori
-#
-################################################################################
-
-MIDORI_VERSION = 9.0
-MIDORI_SOURCE = midori-v$(MIDORI_VERSION).tar.gz
-MIDORI_SITE = https://github.com/midori-browser/core/releases/download/v$(MIDORI_VERSION)
-MIDORI_LICENSE = LGPL-2.1+
-MIDORI_LICENSE_FILES = COPYING
-MIDORI_CPE_ID_VENDOR = midori-browser
-MIDORI_DEPENDENCIES = \
-	host-intltool \
-	host-librsvg \
-	host-pkgconf \
-	host-vala \
-	host-python3 \
-	gcr \
-	gobject-introspection \
-	granite \
-	json-glib \
-	libarchive \
-	libgtk3 \
-	libpeas \
-	libsoup \
-	libxml2 \
-	sqlite \
-	webkitgtk \
-	$(TARGET_NLS_DEPENDENCIES) \
-	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
-
-MIDORI_CONF_OPTS += -DGIR_COMPILER_PATH=$(STAGING_DIR)/usr/bin/g-ir-compiler
-
-$(eval $(cmake-package))
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

PATCH 1/1 package/webkitgtk: restore libsoup support

The midori browser still uses libsoup and was broken since commit 38a098df133aaa2ebf09742054b02db5a44f58e5. This commit allows the use of libsoup, libsoup3 stays the default.

---
This is a bit a replacement for https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/.
I don't use midori or libsoup2, and it's still not maintained, so it's also fine to accept the other commit and drop midori altogether.

---
 package/webkitgtk/Config.in    | 11 ++++++-----
 package/webkitgtk/webkitgtk.mk | 12 ++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)
package/webkitgtk/Config.in +6 -5
index a556fec194..5f9c24d610 100644
@@ -33,9 +33,9 @@ config BR2_PACKAGE_WEBKITGTK
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup/libsoup3
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10
-	depends on BR2_USE_WCHAR # icu, libsoup3
+	depends on BR2_USE_WCHAR # icu, libsoup/libsoup3
 	depends on BR2_PACKAGE_LIBGTK3 || BR2_PACKAGE_LIBGTK4
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	select BR2_PACKAGE_CAIRO
@@ -47,7 +47,7 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_LIBEPOXY
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBSECRET
-	select BR2_PACKAGE_LIBSOUP3
+	select BR2_PACKAGE_LIBSOUP3 if !BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBTASN1
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
@@ -100,9 +100,10 @@ comment "sandboxing support needs a toolchain w/ headers >= 3.12"
 
 config BR2_PACKAGE_WEBKITGTK_HTTPS
 	bool "HTTPS support"
-	depends on !BR2_STATIC_LIBS # libsoup3 -> glib-networking, gnutls
+	depends on !BR2_STATIC_LIBS # libsoup/libsoup3 -> glib-networking, gnutls
 	select BR2_PACKAGE_CA_CERTIFICATES # runtime
-	select BR2_PACKAGE_LIBSOUP3_SSL
+	select BR2_PACKAGE_LIBSOUP_SSL if BR2_PACKAGE_LIBSOUP
+	select BR2_PACKAGE_LIBSOUP3_SSL if BR2_PACKAGE_LIBSOUP3
 	help
 	  Enable HTTPS protocol support.
 
package/webkitgtk/webkitgtk.mk +10 -2
index ff39ee01e1..af49aad96e 100644
@@ -14,8 +14,8 @@ WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-LGPL-2.1
 WEBKITGTK_CPE_ID_VENDOR = webkitgtk
 WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \
-	enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libsecret \
-	libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2
+	enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libsecret libtasn1 \
+	libxml2 libxslt sqlite webp woff2
 
 WEBKITGTK_CMAKE_BACKEND = ninja
 
@@ -31,6 +31,14 @@ WEBKITGTK_CONF_OPTS = \
 	-DUSE_LIBHYPHEN=OFF \
 	-DUSE_WOFF2=ON
 
+ifeq ($(BR2_PACKAGE_LIBSOUP),y)
+WEBKITGTK_CONF_OPTS += -DUSE_SOUP2=ON
+WEBKITGTK_DEPENDENCIES += libsoup
+else
+WEBKITGTK_CONF_OPTS += -DUSE_SOUP2=OFF
+WEBKITGTK_DEPENDENCIES += libsoup3
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGTK4),y)
 WEBKITGTK_CONF_OPTS += -DUSE_GTK4=ON
 WEBKITGTK_DEPENDENCIES += libgtk4
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

Re: [Buildroot] [PATCH v1] package/webkitgtk: restore libsoup support

Thomas, All,

On 2024-09-01 14:11 +0200, Thomas Devoogdt spake thusly:

Quoted 8 lines

The midori browser still uses libsoup and was broken since commit 38a098df133aaa2ebf09742054b02db5a44f58e5. This commit allows the use of libsoup, libsoup3 stays the default.

---
This is a bit a replacement for https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/.
I don't use midori or libsoup2, and it's still not maintained, so it's also fine to accept the other commit and drop midori altogether.

In the end, I applied the patch removing midori.

And apart for midori, does it make sense to restore using libsoup at all, or should we drop this patch and keep only libsoup3?

Thanks!

Regards,
Yann E. MORIN.

Quoted 80 lines
---
 package/webkitgtk/Config.in    | 11 ++++++-----
 package/webkitgtk/webkitgtk.mk | 12 ++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)
package/webkitgtk/Config.in +6 -5
index a556fec194..5f9c24d610 100644
@@ -33,9 +33,9 @@ config BR2_PACKAGE_WEBKITGTK
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup/libsoup3
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10
-	depends on BR2_USE_WCHAR # icu, libsoup3
+	depends on BR2_USE_WCHAR # icu, libsoup/libsoup3
 	depends on BR2_PACKAGE_LIBGTK3 || BR2_PACKAGE_LIBGTK4
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	select BR2_PACKAGE_CAIRO
@@ -47,7 +47,7 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_LIBEPOXY
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBSECRET
-	select BR2_PACKAGE_LIBSOUP3
+	select BR2_PACKAGE_LIBSOUP3 if !BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBTASN1
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_LIBXSLT
@@ -100,9 +100,10 @@ comment "sandboxing support needs a toolchain w/ headers >= 3.12"
 
 config BR2_PACKAGE_WEBKITGTK_HTTPS
 	bool "HTTPS support"
-	depends on !BR2_STATIC_LIBS # libsoup3 -> glib-networking, gnutls
+	depends on !BR2_STATIC_LIBS # libsoup/libsoup3 -> glib-networking, gnutls
 	select BR2_PACKAGE_CA_CERTIFICATES # runtime
-	select BR2_PACKAGE_LIBSOUP3_SSL
+	select BR2_PACKAGE_LIBSOUP_SSL if BR2_PACKAGE_LIBSOUP
+	select BR2_PACKAGE_LIBSOUP3_SSL if BR2_PACKAGE_LIBSOUP3
 	help
 	  Enable HTTPS protocol support.
 
package/webkitgtk/webkitgtk.mk +10 -2
index ff39ee01e1..af49aad96e 100644
@@ -14,8 +14,8 @@ WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-LGPL-2.1
 WEBKITGTK_CPE_ID_VENDOR = webkitgtk
 WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \
-	enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libsecret \
-	libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2
+	enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libsecret libtasn1 \
+	libxml2 libxslt sqlite webp woff2
 
 WEBKITGTK_CMAKE_BACKEND = ninja
 
@@ -31,6 +31,14 @@ WEBKITGTK_CONF_OPTS = \
 	-DUSE_LIBHYPHEN=OFF \
 	-DUSE_WOFF2=ON
 
+ifeq ($(BR2_PACKAGE_LIBSOUP),y)
+WEBKITGTK_CONF_OPTS += -DUSE_SOUP2=ON
+WEBKITGTK_DEPENDENCIES += libsoup
+else
+WEBKITGTK_CONF_OPTS += -DUSE_SOUP2=OFF
+WEBKITGTK_DEPENDENCIES += libsoup3
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGTK4),y)
 WEBKITGTK_CONF_OPTS += -DUSE_GTK4=ON
 WEBKITGTK_DEPENDENCIES += libgtk4
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH v1] package/webkitgtk: restore libsoup support

Hi,

Libsoup2 is still supported by webkitgtk, so having support makes sense. But given the fact that no complain arose since the bump to libsoup3, I doubt the usage of it. So if someone really need it, then that person can reply on this patch as well I guess.

Kr,

Thomas

Op ma 2 sep. 2024 17:41 schreef Yann E. MORIN <[email protected]>:

Quoted 124 lines

Thomas, All,

On 2024-09-01 14:11 +0200, Thomas Devoogdt spake thusly:

Quoted 7 lines

The midori browser still uses libsoup and was broken since commit 38a098df133aaa2ebf09742054b02db5a44f58e5. This commit allows the use of libsoup, libsoup3 stays the default.

---
This is a bit a replacement for

https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/
.

Quoted 1 line

I don't use midori or libsoup2, and it's still not maintained, so it's

also fine to accept the other commit and drop midori altogether.

In the end, I applied the patch removing midori.

And apart for midori, does it make sense to restore using libsoup at all, or should we drop this patch and keep only libsoup3?

Thanks!

Regards,
Yann E. MORIN.

Quoted 10 lines
---
 package/webkitgtk/Config.in    | 11 ++++++-----
 package/webkitgtk/webkitgtk.mk | 12 ++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)
package/webkitgtk/Config.in +0 -0
index a556fec194..5f9c24d610 100644

package/webkitgtk/Config.in config BR2_PACKAGE_WEBKITGTK · line 36

Quoted 5 lines
package/webkitgtk/Config.in +1 -1
@@ -33,9 +33,9 @@ config BR2_PACKAGE_WEBKITGTK
      depends on BR2_PACKAGE_HAS_LIBEGL
      depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
      depends on BR2_INSTALL_LIBSTDCPP
-     depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3
+     depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu,

libsoup/libsoup3

package/webkitgtk/Config.in comment "sandboxing support needs a toolchain w/

Quoted 16 lines
package/webkitgtk/Config.in +2 -2
      depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10
-     depends on BR2_USE_WCHAR # icu, libsoup3
+     depends on BR2_USE_WCHAR # icu, libsoup/libsoup3
      depends on BR2_PACKAGE_LIBGTK3 || BR2_PACKAGE_LIBGTK4
      depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
      select BR2_PACKAGE_CAIRO
@@ -47,7 +47,7 @@ config BR2_PACKAGE_WEBKITGTK
      select BR2_PACKAGE_LIBEPOXY
      select BR2_PACKAGE_LIBGCRYPT
      select BR2_PACKAGE_LIBSECRET
-     select BR2_PACKAGE_LIBSOUP3
+     select BR2_PACKAGE_LIBSOUP3 if !BR2_PACKAGE_LIBSOUP
      select BR2_PACKAGE_LIBTASN1
      select BR2_PACKAGE_LIBXML2
      select BR2_PACKAGE_LIBXSLT
@@ -100,9 +100,10 @@ comment "sandboxing support needs a toolchain w/

headers >= 3.12"

package/webkitgtk/Config.in comment "sandboxing support needs a toolchain w/ headers >= 3.12"

Quoted 5 lines
package/webkitgtk/Config.in +1 -1
 config BR2_PACKAGE_WEBKITGTK_HTTPS
      bool "HTTPS support"
-     depends on !BR2_STATIC_LIBS # libsoup3 -> glib-networking, gnutls
+     depends on !BR2_STATIC_LIBS # libsoup/libsoup3 -> glib-networking,

gnutls

package/webkitgtk/

Quoted 8 lines
package/webkitgtk/Config.in +2 -1
      select BR2_PACKAGE_CA_CERTIFICATES # runtime
-     select BR2_PACKAGE_LIBSOUP3_SSL
+     select BR2_PACKAGE_LIBSOUP_SSL if BR2_PACKAGE_LIBSOUP
+     select BR2_PACKAGE_LIBSOUP3_SSL if BR2_PACKAGE_LIBSOUP3
      help
        Enable HTTPS protocol support.
 
package/webkitgtk/ renamed from package/webkitgtk/webkitgtk.mk +0 -0

webkitgtk.mk

package/webkitgtk/webkitgtk.mk WEBKITGTK_LICENSE_FILES = \ · line 16

Quoted 7 lines

index ff39ee01e1..af49aad96e 100644

package/webkitgtk/webkitgtk.mk +0 -0
@@ -14,8 +14,8 @@ WEBKITGTK_LICENSE_FILES = \
      Source/WebCore/LICENSE-LGPL-2.1
 WEBKITGTK_CPE_ID_VENDOR = webkitgtk
 WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef

\

package/webkitgtk/webkitgtk.mk WEBKITGTK_LICENSE_FILES = \

Quoted 3 lines
package/webkitgtk/webkitgtk.mk +1 -2
-     enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libsecret \
-     libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2
+     enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libsecret

libtasn1 \

Quoted 22 lines
package/webkitgtk/webkitgtk.mk +9 -1
+     libxml2 libxslt sqlite webp woff2
 
 WEBKITGTK_CMAKE_BACKEND = ninja
 
@@ -31,6 +31,14 @@ WEBKITGTK_CONF_OPTS = \
      -DUSE_LIBHYPHEN=OFF \
      -DUSE_WOFF2=ON
 
+ifeq ($(BR2_PACKAGE_LIBSOUP),y)
+WEBKITGTK_CONF_OPTS += -DUSE_SOUP2=ON
+WEBKITGTK_DEPENDENCIES += libsoup
+else
+WEBKITGTK_CONF_OPTS += -DUSE_SOUP2=OFF
+WEBKITGTK_DEPENDENCIES += libsoup3
+endif
+
 ifeq ($(BR2_PACKAGE_LIBGTK4),y)
 WEBKITGTK_CONF_OPTS += -DUSE_GTK4=ON
 WEBKITGTK_DEPENDENCIES += libgtk4
--

2.43.0

Quoted 4 lines

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

--

.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___
     |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is
no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v
 conspiracy.  |
Quoted 3 lines

'------------------------------^-------^------------------^--------------------'

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#5 lore raw

Re: [Buildroot] [PATCH v1] package/webkitgtk: restore libsoup support

Thomas, All,

On 2024-09-02 18:06 +0200, Thomas Devoogdt spake thusly:

Quoted 4 lines

Libsoup2 is still supported by webkitgtk, so having support makes sense. But given the fact that no complain arose since the bump to libsoup3, I doubt the usage of it. So if someone really need it, then that person can reply on this patch as well I guess.

Agreed. I'll let the patch pending for a while, and if noone complains, we'll drop it in a few days.

Thanks!

Regards,
Yann E. MORIN.

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw

Re: [Buildroot] [PATCH v1] package/webkitgtk: restore libsoup support

Hi Thomas, Yann,

Quoted 10 lines · On Mon, 02 Sep 2024 18:26:38 +0200 "Yann E. MORIN" <[email protected]>…

Thomas, All,

On 2024-09-02 18:06 +0200, Thomas Devoogdt spake thusly:

Quoted 4 lines

Libsoup2 is still supported by webkitgtk, so having support makes sense. But given the fact that no complain arose since the bump to libsoup3, I doubt the usage of it. So if someone really need it, then that person can reply on this patch as well I guess.

Agreed. I'll let the patch pending for a while, and if noone complains, we'll drop it in a few days.

With my WebKit developer hat on, I would also recommend keeping only one option, and use libsoup3 =)

Now, thinking as a Buildroot user, it would be nice to have *some* browser that uses WebKitGTK, if only for testing things before somebody would go on and develop their own thing on top of WebKitGTK. How about adding an option to pass ENABLE_MINIBROWSER=ON to CMake in webkitgtk.mk? That would install /usr/libexec/webkitgtk-6.0/MiniBrowser, and a post-install hook could add a symlink to it under /usr/bin. WDYT?

Cheers,
—Adrián

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#7 lore raw

Re: [Buildroot] [PATCH v1] package/webkitgtk: restore libsoup support

Adrián, All,

On 2024-09-02 22:37 +0300, Adrian Perez de Castro spake thusly:

Quoted 10 lines · On Mon, 02 Sep 2024 18:26:38 +0200 "Yann E. MORIN" <[email protected]>…
Quoted 7 lines

On 2024-09-02 18:06 +0200, Thomas Devoogdt spake thusly:

Quoted 4 lines

Libsoup2 is still supported by webkitgtk, so having support makes sense. But given the fact that no complain arose since the bump to libsoup3, I doubt the usage of it. So if someone really need it, then that person can reply on this patch as well I guess.

Agreed. I'll let the patch pending for a while, and if noone complains, we'll drop it in a few days.

With my WebKit developer hat on, I would also recommend keeping only one option, and use libsoup3 =)

ACK

Quoted 6 lines

Now, thinking as a Buildroot user, it would be nice to have *some* browser that uses WebKitGTK, if only for testing things before somebody would go on and develop their own thing on top of WebKitGTK. How about adding an option to pass ENABLE_MINIBROWSER=ON to CMake in webkitgtk.mk? That would install /usr/libexec/webkitgtk-6.0/MiniBrowser, and a post-install hook could add a symlink to it under /usr/bin. WDYT?

Yes, please!

Regards,
Yann E. MORIN.

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#8 lore raw

Re: [Buildroot] [PATCH v1] package/webkitgtk: restore libsoup support

Quoted 4 lines · On Mon, 02 Sep 2024 22:04:47 +0200 "Yann E. MORIN" <[email protected]>…

Adrián, All,

On 2024-09-02 22:37 +0300, Adrian Perez de Castro spake thusly:

Quoted 8 lines
Quoted 6 lines

Now, thinking as a Buildroot user, it would be nice to have *some* browser that uses WebKitGTK, if only for testing things before somebody would go on and develop their own thing on top of WebKitGTK. How about adding an option to pass ENABLE_MINIBROWSER=ON to CMake in webkitgtk.mk? That would install /usr/libexec/webkitgtk-6.0/MiniBrowser, and a post-install hook could add a symlink to it under /usr/bin. WDYT?

Yes, please!

There we go:

https://patchwork.ozlabs.org/project/buildroot/patch/[email protected]/

Note the symlink is to "../libexec/webkit2gtk-4.1/MiniBrowser"; when we make WebKitGTK build against GTK4 we will have to change it to read "webkitgtk-6.0" instead =]

Cheers,
—Adrián

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#9 lore raw

Re: [Buildroot] [PATCH v1] package/midori: drop package

In reply to Thomas Devoogdt

Thomas, All,

On 2024-08-29 15:12 +0200, Thomas Devoogdt spake thusly:

Quoted 5 lines

From: Thomas Devoogdt <[email protected]>

The original WebKitGTK-based Midori is no longer maintained and doesn't build since WebKitGTK moved to libsoup3 as of commit 38a098df133aaa2ebf09742054b02db5a44f58e5.

Quoted 7 lines

Last WebKitGTK based release: https://github.com/midori-browser/core/tree/v9.0.
New browser, based on Gecko/Firefox: https://github.com/goastian/midori-desktop.

The intention is also to start migrating WebKitGTK to GTK4, as this is now the default version. See: https://webkitgtk.org/2024/03/27/webkigit-2.44.html.

I've applied this patch, rather than restore libsoup support, because I already encountered other build failures when working on the libglib2 bump, so keeping midori when we know it's going to break again soon without hope of fixes upstream is not worth it. It's dead, Jim.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 254 lines
---
 .checkpackageignore                           |  2 -
 Config.in.legacy                              |  8 +++
 package/Config.in                             |  1 -
 .../0001-disable-vala-fatal-warnings.patch    | 30 -----------
 ...ion-to-specify-path-to-g-ir-compiler.patch | 37 -------------
 package/midori/Config.in                      | 52 -------------------
 package/midori/midori.hash                    |  3 --
 package/midori/midori.mk                      | 35 -------------
 8 files changed, 8 insertions(+), 160 deletions(-)
 delete mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch
 delete mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch
 delete mode 100644 package/midori/Config.in
 delete mode 100644 package/midori/midori.hash
 delete mode 100644 package/midori/midori.mk
.checkpackageignore +0 -2
index 4cfc202153..86a8f9bade 100644
@@ -893,8 +893,6 @@ package/metacity/0001-add-libm-reference.patch lib_patch.Upstream
 package/metacity/0002-gconf.patch lib_patch.Upstream
 package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream
 package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream
-package/midori/0001-disable-vala-fatal-warnings.patch lib_patch.Upstream
-package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch lib_patch.Upstream
 package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream
 package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch lib_patch.Upstream
 package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream
Config.in.legacy +8 -0
index d8480106ba..d1f892dded 100644
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2024.08"
 
+config BR2_PACKAGE_MIDORI
+	bool "midori has been removed"
+	select BR2_LEGACY
+	help
+	  The original WebKitGTK-based Midori is no longer maintained
+	  and doesn't build since WebKitGTK moved to libsoup3 as of
+	  commit 38a098df133aaa2ebf09742054b02db5a44f58e5.
+
 config BR2_PACKAGE_FROTZ
 	bool "frotz has been removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index cacba7faa1..deaac48a56 100644
@@ -332,7 +332,6 @@ comment "Graphic applications"
 	source "package/kmscube/Config.in"
 	source "package/libva-utils/Config.in"
 	source "package/mesa3d-demos/Config.in"
-	source "package/midori/Config.in"
 	source "package/netsurf/Config.in"
 	source "package/pngquant/Config.in"
 	source "package/qt5cinex/Config.in"
package/midori/0001-disable-vala-fatal-warnings.patch deleted +0 -30
deleted file mode 100644
index c3f245f141..0000000000
@@ -1,30 +0,0 @@
-From be91b1260d3215119e4ab5b19012ab80d6ff788d Mon Sep 17 00:00:00 2001
-From: Adam Duskett <[email protected]>
-Date: Mon, 11 Oct 2021 16:58:34 -0700
-Subject: [PATCH] disable vala fatal warnings
-
-When building midori in a buildroot directory cloned from git, the git
-descript --tags command return tags from buildroot, which in turn sets
-the --fatal-warnings flag. Disable --fatal-warnings unconditionally.
-
-Signed-off-by: Adam Duskett <[email protected]>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e72f08..39941e2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,7 +18,7 @@ execute_process(COMMAND "git" "describe" "--tags"
- if (REVISION)
-     set(CORE_VERSION "${REVISION}")
-     # All warnings are errors in development builds
--    set(VALAFLAGS ${VALAFLAGS} --fatal-warnings)
-+    set(VALAFLAGS ${VALAFLAGS} --disable-assert)
- else ()
-     # No runtime type checks
-     set(VALAFLAGS ${VALAFLAGS} --disable-assert)
--- 
-2.30.2
-
package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch deleted +0 -37
deleted file mode 100644
index 4bbcbaaf12..0000000000
@@ -1,37 +0,0 @@
-From 118ac24b2c488f490ee8814336291a58eae45395 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <[email protected]>
-Date: Tue, 12 Oct 2021 13:21:19 -0700
-Subject: [PATCH] add option to specify path to g-ir-compiler
-
-By default, find_program (GIR_COMPILER_BIN g-ir-compiler) returns the host path
-to g-ir-compiler, which is undesirable in a cross-compile environment.
-
-Add an option to manually specify a path to the g-ir-compiler.
-
-Signed-off-by: Adam Duskett <[email protected]>
----
- core/CMakeLists.txt | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index c4982de..6584229 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -66,7 +66,13 @@ set_target_properties("${LIBCORE}" PROPERTIES
-                       VERSION ${LIBCORE_VERSION}
-                       )
- 
--find_program (GIR_COMPILER_BIN g-ir-compiler)
-+option(GIR_COMPILER_PATH "Specify a path to g-ir-compiler" OFF)
-+if(GIR_COMPILER_PATH)
-+  set(GIR_COMPILER_BIN "${GIR_COMPILER_PATH}")
-+else()
-+  find_program (GIR_COMPILER_BIN g-ir-compiler)
-+endif(GIR_COMPILER_PATH)
-+
- add_custom_target(${LIBCORE_GIR}.typelib ALL
-                   COMMAND ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.gir
-                   --output ${CMAKE_CURRENT_BINARY_DIR}/${LIBCORE_GIR}.typelib
--- 
-2.30.2
-
package/midori/Config.in deleted +0 -52
deleted file mode 100644
index 6029c0a9df..0000000000
@@ -1,52 +0,0 @@
-config BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
-	bool
-	default y
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gcr -> libgcrypt -> libgpg-error
-	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
-	depends on !BR2_BINFMT_FLAT # webkitgtk -> icu
-
-comment "midori needs a glibc toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 8"
-	depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
-	depends on !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
-		!BR2_HOST_GCC_AT_LEAST_8 || \
-		!BR2_TOOLCHAIN_USES_GLIBC || !BR2_TOOLCHAIN_HAS_THREADS || \
-		BR2_STATIC_LIBS || !BR2_USE_WCHAR
-
-comment "midori needs libgtk3 w/ X11 or wayland backend"
-	depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
-	depends on !BR2_PACKAGE_LIBGTK3_X11 && \
-		!BR2_PACKAGE_LIBGTK3_WAYLAND
-
-config BR2_PACKAGE_MIDORI
-	bool "midori"
-	depends on BR2_PACKAGE_MIDORI_ARCH_SUPPORTS
-	depends on !BR2_STATIC_LIBS # webkitgtk
-	depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
-	depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # webkitgtk
-	depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3
-	depends on BR2_USE_WCHAR # granite, gcr, libsoup, libpeas, gobject-introspection
-	depends on BR2_PACKAGE_LIBGTK3
-	depends on BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND
-	select BR2_PACKAGE_GCR
-	select BR2_PACKAGE_GRANITE
-	select BR2_PACKAGE_JSON_GLIB
-	select BR2_PACKAGE_LIBARCHIVE
-	select BR2_PACKAGE_LIBPEAS
-	select BR2_PACKAGE_LIBPEAS_WIDGETS
-	select BR2_PACKAGE_LIBSOUP
-	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_PYTHON3 # gobject-introspection
-	select BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_WEBKITGTK
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	help
-	  Midori is a lightweight web browser based on WebKit
-
-	  https://github.com/midori-browser/core
package/midori/midori.hash deleted +0 -3
deleted file mode 100644
index f14ec6d929..0000000000
@@ -1,3 +0,0 @@
-# Locally computed
-sha256  5e0a531455c47b0ff7589940aa2b0d9c16f59c99ba933e5fcdcab68114262016  midori-v9.0.tar.gz
-sha256  5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING
package/midori/midori.mk deleted +0 -35
deleted file mode 100644
index aeafa9bfdc..0000000000
@@ -1,35 +0,0 @@
-################################################################################
-#
-# midori
-#
-################################################################################
-
-MIDORI_VERSION = 9.0
-MIDORI_SOURCE = midori-v$(MIDORI_VERSION).tar.gz
-MIDORI_SITE = https://github.com/midori-browser/core/releases/download/v$(MIDORI_VERSION)
-MIDORI_LICENSE = LGPL-2.1+
-MIDORI_LICENSE_FILES = COPYING
-MIDORI_CPE_ID_VENDOR = midori-browser
-MIDORI_DEPENDENCIES = \
-	host-intltool \
-	host-librsvg \
-	host-pkgconf \
-	host-vala \
-	host-python3 \
-	gcr \
-	gobject-introspection \
-	granite \
-	json-glib \
-	libarchive \
-	libgtk3 \
-	libpeas \
-	libsoup \
-	libxml2 \
-	sqlite \
-	webkitgtk \
-	$(TARGET_NLS_DEPENDENCIES) \
-	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
-
-MIDORI_CONF_OPTS += -DGIR_COMPILER_PATH=$(STAGING_DIR)/usr/bin/g-ir-compiler
-
-$(eval $(cmake-package))
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#10 lore raw

PATCH 1/1 package/libgtk4: fix cairo-pdf compile error

In reply to Thomas Devoogdt

From: Thomas Devoogdt <[email protected]>

../gtk/print/gtkprintoperation.c:26:10: fatal error: cairo-pdf.h: No such file or directory

---
 package/libgtk4/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/libgtk4/Config.in +1 -0
index af7f57b80e..2fcae311d7 100644
@@ -23,6 +23,7 @@ config BR2_PACKAGE_LIBGTK4
 	# https://gitlab.gnome.org/GNOME/gtk/-/issues/6866.
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_CAIRO_ZLIB
 	select BR2_PACKAGE_GDK_PIXBUF
 	select BR2_PACKAGE_GRAPHENE
 	select BR2_PACKAGE_LIBEPOXY
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#11 lore raw

Re: [Buildroot] [PATCH v1] package/libgtk4: fix cairo-pdf compile error

Quoted 14 lines · On Thu, 29 Aug 2024 15:12:30 +0200 Thomas Devoogdt <[email protected]> wrote:

From: Thomas Devoogdt <[email protected]>

../gtk/print/gtkprintoperation.c:26:10: fatal error: cairo-pdf.h: No such file or directory

---
 package/libgtk4/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/libgtk4/Config.in +0 -0
index af7f57b80e..2fcae311d7 100644

package/libgtk4/Config.in config BR2_PACKAGE_LIBGTK4 · line 26

Quoted 4 lines
package/libgtk4/Config.in +1 -0
@@ -23,6 +23,7 @@ config BR2_PACKAGE_LIBGTK4
 	# https://gitlab.gnome.org/GNOME/gtk/-/issues/6866.
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_CAIRO_ZLIB

We had a previous patch somewhat similar to this (but not exactly), and I made this reply:

https://lore.kernel.org/buildroot/20240815000358.6887f1bf@windsurf/

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#12 lore raw

Re: [Buildroot] [PATCH v1] package/libgtk4: fix cairo-pdf compile error

Hi Thomas,

I will report this issue when I have time for it again. I can update the patch message once this is done.

Kr,

Thomas Devoogdt

Op di 3 sep. 2024 23:14 schreef Thomas Petazzoni < [email protected]>:

Quoted 26 lines
Quoted 3 lines · On Thu, 29 Aug 2024 15:12:30 +0200 Thomas Devoogdt <[email protected]> wrote:

From: Thomas Devoogdt <[email protected]>

../gtk/print/gtkprintoperation.c:26:10: fatal error: cairo-pdf.h: No

such file or directory

Quoted 11 lines
---
 package/libgtk4/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/libgtk4/Config.in +0 -0
index af7f57b80e..2fcae311d7 100644

package/libgtk4/Config.in config BR2_PACKAGE_LIBGTK4 · line 26

Quoted 4 lines
package/libgtk4/Config.in +1 -0
@@ -23,6 +23,7 @@ config BR2_PACKAGE_LIBGTK4
      # https://gitlab.gnome.org/GNOME/gtk/-/issues/6866.
      depends on BR2_PACKAGE_HAS_LIBEGL
      select BR2_PACKAGE_CAIRO
+     select BR2_PACKAGE_CAIRO_ZLIB

We had a previous patch somewhat similar to this (but not exactly), and I made this reply:

Quoted 9 lines

https://lore.kernel.org/buildroot/20240815000358.6887f1bf@windsurf/

Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#13 lore raw

Re: [Buildroot] [PATCH v1] package/libgtk4: fix cairo-pdf compile error

Hi Thomas,

I just had some time to have a quick look. It seems that you already reported this issue 2 years ago. See
https://gitlab.gnome.org/GNOME/gtk/-/issues/5072. Some upstream work was done for this in
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5325, but somehow was never properly finished. I left a small remark there.

Kr,

Thomas Devoogdt

Op di 3 sep 2024 om 23:26 schreef Thomas Devoogdt <[email protected]>:

Quoted 45 lines

Hi Thomas,

I will report this issue when I have time for it again. I can update the patch message once this is done.

Kr,

Thomas Devoogdt

Op di 3 sep. 2024 23:14 schreef Thomas Petazzoni <[email protected]>:

Quoted 34 lines
Quoted 14 lines · On Thu, 29 Aug 2024 15:12:30 +0200 Thomas Devoogdt <[email protected]> wrote:

From: Thomas Devoogdt <[email protected]>

../gtk/print/gtkprintoperation.c:26:10: fatal error: cairo-pdf.h: No such file or directory

---
 package/libgtk4/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/libgtk4/Config.in +0 -0
index af7f57b80e..2fcae311d7 100644

package/libgtk4/Config.in config BR2_PACKAGE_LIBGTK4 · line 26

Quoted 4 lines
package/libgtk4/Config.in +1 -0
@@ -23,6 +23,7 @@ config BR2_PACKAGE_LIBGTK4
      # https://gitlab.gnome.org/GNOME/gtk/-/issues/6866.
      depends on BR2_PACKAGE_HAS_LIBEGL
      select BR2_PACKAGE_CAIRO
+     select BR2_PACKAGE_CAIRO_ZLIB

We had a previous patch somewhat similar to this (but not exactly), and I made this reply:

https://lore.kernel.org/buildroot/20240815000358.6887f1bf@windsurf/

Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training
https://bootlin.com

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#14 lore raw

PATCH v2 1/1 package/libgtk4: fix compile error if cairo zlib is not enabled

In reply to Thomas Devoogdt

This commit adds some patches to avoid the need for cairo zlib. Otherwise, this error occurs at build time:

../gtk/gtkprintoperation.c:26:10: fatal error: cairo-pdf.h: No such file or directory

Note that libpng has to be selected since cairo only selects it if zlib support is enabled.

Upstream issue: https://gitlab.gnome.org/GNOME/gtk/-/issues/5072.
Upstream fix: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7717.

These patches have been needed since the introduction of libgtk4, libgtk3 was a bit different since buildroot selected the required cairo-{ps,pdf,svg} since the introduction of that package.

---
v2: replace the BR2_PACKAGE_CAIRO_ZLIB selection with some patches that avoid the need for it

---
 ...ntoperation-unix-portal-.c-add-CAIRO.patch | 198 ++++++++++++++++
 ...kends-gtkprintbackendfile.c-add-CAIR.patch | 219 ++++++++++++++++++
 ...ndernodeparser.c-add-CAIRO_HAS-check.patch |  31 +++
 package/libgtk4/Config.in                     |   1 +
 package/libgtk4/libgtk4.mk                    |   1 +
 5 files changed, 450 insertions(+)
 create mode 100644 package/libgtk4/0001-gtk-print-gtkprintoperation-unix-portal-.c-add-CAIRO.patch
 create mode 100644 package/libgtk4/0002-modules-printbackends-gtkprintbackendfile.c-add-CAIR.patch
 create mode 100644 package/libgtk4/0003-gsk-gskrendernodeparser.c-add-CAIRO_HAS-check.patch
package/libgtk4/0001-gtk-print-gtkprintoperation-unix-portal-.c-add-CAIRO.patch new file +198 -0
new file mode 100644
index 0000000000..70622b6412
@@ -0,0 +1,198 @@
+From 44c2d24ea45d3014458e7d4f77fb6332b9746436 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <[email protected]>
+Date: Sun, 15 Sep 2024 19:50:51 +0200
+Subject: [PATCH] gtk/print/gtkprintoperation{,-unix,-portal}.c: add CAIRO_HAS
+ checks
+
+This is similar to the checks in tools/gtk-rendernode-tool-render.c.
+
+resolves #5072
+
+Signed-off-by: Thomas Devoogdt <[email protected]>
+(cherry picked from commit ffc8f34dfd560f36659aa1d5b5684fa97c4f4ebc)
+Upstream: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7717
+---
+ gtk/print/gtkprintoperation-portal.c |  9 +++++++++
+ gtk/print/gtkprintoperation-unix.c   | 17 +++++++++++++++++
+ gtk/print/gtkprintoperation.c        | 10 +++++++++-
+ 3 files changed, 35 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/print/gtkprintoperation-portal.c b/gtk/print/gtkprintoperation-portal.c
+index afc276067b..3b91bf0830 100644
+--- a/gtk/print/gtkprintoperation-portal.c
++++ b/gtk/print/gtkprintoperation-portal.c
+@@ -24,8 +24,13 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
++#include <cairo.h>
++#ifdef CAIRO_HAS_PDF_SURFACE
+ #include <cairo-pdf.h>
++#endif
++#ifdef CAIRO_HAS_PS_SURFACE
+ #include <cairo-ps.h>
++#endif
+ 
+ #include <gio/gunixfdlist.h>
+ 
+@@ -147,6 +152,7 @@ portal_start_page (GtkPrintOperation *op,
+     {
+       if (type == CAIRO_SURFACE_TYPE_PS)
+         {
++#ifdef CAIRO_HAS_PS_SURFACE
+           cairo_ps_surface_set_size (op_portal->surface, w, h);
+           cairo_ps_surface_dsc_begin_page_setup (op_portal->surface);
+           switch (gtk_page_setup_get_orientation (page_setup))
+@@ -164,15 +170,18 @@ portal_start_page (GtkPrintOperation *op,
+               default:
+                 break;
+             }
++#endif
+          }
+       else if (type == CAIRO_SURFACE_TYPE_PDF)
+         {
++#ifdef CAIRO_HAS_PDF_SURFACE
+           if (!op->priv->manual_orientation)
+             {
+               w = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS);
+               h = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS);
+             }
+           cairo_pdf_surface_set_size (op_portal->surface, w, h);
++#endif
+         }
+     }
+ }
+diff --git a/gtk/print/gtkprintoperation-unix.c b/gtk/print/gtkprintoperation-unix.c
+index cf52c56463..b61b9f5fd9 100644
+--- a/gtk/print/gtkprintoperation-unix.c
++++ b/gtk/print/gtkprintoperation-unix.c
+@@ -36,8 +36,13 @@
+ #include "gtkprintoperation-private.h"
+ #include "gtkprintoperation-portal.h"
+ 
++#include <cairo.h>
++#ifdef CAIRO_HAS_PDF_SURFACE
+ #include <cairo-pdf.h>
++#endif
++#ifdef CAIRO_HAS_PS_SURFACE
+ #include <cairo-ps.h>
++#endif
+ #include "gtkprintunixdialog.h"
+ #include "gtkpagesetupunixdialog.h"
+ #include "gtkprintbackendprivate.h"
+@@ -90,6 +95,7 @@ unix_start_page (GtkPrintOperation *op,
+     {
+       if (type == CAIRO_SURFACE_TYPE_PS)
+         {
++#ifdef CAIRO_HAS_PS_SURFACE
+           cairo_ps_surface_set_size (op_unix->surface, w, h);
+           cairo_ps_surface_dsc_begin_page_setup (op_unix->surface);
+           switch (gtk_page_setup_get_orientation (page_setup))
+@@ -106,15 +112,18 @@ unix_start_page (GtkPrintOperation *op,
+               default:
+                 break;
+             }
++#endif
+          }
+       else if (type == CAIRO_SURFACE_TYPE_PDF)
+         {
++#ifdef CAIRO_HAS_PDF_SURFACE
+           if (!op->priv->manual_orientation)
+             {
+               w = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS);
+               h = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS);
+             }
+           cairo_pdf_surface_set_size (op_unix->surface, w, h);
++#endif
+         }
+     }
+ }
+@@ -746,6 +755,7 @@ gtk_print_operation_unix_run_dialog_async (GtkPrintOperation          *op,
+     }
+ }
+ 
++#ifdef CAIRO_HAS_PDF_SURFACE
+ static cairo_status_t
+ write_preview (void                *closure,
+                const unsigned char *data,
+@@ -817,6 +827,7 @@ gtk_print_operation_unix_create_preview_surface (GtkPrintOperation *op,
+ 
+   return surface;
+ }
++#endif
+ 
+ static void
+ gtk_print_operation_unix_preview_start_page (GtkPrintOperation *op,
+@@ -838,11 +849,13 @@ gtk_print_operation_unix_resize_preview_surface (GtkPrintOperation *op,
+                                                  GtkPageSetup      *page_setup,
+                                                  cairo_surface_t   *surface)
+ {
++#ifdef CAIRO_HAS_PDF_SURFACE
+   double w, h;
+ 
+   w = gtk_page_setup_get_paper_width (page_setup, GTK_UNIT_POINTS);
+   h = gtk_page_setup_get_paper_height (page_setup, GTK_UNIT_POINTS);
+   cairo_pdf_surface_set_size (surface, w, h);
++#endif
+ }
+ 
+ static GtkPrintOperationResult
+@@ -1292,7 +1305,11 @@ _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation
+ 							      double            *dpi_y,
+ 							      char             **target)
+ {
++#ifdef CAIRO_HAS_PDF_SURFACE
+   return gtk_print_operation_unix_create_preview_surface (op, page_setup, dpi_x, dpi_y, target);
++#else
++  return NULL;
++#endif
+ }
+ 
+ void
+diff --git a/gtk/print/gtkprintoperation.c b/gtk/print/gtkprintoperation.c
+index 8aa8976a10..bacd7b21ed 100644
+--- a/gtk/print/gtkprintoperation.c
++++ b/gtk/print/gtkprintoperation.c
+@@ -23,7 +23,10 @@
+ #include <math.h>
+ #include <string.h>
+ 
++#include <cairo.h>
++#ifdef CAIRO_HAS_PDF_SURFACE
+ #include <cairo-pdf.h>
++#endif
+ 
+ #include <glib/gi18n-lib.h>
+ #include "gtkmarshalers.h"
+@@ -1953,6 +1956,7 @@ create_page_setup (GtkPrintOperation *op)
+   return page_setup;
+ }
+ 
++#ifdef CAIRO_HAS_PDF_SURFACE
+ static void 
+ pdf_start_page (GtkPrintOperation *op,
+ 		GtkPrintContext   *print_context,
+@@ -2063,7 +2067,7 @@ run_pdf (GtkPrintOperation  *op,
+   
+   return GTK_PRINT_OPERATION_RESULT_APPLY; 
+ }
+-
++#endif
+ 
+ static void
+ clamp_page_ranges (PrintPagesData *data)
+@@ -3096,7 +3100,11 @@ gtk_print_operation_run (GtkPrintOperation        *op,
+        */
+       priv->is_sync = TRUE;
+       g_return_val_if_fail (priv->export_filename != NULL, GTK_PRINT_OPERATION_RESULT_ERROR);
++#ifdef CAIRO_HAS_PDF_SURFACE
+       result = run_pdf (op, parent, &do_print);
++#else
++      result = GTK_PRINT_OPERATION_RESULT_ERROR;
++#endif
+     }
+   else if (action == GTK_PRINT_OPERATION_ACTION_PREVIEW)
+     {
+-- 
+2.43.0
+
package/libgtk4/0002-modules-printbackends-gtkprintbackendfile.c-add-CAIR.patch new file +219 -0

219 lines not on this page · raw message

package/libgtk4/0003-gsk-gskrendernodeparser.c-add-CAIRO_HAS-check.patch new file +31 -0
new file mode 100644
index 0000000000..fb3ab3b9af
@@ -0,0 +1,31 @@
+From 853e852d9f8de5c474c64a0f6b56924ccffe54a3 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <[email protected]>
+Date: Sun, 15 Sep 2024 20:51:20 +0200
+Subject: [PATCH] gsk/gskrendernodeparser.c: add CAIRO_HAS check
+
+resolves #5072
+
+Signed-off-by: Thomas Devoogdt <[email protected]>
+(cherry picked from commit 3610ac0fd1e6e17e280b17cde7d9b1c995ede351)
+Upstream: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7717
+---
+ gsk/gskrendernodeparser.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c
+index 9f7602d98d..aa24163f23 100644
+--- a/gsk/gskrendernodeparser.c
++++ b/gsk/gskrendernodeparser.c
+@@ -4415,7 +4415,9 @@ render_node_print (Printer       *p,
+         if (surface != NULL)
+           {
+             array = g_byte_array_new ();
++#if CAIRO_HAS_PNG_FUNCTIONS
+             cairo_surface_write_to_png_stream (surface, cairo_write_array, array);
++#endif
+ 
+             _indent (p);
+             g_string_append (p->str, "pixels: url(\"data:image/png;base64,");
+-- 
+2.43.0
+
package/libgtk4/Config.in +1 -0
index 99553fc44e..2f597ea872 100644
@@ -27,6 +27,7 @@ config BR2_PACKAGE_LIBGTK4
 	select BR2_PACKAGE_GRAPHENE
 	select BR2_PACKAGE_LIBEPOXY
 	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_TIFF
 	# At least one backend is required
package/libgtk4/libgtk4.mk +1 -0
index b00a2facad..2fba4e7610 100644
@@ -21,6 +21,7 @@ LIBGTK4_DEPENDENCIES = \
 	graphene \
 	libepoxy \
 	libglib2 \
+	libpng \
 	pango \
 	$(TARGET_NLS_DEPENDENCIES)
 
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#15 lore raw

PATCH 1/1 package/webkitgtk: start using GTK4

In reply to Thomas Devoogdt

From: Thomas Devoogdt <[email protected]>

See https://webkitgtk.org/2024/03/27/webkigit-2.44.html.
GTK4 is now used by default, so use it.

---
 package/webkitgtk/Config.in    | 14 +++++++-------
 package/webkitgtk/webkitgtk.mk |  7 +++----
 2 files changed, 10 insertions(+), 11 deletions(-)
package/webkitgtk/Config.in +7 -7
index 8ee90dda1c..31d34be8ba 100644
@@ -16,10 +16,10 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 
-comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9"
+comment "webkitgtk needs libgtk4 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 10, host gcc >= 4.9"
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on !BR2_BINFMT_FLAT
-	depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
+	depends on !BR2_PACKAGE_LIBGTK4 || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_10 || \
 		!BR2_HOST_GCC_AT_LEAST_4_9
@@ -35,7 +35,7 @@ config BR2_PACKAGE_WEBKITGTK
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup3
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10
 	depends on BR2_USE_WCHAR # icu, libsoup3
-	depends on BR2_PACKAGE_LIBGTK3
+	depends on BR2_PACKAGE_LIBGTK4
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PNG
@@ -54,10 +54,10 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_WEBP
 	select BR2_PACKAGE_WEBP_DEMUX
 	select BR2_PACKAGE_WOFF2
-	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
-	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
-	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11
-	select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_LIBGTK3_X11
+	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK4_X11
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK4_X11
+	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK4_X11
+	select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_LIBGTK4_X11
 	help
 	  WebKit is an open source, standards compliant web browser
 	  engine.
package/webkitgtk/webkitgtk.mk +3 -4
index 468fefab0e..2131aef0c1 100644
@@ -14,7 +14,7 @@ WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-LGPL-2.1
 WEBKITGTK_CPE_ID_VENDOR = webkitgtk
 WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \
-	enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk3 libsecret \
+	enchant harfbuzz icu jpeg libegl libepoxy libgcrypt libgtk4 libsecret \
 	libsoup3 libtasn1 libxml2 libxslt sqlite webp woff2
 
 WEBKITGTK_CMAKE_BACKEND = ninja
@@ -28,7 +28,6 @@ WEBKITGTK_CONF_OPTS = \
 	-DENABLE_WEB_RTC=OFF \
 	-DPORT=GTK \
 	-DUSE_AVIF=OFF \
-	-DUSE_GTK4=OFF \
 	-DUSE_LIBHYPHEN=OFF \
 	-DUSE_WOFF2=ON
 
@@ -103,7 +102,7 @@ else
 WEBKITGTK_CONF_OPTS += -DUSE_GBM=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
+ifeq ($(BR2_PACKAGE_LIBGTK4_X11),y)
 WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=ON
 WEBKITGTK_DEPENDENCIES += libgl \
 	xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt
@@ -111,7 +110,7 @@ else
 WEBKITGTK_CONF_OPTS += -DENABLE_X11_TARGET=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y)
+ifeq ($(BR2_PACKAGE_LIBGTK4_WAYLAND),y)
 WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON
 else
 WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=OFF
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Acked-by on v1 1/1
#16 lore raw
In reply to Thomas Devoogdt

Hi Thomas,

Thanks for updating the libsoup3 version, patch LGTM.

Quoted 7 lines · On Thu, 29 Aug 2024 15:12:28 +0200 Thomas Devoogdt <[email protected]> wrote:

From: Thomas Devoogdt <[email protected]>

News:
- https://download.gnome.org/sources/libsoup/3.5/libsoup-3.5.2.news
- https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.0.news

Quoted 39 lines
---
 package/libsoup3/libsoup3.hash | 4 ++--
 package/libsoup3/libsoup3.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/libsoup3/libsoup3.hash +2 -2
index 139771a11e..37ecd2db84 100644
@@ -1,4 +1,4 @@
-# From https://download.gnome.org/sources/libsoup/3.5/libsoup-3.5.1.sha256sum
-sha256  c1d7cfb89832d35c271f37d544f2cfe21fa60ae9faad4a7ac58996ae4031f7ba  libsoup-3.5.1.tar.xz
+# From https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.0.sha256sum
+sha256  62959f791e8e8442f8c13cedac8c4919d78f9120d5bb5301be67a5e53318b4a3  libsoup-3.6.0.tar.xz
 # Locally calculated
 sha256  b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
package/libsoup3/libsoup3.mk +2 -2
index bc3ae4d0cb..f8a7e26159 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSOUP3_VERSION_MAJOR = 3.5
-LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).1
+LIBSOUP3_VERSION_MAJOR = 3.6
+LIBSOUP3_VERSION = $(LIBSOUP3_VERSION_MAJOR).0
 LIBSOUP3_SOURCE = libsoup-$(LIBSOUP3_VERSION).tar.xz
 LIBSOUP3_SITE = https://download.gnome.org/sources/libsoup/$(LIBSOUP3_VERSION_MAJOR)
 LIBSOUP3_LICENSE = LGPL-2.0+
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Cheers,
—Adrián

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#17 lore raw
In reply to Thomas Devoogdt
Quoted 11 lines · On Thu, 29 Aug 2024 15:12:28 +0200 Thomas Devoogdt <[email protected]> wrote:

From: Thomas Devoogdt <[email protected]>

News:
- https://download.gnome.org/sources/libsoup/3.5/libsoup-3.5.2.news
- https://download.gnome.org/sources/libsoup/3.6/libsoup-3.6.0.news

---
 package/libsoup3/libsoup3.hash | 4 ++--
 package/libsoup3/libsoup3.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Applied to next, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot