Index: 2.40.2/Makefile
===================================================================
--- 2.40.2/Makefile (revision 138)
+++ 2.40.2/Makefile (revision 139)
@@ -392,42 +392,23 @@
@mkdir -p $(build_dir)
# ======= Build WebKitGtk =======
@( cd $(build_dir) ; \
- $(BUILD_ENVIRONMENT) $(python_environment) cmake -G 'Unix Makefiles' $(configure_switches) ../$(src_dir_name) ; \
+ $(BUILD_ENVIRONMENT) $(python_environment) cmake -G Ninja $(configure_switches) ../$(src_dir_name) ; \
)
- # ======= Include cmakeconfig.h =======
@( cd $(build_dir) ; \
- for file in `find . -type f -name 'flags.make' -print` ; do \
- sed -i 's,^C_INCLUDES =,C_INCLUDES = -I$(CURDIR)/$(build_dir),' $${file} ; \
- sed -i 's,^CXX_INCLUDES =,CXX_INCLUDES = -I$(CURDIR)/$(build_dir),' $${file} ; \
- done ; \
+ sed -i '/COMMAND = .*g-ir-scanner/s, env CC=[^ ]*, env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(python_environment) CC="$(CCACHE)$(CROSS_PREFIX)gcc",g' build.ninja ; \
)
- # ======= Python3 environment for g-ir-scanner =======
@( cd $(build_dir) ; \
- for file in `find . -type f -name 'build.make' -print` ; do \
- sed -i '/[ ][^ ]*g-ir-scanner[^ ]*/s,\([ ][^ ]*g-ir-scanner[^ ]*\), $(python_environment) \1,g' $${file} ; \
- done ; \
+ env -i CCACHE_BASEDIR=$(CCACHE_BASEDIR) \
+ CCACHE_DIR=$(CCACHE_DIR) \
+ CCACHE_UMASK=$(CCACHE_UMASK) \
+ ninja -j1 ; \
)
- # ======= PKG_CONFIG_PATH to find libsoup3 for *.gir files =======
- @( cd $(build_dir) ; \
- for file in `find . -type f -name 'build.make' -print` ; do \
- sed -i 's, env CC=[^ ]*, env PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) CC="$(CCACHE)$(CROSS_PREFIX)gcc",g' $${file} ; \
- done ; \
- )
- # ======= Use CCACHE for CC and CXX compilers =======
- @( cd $(build_dir) ; \
- for file in `find . -type f -name 'build.make' -print` ; do \
- sed -i 's,&& $(CROSS_PREFIX)gcc,&& $(CCACHE)$(CROSS_PREFIX)gcc",g' $${file} ; \
- sed -i 's,&& $(CROSS_PREFIX)g++,&& $(CCACHE)$(CROSS_PREFIX)g++",g' $${file} ; \
- done ; \
- )
- # ======= Use make instead of $$(MAKE) for parallel build =======
- @( cd $(build_dir) ; env -i CCACHE_BASEDIR=$(TOP_BUILD_DIR_ABS) make $(WEBKIT_JOBS) )
@touch $@
$(install_target): $(build_target)
@mkdir -p $(WEBKITGTK_PKG)
# ======= Install WebKitGtk =======
- @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) install $(env_sysroot)
+ @cd $(build_dir) && $(env_sysroot) ninja install
# ======= Do not provide WebKitWebDriver (see: webkitgtk 6.0) =======
@rm -rf $(WEBKITGTK_PKG)/usr/bin
# ======= Install Documentation (without full html Documentation) =======
Index: 2.40.2/PATCHES
===================================================================
--- 2.40.2/PATCHES (revision 138)
+++ 2.40.2/PATCHES (revision 139)
@@ -1,6 +1,7 @@
-../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-arm-neon.patch -p0
-../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-i386-sse.patch -p0
+../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-arm-neon.patch -p0
+../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-i386-sse.patch -p0
-../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-bwrap-cross.patch -p0
-../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-ui-process-crash.patch -p0
+../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-bwrap-cross.patch -p0
+../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-ui-process-crash.patch -p0
+../../../../sources/packages/x/webkitgtk/patches/webkitgtk-2.40.2-suppress-cast-align.patch -p0