Skip to contentSkip to conversation

package/midori: bump to version 9.0

PATCH Applied Adam Duskett 3 participants 12 messages Nov 4, 2021 – Nov 23, 2021

lore
Share & tools
lore
#0 lore raw

cover package/midori: bump to version 9.0

This is a huge update that took me a few weeks of playing around with to get going.

Heres the tldr version:
- Midori now lives at https://github.com/midori-browser/core
- The latest version builds with host-python3
- libpeas is a requirement of midori 9.0
- webkitgtk has to be compiled with introspection support
- gcr and it's ui plugin is no longer optional
- gcr ui also works with wayland and x11

I tested this with test-pkg -a
45 builds, 38 skipped, 0 build failed, 0 legal-info failed

It's huge, it's complicated, and it needs review.

You're welcome ;)

Adam

Adam Duskett (4):
package/gcr/gcr.mk: enable gtk backend for wayland package/webkitgtk: add gobject-introspection optional dependency package/libpeas: new package
package/midori: bump to version 9.0

 package/Config.in                             |  3 +-
 package/gcr/gcr.mk                            |  4 +-
 package/libpeas/Config.in                     | 45 ++++++++++++++++++
 package/libpeas/libpeas.hash                  |  4 ++
 package/libpeas/libpeas.mk                    | 38 +++++++++++++++
 .../0001-disable-vala-fatal-warnings.patch    | 30 ++++++++++++
 package/midori/0001-fix-bug-1492932.patch     | 44 ------------------
 ...ion-to-specify-path-to-g-ir-compiler.patch | 37 +++++++++++++++
 package/midori/0002-gcr-for-x11-only.patch    | 32 -------------
 package/midori/Config.in                      | 46 ++++++++++++++-----
 package/midori/midori.hash                    |  4 +-
 package/midori/midori.mk                      | 19 ++++----
 package/webkitgtk/webkitgtk.mk                |  8 +++-
 13 files changed, 210 insertions(+), 104 deletions(-)
 create mode 100644 package/libpeas/Config.in
 create mode 100644 package/libpeas/libpeas.hash
 create mode 100644 package/libpeas/libpeas.mk
 create mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch
 delete mode 100644 package/midori/0001-fix-bug-1492932.patch
 create mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch
 delete mode 100644 package/midori/0002-gcr-for-x11-only.patch
Signature · 6 lines
2.32.0

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

PATCH 1/4 package/gcr/gcr.mk: enable gtk backend for wayland

gcr has supported wayland since commit
685e1da9642b7a3fb0dbe1afda482f7bd5b05f33.

---
 package/gcr/gcr.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/gcr/gcr.mk +3 -1
index d51e853f3f..ef253b4ef9 100644
@@ -30,10 +30,12 @@ else
 GCR_CONF_OPTS += -Dintrospection=false
 endif
 
-# Only the X11 backend is supported for the simple GUI
 ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
 GCR_DEPENDENCIES += libgtk3
 GCR_CONF_OPTS += -Dgtk=true
+else ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y)
+GCR_DEPENDENCIES += libgtk3
+GCR_CONF_OPTS += -Dgtk=true
 else
 GCR_CONF_OPTS += -Dgtk=false
 endif
Signature · 6 lines
2.32.0

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

Re: [Buildroot] [PATCH vRFC 1/4] package/gcr/gcr.mk: enable gtk backend for wayland

Quoted 4 lines · Adam Duskett

gcr has supported wayland since commit
685e1da9642b7a3fb0dbe1afda482f7bd5b05f33.

Applied to next, thanks.

Regards,
Arnout

Quoted 13 lines
---
  package/gcr/gcr.mk | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
package/gcr/gcr.mk +0 -0
index d51e853f3f..ef253b4ef9 100644
@@ -30,10 +30,12 @@ else
  GCR_CONF_OPTS += -Dintrospection=false
  endif
 

package/gcr/gcr.mk else · line 41

Quoted 10 lines
package/gcr/gcr.mk +3 -1
-# Only the X11 backend is supported for the simple GUI
  ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
  GCR_DEPENDENCIES += libgtk3
  GCR_CONF_OPTS += -Dgtk=true
+else ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y)
+GCR_DEPENDENCIES += libgtk3
+GCR_CONF_OPTS += -Dgtk=true
  else
  GCR_CONF_OPTS += -Dgtk=false
  endif

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

#3 lore raw

PATCH 2/4 package/webkitgtk: add gobject-introspection optional dependency

In reply to Adam Duskett

Enable introspection when GObject Introspection is enabled. Midori 9.0 requires webkitgtk built with gobject-introspection support.

---
 package/webkitgtk/webkitgtk.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/webkitgtk/webkitgtk.mk +7 -1
index a3db249ae6..4d5d0b89e2 100644
@@ -21,7 +21,6 @@ WEBKITGTK_CONF_OPTS = \
 	-DENABLE_GAMEPAD=OFF \
 	-DENABLE_GEOLOCATION=OFF \
 	-DENABLE_GTKDOC=OFF \
-	-DENABLE_INTROSPECTION=OFF \
 	-DENABLE_MINIBROWSER=ON \
 	-DENABLE_SPELLCHECK=ON \
 	-DPORT=GTK \
@@ -59,6 +58,13 @@ else
 WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON
+WEBKITGTK_DEPENDENCIES += gobject-introspection
+else
+WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF
+endif
+
 # Only one target platform can be built, assume X11 > Wayland
 
 # GTK3-X11 target gives OpenGL from newer libgtk3 versions
Signature · 6 lines
2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Reviewed-by on v1 2/4
#4 lore raw

Re: [Buildroot] [PATCH vRFC 2/4] package/webkitgtk: add gobject-introspection optional dependency

Quoted 5 lines · On Wed, 03 Nov 2021 17:36:05 -0700 Adam Duskett <[email protected]> wrote:

Enable introspection when GObject Introspection is enabled. Midori 9.0 requires webkitgtk built with gobject-introspection support.

Quoted 17 lines
---
 package/webkitgtk/webkitgtk.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/webkitgtk/webkitgtk.mk +0 -1
index a3db249ae6..4d5d0b89e2 100644
@@ -21,7 +21,6 @@ WEBKITGTK_CONF_OPTS = \
 	-DENABLE_GAMEPAD=OFF \
 	-DENABLE_GEOLOCATION=OFF \
 	-DENABLE_GTKDOC=OFF \
-	-DENABLE_INTROSPECTION=OFF \
 	-DENABLE_MINIBROWSER=ON \
 	-DENABLE_SPELLCHECK=ON \
 	-DPORT=GTK \

package/webkitgtk/webkitgtk.mk else · line 67

Quoted 10 lines
package/webkitgtk/webkitgtk.mk +7 -0
@@ -59,6 +58,13 @@ else
 WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON
+WEBKITGTK_DEPENDENCIES += gobject-introspection
+else
+WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF
+endif
+

Nice to see this happen =)

Quoted 10 lines
package/webkitgtk/webkitgtk.mk +0 -0
 # Only one target platform can be built, assume X11 > Wayland
 
 # GTK3-X11 target gives OpenGL from newer libgtk3 versions
Signature · 6 lines
2.32.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

#5 lore raw

Re: [Buildroot] [PATCH vRFC 2/4] package/webkitgtk: add gobject-introspection optional dependency

In reply to Adam Duskett
Quoted 5 lines · Adam Duskett

Enable introspection when GObject Introspection is enabled. Midori 9.0 requires webkitgtk built with gobject-introspection support.

Applied to next, thanks.

Regards,
Arnout

Quoted 21 lines
---
  package/webkitgtk/webkitgtk.mk | 8 +++++++-
  1 file changed, 7 insertions(+), 1 deletion(-)
package/webkitgtk/webkitgtk.mk +0 -1
index a3db249ae6..4d5d0b89e2 100644
@@ -21,7 +21,6 @@ WEBKITGTK_CONF_OPTS = \
  	-DENABLE_GAMEPAD=OFF \
  	-DENABLE_GEOLOCATION=OFF \
  	-DENABLE_GTKDOC=OFF \
-	-DENABLE_INTROSPECTION=OFF \
  	-DENABLE_MINIBROWSER=ON \
  	-DENABLE_SPELLCHECK=ON \
  	-DPORT=GTK \
@@ -59,6 +58,13 @@ else
  WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
  endif
 

package/webkitgtk/webkitgtk.mk else · line 70

Quoted 10 lines
package/webkitgtk/webkitgtk.mk +7 -0
+ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
+WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON
+WEBKITGTK_DEPENDENCIES += gobject-introspection
+else
+WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=OFF
+endif
+
  # Only one target platform can be built, assume X11 > Wayland
 
  # GTK3-X11 target gives OpenGL from newer libgtk3 versions

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

#6 lore raw

PATCH 3/4 package/libpeas: new package

In reply to Adam Duskett

midori 9.0 requires libpeas.

---
 package/Config.in            |  1 +
 package/libpeas/Config.in    | 45 ++++++++++++++++++++++++++++++++++++
 package/libpeas/libpeas.hash |  4 ++++
 package/libpeas/libpeas.mk   | 38 ++++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 package/libpeas/Config.in
 create mode 100644 package/libpeas/libpeas.hash
 create mode 100644 package/libpeas/libpeas.mk
package/Config.in +1 -0
index c23755a421..0e2cc78d85 100644
@@ -1957,6 +1957,7 @@ menu "Other"
 	source "package/libnpth/Config.in"
 	source "package/libnspr/Config.in"
 	source "package/libosmium/Config.in"
+	source "package/libpeas/Config.in"
 	source "package/libpfm4/Config.in"
 	source "package/libplatform/Config.in"
 	source "package/libplist/Config.in"
package/libpeas/Config.in new file +45 -0

45 lines not on this page · raw message

package/libpeas/libpeas.hash new file +4 -0
new file mode 100644
index 0000000000..2b030c01c5
@@ -0,0 +1,4 @@
+# From https://ftp.gnome.org/pub/GNOME/sources/libpeas/1.30/libpeas-1.30.0.sha256sum
+sha256  0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3  libpeas-1.30.0.tar.xz
+# Locally calculated
+sha256  592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c  COPYING
package/libpeas/libpeas.mk new file +38 -0
new file mode 100644
index 0000000000..4f1ab1216a
@@ -0,0 +1,38 @@
+################################################################################
+#
+# libpeas
+#
+################################################################################
+
+LIBPEAS_VERSION_MAJOR = 1.30
+LIBPEAS_VERSION = $(LIBPEAS_VERSION_MAJOR).0
+LIBPEAS_SOURCE = libpeas-$(LIBPEAS_VERSION).tar.xz
+LIBPEAS_SITE = http://ftp.gnome.org/pub/gnome/sources/libpeas/$(LIBPEAS_VERSION_MAJOR)
+LIBPEAS_LICENSE = LGPL-2.1+
+LIBPEAS_LICENSE_FILES = COPYING
+LIBPEAS_CPE_ID_VENDOR = gnome
+LIBPEAS_INSTALL_STAGING = YES
+LIBPEAS_DEPENDENCIES = \
+	host-libglib2 \
+	host-pkgconf \
+	gobject-introspection \
+	libglib2 \
+	$(TARGET_NLS_DEPENDENCIES)
+
+LIBPEAS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
+
+LIBPEAS_CONF_OPTS = \
+	-Ddemos=false \
+	-Dglade_catalog=false \
+	-Dintrospection=true \
+	-Dlua51=false \
+	-Dvapi=false
+
+ifeq ($(BR2_PACKAGE_LIBPEAS_WIDGETS),y)
+LIBPEAS_DEPENDENCIES += libgtk3
+LIBPEAS_CONF_OPTS += -Dwidgetry=true
+else
+LIBPEAS_CONF_OPTS += -Dwidgetry=false
+endif
+
+$(eval $(meson-package))
Signature · 6 lines
2.32.0

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

Re: [Buildroot] [PATCH vRFC 3/4] package/libpeas: new package

Quoted 110 lines · Adam Duskett

midori 9.0 requires libpeas.

---
  package/Config.in            |  1 +
  package/libpeas/Config.in    | 45 ++++++++++++++++++++++++++++++++++++
  package/libpeas/libpeas.hash |  4 ++++
  package/libpeas/libpeas.mk   | 38 ++++++++++++++++++++++++++++++
  4 files changed, 88 insertions(+)

create mode 100644 package/libpeas/Config.in
create mode 100644 package/libpeas/libpeas.hash
create mode 100644 package/libpeas/libpeas.mk

package/Config.in +1 -0
index c23755a421..0e2cc78d85 100644
@@ -1957,6 +1957,7 @@ menu "Other"
  	source "package/libnpth/Config.in"
  	source "package/libnspr/Config.in"
  	source "package/libosmium/Config.in"
+	source "package/libpeas/Config.in"
  	source "package/libpfm4/Config.in"
  	source "package/libplatform/Config.in"
  	source "package/libplist/Config.in"
package/libpeas/Config.in new file +45 -0
new file mode 100644
index 0000000000..430e668ee7
@@ -0,0 +1,45 @@
+config BR2_PACKAGE_LIBPEAS
+	bool "libpeas"
+	depends on BR2_USE_MMU # gobject-introspection
+	depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection
+	depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu
+	depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection
+	depends on BR2_PACKAGE_PYTHON3 # gobject-introspection
+	select BR2_PACKAGE_GOBJECT_INTROSPECTION
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  libpeas is a gobject-based plugins engine, and is targetted at
+	  giving every application the chance to assume its own
+	  extensibility. It also has a set of features including, but
+	  not limited to:
+	    - multiple extension points
+	    - On demand (lazy) programming language support for C,
+	      Python and Lua
+	    - Simplicity of the API
+
+	  https://wiki.gnome.org/Projects/Libpeas
+
+if BR2_PACKAGE_LIBPEAS
+
+config BR2_PACKAGE_LIBPEAS_WIDGETS
+	bool "widgets"
+	depends on BR2_PACKAGE_LIBGTK3
+	help
+	  Build GTK+ widgetry
+
+comment "widget support needs libgtk3"
+	depends on !BR2_PACKAGE_LIBGTK3
+
+endif
+
+comment "libpeas needs python3"
+	depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
+	depends on !BR2_PACKAGE_PYTHON3
+
+comment "libpeas needs a glibc toolchain, gcc >= 4.9, host gcc >= 8"
+	depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_USES_GLIBC || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_8
package/libpeas/libpeas.hash new file +4 -0
new file mode 100644
index 0000000000..2b030c01c5
@@ -0,0 +1,4 @@
+# From https://ftp.gnome.org/pub/GNOME/sources/libpeas/1.30/libpeas-1.30.0.sha256sum
+sha256  0bf5562e9bfc0382a9dcb81f64340787542568762a3a367d9d90f6185898b9a3  libpeas-1.30.0.tar.xz
+# Locally calculated
+sha256  592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c  COPYING
package/libpeas/libpeas.mk new file +18 -0
new file mode 100644
index 0000000000..4f1ab1216a
@@ -0,0 +1,38 @@
+################################################################################
+#
+# libpeas
+#
+################################################################################
+
+LIBPEAS_VERSION_MAJOR = 1.30
+LIBPEAS_VERSION = $(LIBPEAS_VERSION_MAJOR).0
+LIBPEAS_SOURCE = libpeas-$(LIBPEAS_VERSION).tar.xz
+LIBPEAS_SITE = http://ftp.gnome.org/pub/gnome/sources/libpeas/$(LIBPEAS_VERSION_MAJOR)
+LIBPEAS_LICENSE = LGPL-2.1+
+LIBPEAS_LICENSE_FILES = COPYING
+LIBPEAS_CPE_ID_VENDOR = gnome
+LIBPEAS_INSTALL_STAGING = YES
+LIBPEAS_DEPENDENCIES = \
+	host-libglib2 \
+	host-pkgconf \
+	gobject-introspection \

package/libpeas/libpeas.mk line 28

Quoted 10 lines
package/libpeas/libpeas.mk new file +10 -0
+	libglib2 \
+	$(TARGET_NLS_DEPENDENCIES)
+
+LIBPEAS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
+
+LIBPEAS_CONF_OPTS = \
+	-Ddemos=false \
+	-Dglade_catalog=false \
+	-Dintrospection=true \
+	-Dlua51=false \

I've also explicitly disabled python2 and python3, and added a comment in the
commit message that this is because they're not tested.

I noticed that even before that change, the python3 loader wasn't built. Weird.

Applied to next, thanks.

Regards,
Arnout

package/libpeas/libpeas.mk line 38

Quoted 11 lines
package/libpeas/libpeas.mk new file +10 -0
+	-Dvapi=false
+
+ifeq ($(BR2_PACKAGE_LIBPEAS_WIDGETS),y)
+LIBPEAS_DEPENDENCIES += libgtk3
+LIBPEAS_CONF_OPTS += -Dwidgetry=true
+else
+LIBPEAS_CONF_OPTS += -Dwidgetry=false
+endif
+
+$(eval $(meson-package))

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

#8 lore raw

PATCH 4/4 package/midori: bump to version 9.0

In reply to Adam Duskett

This is a substantial update as the last time the midori version was bumped was on Fri Apr 29 2016 commit 54bbd88b1f0c4de25688dae1d0c30d222722feb4.

Changes:

package/Config.in: Move midori out of the "X applications" submenu and into the "Graphic applications" submenu, as it is not dependent on X.

- Drop the two existing patches as they no longer apply.
- 0001-disable-vala-fatal-warnings.patch: new patch. This patch fixes errors when building midori in a buildroot source repository that is also a git project.

- 0002-add-option-to-specify-path-to-g-ir-compiler.patchL new patch. This patch introduces a new option that allows the make system to specify a path to the g-ir-compiler, or else the host path's g-ir-compiler is used which results in failed builds.

- Change the site to the github repository, as that is where the latest releases are published.

- New dependencies: gobject-introspection, json-glib, libarchive, and libpeas.
- gcr is no longer an optional dependency.
- host-python3 is now a mandatory dependency.

---
 package/Config.in                             |  2 +-
 .../0001-disable-vala-fatal-warnings.patch    | 30 ++++++++++++
 package/midori/0001-fix-bug-1492932.patch     | 44 ------------------
 ...ion-to-specify-path-to-g-ir-compiler.patch | 37 +++++++++++++++
 package/midori/0002-gcr-for-x11-only.patch    | 32 -------------
 package/midori/Config.in                      | 46 ++++++++++++++-----
 package/midori/midori.hash                    |  4 +-
 package/midori/midori.mk                      | 19 ++++----
 8 files changed, 112 insertions(+), 102 deletions(-)
 create mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch
 delete mode 100644 package/midori/0001-fix-bug-1492932.patch
 create mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch
 delete mode 100644 package/midori/0002-gcr-for-x11-only.patch
package/Config.in +1 -1
index 0e2cc78d85..dc939ebf97 100644
@@ -307,6 +307,7 @@ 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"
@@ -377,7 +378,6 @@ comment "X applications"
 	source "package/gmpc/Config.in"
 	source "package/gtkperf/Config.in"
 	source "package/leafpad/Config.in"
-	source "package/midori/Config.in"
 	source "package/mupdf/Config.in"
 	source "package/nodm/Config.in"
 	source "package/pcmanfm/Config.in"
package/midori/0001-disable-vala-fatal-warnings.patch new file +30 -0
new file mode 100644
index 0000000000..c3f245f141
@@ -0,0 +1,30 @@
+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/0001-fix-bug-1492932.patch deleted +0 -44

44 lines not on this page · raw message

package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch new file +37 -0
new file mode 100644
index 0000000000..4bbcbaaf12
@@ -0,0 +1,37 @@
+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/0002-gcr-for-x11-only.patch deleted +0 -32
deleted file mode 100644
index 85e769765f..0000000000
@@ -1,32 +0,0 @@
-GCR support only works/is useful with X11 support.
-
-Reported upstream: https://bugs.launchpad.net/midori/+bug/1515985
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura midori-0.5.11.orig/CMakeLists.txt midori-0.5.11/CMakeLists.txt
---- midori-0.5.11.orig/CMakeLists.txt	2015-11-12 13:41:02.045898814 -0300
-+++ midori-0.5.11/CMakeLists.txt	2015-11-12 14:00:09.765545018 -0300
-@@ -175,18 +175,14 @@
-     set(PKGS ${PKGS} zeitgeist-2.0)
- endif()
- 
--if (WIN32)
--    add_definitions("-DGCR_VERSION=\"No\"")
--else ()
--    if (USE_GTK3)
--        pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
--    else ()
--        pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
--    endif ()
-+if (USE_GTK3 AND X11)
-+    pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
-     add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
-     add_definitions("-DHAVE_GCR")
-     set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
-     set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
-+else ()
-+    add_definitions("-DGCR_VERSION=\"No\"")
- endif ()
- 
- if (HALF_BRO_INCOM_WEBKIT2)
package/midori/Config.in +34 -12

65 lines not on this page · raw message

package/midori/midori.hash +1 -3
index d8fd1b7a26..d0be396a5a 100644
@@ -1,5 +1,3 @@
-# From download link @ http://midori-browser.org/download/source/
-sha1	64c86935028feb5f89d799c2acacaad67764da6f	midori_0.5.11_all_.tar.bz2
-
 # Locally computed
+sha256  913a7cba95ddcc3dc5f6b12d861e765d6fa990fe7d4efc3768d3a3567ea460db  midori-9.0.tar.gz
 sha256  5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING
package/midori/midori.mk +9 -10
index eebec815c0..693507dbb3 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-MIDORI_VERSION = 0.5.11
-MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2
-MIDORI_SITE = http://midori-browser.org/downloads
+MIDORI_VERSION = 9.0
+MIDORI_SITE = $(call github,midori-browser,core,v$(MIDORI_VERSION))
 MIDORI_LICENSE = LGPL-2.1+
 MIDORI_LICENSE_FILES = COPYING
 MIDORI_CPE_ID_VENDOR = midori-browser
@@ -15,10 +14,14 @@ MIDORI_DEPENDENCIES = \
 	host-librsvg \
 	host-pkgconf \
 	host-vala \
-	host-python \
-	$(if $(BR2_PACKAGE_LIBGTK3_X11),gcr) \
+	host-python3 \
+	gcr \
+	gobject-introspection \
 	granite \
+	json-glib \
+	libarchive \
 	libgtk3 \
+	libpeas \
 	libsoup \
 	libxml2 \
 	sqlite \
@@ -26,10 +29,6 @@ MIDORI_DEPENDENCIES = \
 	$(TARGET_NLS_DEPENDENCIES) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
-MIDORI_CONF_OPTS = \
-	-DHALF_BRO_INCOM_WEBKIT2=ON \
-	-DUSE_GRANITE=ON \
-	-DUSE_GTK3=ON \
-	-DUSE_ZEITGEIST=OFF
+MIDORI_CONF_OPTS += -DGIR_COMPILER_PATH=$(STAGING_DIR)/usr/bin/g-ir-compiler
 
 $(eval $(cmake-package))
Signature · 6 lines
2.32.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#9 lore raw
Quoted 41 lines · Adam Duskett

This is a substantial update as the last time the midori version was bumped was on Fri Apr 29 2016 commit 54bbd88b1f0c4de25688dae1d0c30d222722feb4.

Changes:

package/Config.in: Move midori out of the "X applications" submenu and into the "Graphic applications" submenu, as it is not dependent on X.

- Drop the two existing patches as they no longer apply.
- 0001-disable-vala-fatal-warnings.patch: new patch. This patch fixes errors when building midori in a buildroot source repository that is also a git project.

- 0002-add-option-to-specify-path-to-g-ir-compiler.patchL new patch. This patch introduces a new option that allows the make system to specify a path to the g-ir-compiler, or else the host path's g-ir-compiler is used which results in failed builds.

- Change the site to the github repository, as that is where the latest releases are published.

- New dependencies: gobject-introspection, json-glib, libarchive, and libpeas.
- gcr is no longer an optional dependency.
- host-python3 is now a mandatory dependency.

---
  package/Config.in                             |  2 +-
  .../0001-disable-vala-fatal-warnings.patch    | 30 ++++++++++++
  package/midori/0001-fix-bug-1492932.patch     | 44 ------------------
  ...ion-to-specify-path-to-g-ir-compiler.patch | 37 +++++++++++++++
  package/midori/0002-gcr-for-x11-only.patch    | 32 -------------
  package/midori/Config.in                      | 46 ++++++++++++++-----
  package/midori/midori.hash                    |  4 +-
  package/midori/midori.mk                      | 19 ++++----
  8 files changed, 112 insertions(+), 102 deletions(-)

create mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch delete mode 100644 package/midori/0001-fix-bug-1492932.patch
create mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch delete mode 100644 package/midori/0002-gcr-for-x11-only.patch

[snip]

Quoted 40 lines
package/midori/Config.in +20 -8
index e2cc2ac612..6dbdbb764e 100644
@@ -1,31 +1,53 @@
-comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 7, host gcc >= 4.9"
+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
  	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \
+	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_4_9 || \
-		!BR2_TOOLCHAIN_USES_GLIBC
+		!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_HOST_RUSTC_ARCH_SUPPORTS # host-librsvg
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2
-	depends on BR2_PACKAGE_LIBGTK3
-	depends on BR2_HOST_GCC_AT_LEAST_4_9 # webkitgtk
+	depends on !BR2_STATIC_LIBS # webkitgtk
  	depends on BR2_INSTALL_LIBSTDCPP # webkitgtk

package/midori/Config.in line 34

Quoted 10 lines
package/midori/Config.in +5 -3
+	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_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
-	# GCR can only be used with the X11 backend
-	select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11
+	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_MIDORI_ARCH_SUPPORTS

We don't have a hard rule for it, but arch dependencies make more sense at the
beginning IMHO, so I moved this up.

Applied to next, thanks!

Regards,
Arnout

Quoted 67 lines
package/midori/Config.in +9 -1
+	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_LIBSOUP_GNOME
  	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
 
-	  http://www.midori-browser.org/
+	  https://github.com/midori-browser/core
package/midori/midori.hash +1 -3
index d8fd1b7a26..d0be396a5a 100644
@@ -1,5 +1,3 @@
-# From download link @ http://midori-browser.org/download/source/
-sha1	64c86935028feb5f89d799c2acacaad67764da6f	midori_0.5.11_all_.tar.bz2
-
  # Locally computed
+sha256  913a7cba95ddcc3dc5f6b12d861e765d6fa990fe7d4efc3768d3a3567ea460db  midori-9.0.tar.gz
  sha256  5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING
package/midori/midori.mk +8 -5
index eebec815c0..693507dbb3 100644
@@ -4,9 +4,8 @@
  #
  ################################################################################
 
-MIDORI_VERSION = 0.5.11
-MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2
-MIDORI_SITE = http://midori-browser.org/downloads
+MIDORI_VERSION = 9.0
+MIDORI_SITE = $(call github,midori-browser,core,v$(MIDORI_VERSION))
  MIDORI_LICENSE = LGPL-2.1+
  MIDORI_LICENSE_FILES = COPYING
  MIDORI_CPE_ID_VENDOR = midori-browser
@@ -15,10 +14,14 @@ MIDORI_DEPENDENCIES = \
  	host-librsvg \
  	host-pkgconf \
  	host-vala \
-	host-python \
-	$(if $(BR2_PACKAGE_LIBGTK3_X11),gcr) \
+	host-python3 \
+	gcr \
+	gobject-introspection \
  	granite \
+	json-glib \
+	libarchive \
  	libgtk3 \
+	libpeas \
  	libsoup \
  	libxml2 \
  	sqlite \
@@ -26,10 +29,6 @@ MIDORI_DEPENDENCIES = \
  	$(TARGET_NLS_DEPENDENCIES) \

package/midori/midori.mk MIDORI_DEPENDENCIES = \ · line 34

Quoted 10 lines
package/midori/midori.mk +1 -5
  	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
-MIDORI_CONF_OPTS = \
-	-DHALF_BRO_INCOM_WEBKIT2=ON \
-	-DUSE_GRANITE=ON \
-	-DUSE_GTK3=ON \
-	-DUSE_ZEITGEIST=OFF
+MIDORI_CONF_OPTS += -DGIR_COMPILER_PATH=$(STAGING_DIR)/usr/bin/g-ir-compiler
 
  $(eval $(cmake-package))

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

#10 lore raw
In reply to Adam Duskett
Quoted 11 lines · Adam Duskett

This is a huge update that took me a few weeks of playing around with to get going.

Heres the tldr version:
- Midori now lives at https://github.com/midori-browser/core
- The latest version builds with host-python3
- libpeas is a requirement of midori 9.0
- webkitgtk has to be compiled with introspection support
- gcr and it's ui plugin is no longer optional
- gcr ui also works with wayland and x11

Quoted 4 lines

I tested this with test-pkg -a
45 builds, 38 skipped, 0 build failed, 0 legal-info failed

It's huge, it's complicated, and it needs review.

Although I did spend quit a bit of time on it, it was pretty much perfect :-)

You're not in DEVELOPERS for any of these packages, so I guess you'll be
monitoring the autobuilders by hand for the coming month or so?

Regards,
Arnout

Quoted 25 lines

You're welcome ;)

Adam

Adam Duskett (4):
package/gcr/gcr.mk: enable gtk backend for wayland package/webkitgtk: add gobject-introspection optional dependency package/libpeas: new package
package/midori: bump to version 9.0

  package/Config.in                             |  3 +-
  package/gcr/gcr.mk                            |  4 +-
  package/libpeas/Config.in                     | 45 ++++++++++++++++++
  package/libpeas/libpeas.hash                  |  4 ++
  package/libpeas/libpeas.mk                    | 38 +++++++++++++++
  .../0001-disable-vala-fatal-warnings.patch    | 30 ++++++++++++
  package/midori/0001-fix-bug-1492932.patch     | 44 ------------------
  ...ion-to-specify-path-to-g-ir-compiler.patch | 37 +++++++++++++++
  package/midori/0002-gcr-for-x11-only.patch    | 32 -------------
  package/midori/Config.in                      | 46 ++++++++++++++-----
  package/midori/midori.hash                    |  4 +-
  package/midori/midori.mk                      | 19 ++++----
  package/webkitgtk/webkitgtk.mk                |  8 +++-
  13 files changed, 210 insertions(+), 104 deletions(-)
Quoted 8 lines

create mode 100644 package/libpeas/Config.in
create mode 100644 package/libpeas/libpeas.hash
create mode 100644 package/libpeas/libpeas.mk
create mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch delete mode 100644 package/midori/0001-fix-bug-1492932.patch
create mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch delete mode 100644 package/midori/0002-gcr-for-x11-only.patch

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

#11 lore raw

Wow, I didn't expect it to be pretty much perfect! That's fantastic! Thank you so much! And yes, I will be checking the autobuilders for failures!

Adam

Quoted 20 lines · Arnout Vandecappelle
Quoted 11 lines · Adam Duskett

This is a huge update that took me a few weeks of playing around with to get going.

Heres the tldr version:
- Midori now lives at https://github.com/midori-browser/core
- The latest version builds with host-python3
- libpeas is a requirement of midori 9.0
- webkitgtk has to be compiled with introspection support
- gcr and it's ui plugin is no longer optional
- gcr ui also works with wayland and x11

Quoted 4 lines

I tested this with test-pkg -a
45 builds, 38 skipped, 0 build failed, 0 legal-info failed

It's huge, it's complicated, and it needs review.

Quoted 41 lines

Although I did spend quit a bit of time on it, it was pretty much perfect :-)

You're not in DEVELOPERS for any of these packages, so I guess you'll be
monitoring the autobuilders by hand for the coming month or so?

Regards,
Arnout

Quoted 33 lines

You're welcome ;)

Adam

Adam Duskett (4):
package/gcr/gcr.mk: enable gtk backend for wayland package/webkitgtk: add gobject-introspection optional dependency package/libpeas: new package
package/midori: bump to version 9.0

  package/Config.in                             |  3 +-
  package/gcr/gcr.mk                            |  4 +-
  package/libpeas/Config.in                     | 45 ++++++++++++++++++
  package/libpeas/libpeas.hash                  |  4 ++
  package/libpeas/libpeas.mk                    | 38 +++++++++++++++
  .../0001-disable-vala-fatal-warnings.patch    | 30 ++++++++++++
  package/midori/0001-fix-bug-1492932.patch     | 44 ------------------
  ...ion-to-specify-path-to-g-ir-compiler.patch | 37 +++++++++++++++
  package/midori/0002-gcr-for-x11-only.patch    | 32 -------------
  package/midori/Config.in                      | 46 ++++++++++++++-----
  package/midori/midori.hash                    |  4 +-
  package/midori/midori.mk                      | 19 ++++----
  package/webkitgtk/webkitgtk.mk                |  8 +++-
  13 files changed, 210 insertions(+), 104 deletions(-)

create mode 100644 package/libpeas/Config.in
create mode 100644 package/libpeas/libpeas.hash
create mode 100644 package/libpeas/libpeas.mk
create mode 100644 package/midori/0001-disable-vala-fatal-warnings.patch delete mode 100644 package/midori/0001-fix-bug-1492932.patch
create mode 100644 package/midori/0002-add-option-to-specify-path-to-g-ir-compiler.patch delete mode 100644 package/midori/0002-gcr-for-x11-only.patch

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