Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (5cdeba7c80e7323568cd180acf14637eb1e53e8c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (5cdeba7c80e7323568cd180acf14637eb1e53e8c)
  • Date: Wed, 4 Jan 2023 04:13:29 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

http/webkitgtk3/BUILD | 18 +-----------------
http/webkitgtk3/CONFIGURE | 2 ++
http/webkitgtk3/DEPENDS | 25 +++++++++++++++----------
http/webkitgtk3/DETAILS | 1 +
http/webkitgtk3/HISTORY | 5 +++++
5 files changed, 24 insertions(+), 27 deletions(-)

New commits:
commit 5cdeba7c80e7323568cd180acf14637eb1e53e8c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/webkitgtk3: fixed typos in flags, converted to full cmake, added
optional LOGIN-DAEMON dependency

diff --git a/http/webkitgtk3/BUILD b/http/webkitgtk3/BUILD
index 65c4e20..1d59b05 100755
--- a/http/webkitgtk3/BUILD
+++ b/http/webkitgtk3/BUILD
@@ -1,20 +1,4 @@
# remove options not supported by ld.gold
LDFLAGS="${LDFLAGS//-Wl,-znoseparate-code}" &&
OPTS="$WEBKIT_OPTS $OPTS -DENABLE_GAMEPAD=false -DENABLE_WEBKIT_LEGACY=off
-DCMAKE_SKIP_RPATH=on -DUSE_SYSTEM_MALLOC=on -DPORT=GTK" &&
-sed -i '30i#include <unicode/utf8.h>' \
- Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp \
- Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp \
- Source/WTF/wtf/URLHelpers.cpp \
- Source/WTF/wtf/URLParser.cpp \
- Source/WTF/wtf/unicode/UTF8Conversion.cpp \
- Source/WebCore/dom/TextEncoder.cpp \
- Source/WebCore/xml/XSLTProcessorLibxslt.cpp &&
-sed -i '30i#include <unicode/utf16.h>' \
- Source/WTF/wtf/text/StringBuilder.h \
- Source/WebCore/PAL/pal/text/TextCodecCJK.cpp \
- Source/WebCore/PAL/pal/text/TextCodecSingleByte.cpp &&
-sed -i '26i#include <unicode/utf16.h>' \
- Source/WTF/wtf/text/StringImpl.h &&
-sed -i '29i#include <unicode/utf16.h>' \
- Source/WTF/wtf/unicode/UTF8Conversion.h &&
-cmake_build
+default_build
diff --git a/http/webkitgtk3/CONFIGURE b/http/webkitgtk3/CONFIGURE
index 97ef3e4..ed33b83 100755
--- a/http/webkitgtk3/CONFIGURE
+++ b/http/webkitgtk3/CONFIGURE
@@ -1,3 +1,5 @@
+source "${GRIMOIRE}/CMAKE_CONFIGURE" &&
+
config_query_option WEBKIT_OPTS "Enable support for WebGL" y \
"-DENABLE_WEBGL=ON" \
"-DENABLE_WEBGL=OFF" &&
diff --git a/http/webkitgtk3/DEPENDS b/http/webkitgtk3/DEPENDS
index 609c91a..f3a4b4c 100755
--- a/http/webkitgtk3/DEPENDS
+++ b/http/webkitgtk3/DEPENDS
@@ -1,5 +1,5 @@
+source "${GRIMOIRE}/CMAKE_DEPENDS" &&
depends -sub CXX gcc &&
-depends cmake &&
depends xz-utils &&
depends libtool &&
depends bison &&
@@ -55,18 +55,18 @@ fi &&
# 'Gamepad support?' &&

optional_depends libavif \
- 'USE_AVIF=ON' \
- 'USE_AVIF=OFF' \
+ '-DUSE_AVIF=ON' \
+ '-DUSE_AVIF=OFF' \
'Build with AVIF support?' &&

optional_depends openjpeg \
- 'USE_OPENJPEG=ON' \
- 'USE_OPENJPEG=OFF' \
+ '-DUSE_OPENJPEG=ON' \
+ '-DUSE_OPENJPEG=OFF' \
'Use openjpeg?' &&

optional_depends woff2 \
- 'USE_WOFF2=ON' \
- 'USE_WOFF2=OFF' \
+ '-DUSE_WOFF2=ON' \
+ '-DUSE_WOFF2=OFF' \
'Enable WOFF2 font support?' &&

optional_depends gtk+4 \
@@ -79,8 +79,8 @@ if !(is_depends_enabled $SPELL gtk+4); then
fi &&

optional_depends lcms2 \
- 'USE_LCMS=ON' \
- 'USE_LCMS=OFF' \
+ '-DUSE_LCMS=ON' \
+ '-DUSE_LCMS=OFF' \
'Enable LCMS support?' &&

optional_depends wpebackend-fdo \
@@ -126,4 +126,9 @@ fi &&
optional_depends gtk-doc \
'-DENABLE_DOCUMENTATION=ON' \
'-DENABLE_DOCUMENTATION=OFF' \
- 'Build documentation with gtk-doc?'
+ 'Build documentation with gtk-doc?'  &&
+
+optional_depends LOGIN-DAEMON \
+ '-DENABLE_JOURNALD_LOG=ON' \
+ '-DENABLE_JOURNALD_LOG=OFF' \
+ 'Build systemd/logind support?'
diff --git a/http/webkitgtk3/DETAILS b/http/webkitgtk3/DETAILS
index 7c9cb1c..3a51e61 100755
--- a/http/webkitgtk3/DETAILS
+++ b/http/webkitgtk3/DETAILS
@@ -1,3 +1,4 @@
+source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=webkitgtk3
VERSION=2.38.3
SOURCE=webkitgtk-$VERSION.tar.xz
diff --git a/http/webkitgtk3/HISTORY b/http/webkitgtk3/HISTORY
index c01c1a6..10ba223 100644
--- a/http/webkitgtk3/HISTORY
+++ b/http/webkitgtk3/HISTORY
@@ -1,3 +1,8 @@
+2023-01-03 Pavel Vinpgradov <public AT sourcemage.org>
+ * CONFIGURE, DETAILS: converted to cmake
+ * BUILD: removed icu fixes, uses default_build now
+ * DEPENDS: fixed typos in flags, added optional LOGIN-DAEMON
+
2023-01-02 Conner Clere <connerclere AT gmail.com>
* DETAILS: version 2.38.3, SECURITY_PATCH++
* BUILD: add more files to patch for unicode issues, remove



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (5cdeba7c80e7323568cd180acf14637eb1e53e8c), Pavel Vinogradov, 01/03/2023

Archive powered by MHonArc 2.6.24.

Top of Page