Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (5d20904ac5f594ff7bb015a70614c94c9fad988d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (5d20904ac5f594ff7bb015a70614c94c9fad988d)
  • Date: Mon, 20 Jan 2025 17:03:16 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

http/dillo/BUILD | 2 --
http/dillo/DEPENDS | 6 ++++++
http/dillo/DETAILS | 6 +++---
http/dillo/HISTORY | 5 +++++
http/dillo/PRE_BUILD | 4 ++++
http/dillo/TRIGGERS | 1 +
x11-toolkits/fltk/DEPENDS | 14 ++++++++------
x11-toolkits/fltk/DETAILS | 16 ++++++++--------
x11-toolkits/fltk/HISTORY | 7 +++++++
x11-toolkits/fltk/PRE_BUILD | 2 --
10 files changed, 42 insertions(+), 21 deletions(-)

New commits:
commit 5d20904ac5f594ff7bb015a70614c94c9fad988d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo 3.2.0

commit f81670f545ed97bd24486417f74d3714b8dea127
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo: Added check_self trigger for fltk

commit 2c706b763607196381ebde4aed50f72d81abdef7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dillo: Update Watch line

commit 327c7a116db8b5f9710416284e0aef995396f2a9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fltk 1.4.1

Image libraries are converted to hard dependencies because building
bundled
versions results in conflicting header files added by fltk-config to the
search path which breaks applications' builds.

Also notice that the flags were reversed.

commit 673d4b1b01ebb7c1aa75bc750ae4a837224847bf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fltk: Add Watch line

diff --git a/http/dillo/BUILD b/http/dillo/BUILD
index 51d3855..6ea7781 100755
--- a/http/dillo/BUILD
+++ b/http/dillo/BUILD
@@ -1,4 +1,2 @@
OPTS="$OPTS $DILLO_OPTS" &&
-# Needed for GCC 10.x+
-CFLAGS+=" -fcommon" &&
default_build
diff --git a/http/dillo/DEPENDS b/http/dillo/DEPENDS
index c08edba..7a9d39b 100755
--- a/http/dillo/DEPENDS
+++ b/http/dillo/DEPENDS
@@ -1,5 +1,6 @@
depends fltk &&
depends wget &&
+depends zlib &&

optional_depends SSL \
--enable-openssl \
@@ -13,6 +14,11 @@ if is_depends_enabled "$SPELL" SSL; then
"for TLS support with mbedtls"
fi &&

+optional_depends libwebp \
+ --enable-webp \
+ --disable-webp \
+ 'for WebP image support' &&
+
optional_depends "JPEG" \
"--enable-jpeg" \
"--disable-jpeg" \
diff --git a/http/dillo/DETAILS b/http/dillo/DETAILS
index 5f30ace..0586fa3 100755
--- a/http/dillo/DETAILS
+++ b/http/dillo/DETAILS
@@ -1,11 +1,11 @@
-# Watch: https://dillo-browser.github.io/release/latest/
+# Watch: https://github.com/dillo-browser/dillo/tags
. "$GRIMOIRE/FUNCTIONS"
SPELL=dillo
- VERSION=3.1.1
+ VERSION=3.2.0
SOURCE=dillo-$VERSION.tar.bz2

SOURCE_URL[0]=https://github.com/dillo-browser/dillo/releases/download/v$VERSION/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/dillo-$VERSION
-
SOURCE_HASH=sha512:2f6ad315c246638e91af13fbeb8a846b756c222aaf2275efb1bff6bae08130bb4b8fda9c09cd33925911c424fe536cf7a587e6657de9a13d63733714c86533c1
+
SOURCE_HASH=sha512:d797dd24c7312ad607c1d8e7fe2153860eaf1bb2146108a183ad788ea59319ec11d2160b9a7cca673f3d04474121b57d8dfa73bf3921daebe601794b8cbdea09
LICENSE[0]=GPL
WEB_SITE=https://dillo-browser.github.io/
ENTERED=20080826
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index 62f9b71..5df18a8 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,8 @@
+2025-01-20 Ismael Luceno <ismael AT sourcemage.org>
+ * TRIGGERS: added check_self for fltk
+ * BUILD, DEPENDS, DETAILS: updated spell to 3.2.0
+ * PRE_BUILD: enabled building against fltk 1.4.x
+
2024-06-13 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated website
* DEPENDS, DETAILS, PREPARE: removed scm branch (the hg repo is dead)
diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
new file mode 100755
index 0000000..1758366
--- /dev/null
+++ b/http/dillo/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# XXX: Enable building Dillo 3.2.0 with FLTK 1.4.x
+sedit '/^fltk_version=/{s@=.*@=1.3.99@}' configure
diff --git a/http/dillo/TRIGGERS b/http/dillo/TRIGGERS
new file mode 100755
index 0000000..61620b0
--- /dev/null
+++ b/http/dillo/TRIGGERS
@@ -0,0 +1 @@
+on_cast fltk check_self
diff --git a/x11-toolkits/fltk/DEPENDS b/x11-toolkits/fltk/DEPENDS
index 0ec3f30..f58eb94 100755
--- a/x11-toolkits/fltk/DEPENDS
+++ b/x11-toolkits/fltk/DEPENDS
@@ -1,14 +1,16 @@
depends -sub CXX gcc &&
depends xorg-libs &&
+depends JPEG --disable-localjpeg &&
+depends zlib --disable-localzlib &&
+depends libpng --disable-localpng &&
+
+optional_depends wayland \
+ --enable-wayland \
+ --disable-wayland \
+ 'for hybrid Wayland/X11 support' &&

optional_depends OPENGL "--enable-gl" "--disable-gl" \
"for OpenGL support" &&
-optional_depends JPEG "--enable-localjpeg" "--disable-localjpeg" \
- "to use the system JPEG library" &&
-optional_depends zlib "--enable-localzlib" "--disable-localzlib" \
- "to use the system ZLIB library" &&
-optional_depends libpng "--enable-localpng" "--disable-localpng" \
- "to use the system PNG library" &&

optional_depends libxft \
"--enable-xft" \
diff --git a/x11-toolkits/fltk/DETAILS b/x11-toolkits/fltk/DETAILS
index 2644be4..0b1476d 100755
--- a/x11-toolkits/fltk/DETAILS
+++ b/x11-toolkits/fltk/DETAILS
@@ -1,18 +1,18 @@
+# Watch: https://www.fltk.org/software.php
SPELL=fltk
- VERSION=1.3.5
- XVERSION=$(echo $VERSION | cut -f 1 -d -)
-
SOURCE_HASH=sha512:db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
- SOURCE=$SPELL-$VERSION-source.tar.gz
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://fltk.org/pub/${SPELL}/${XVERSION}/${SOURCE}
+ VERSION=1.4.1
+
SOURCE_HASH=sha512:90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037
+ SOURCE=$SPELL-$VERSION-source.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
SOURCE_URL[0]=https://github.com/fltk/fltk/releases/download/release-$VERSION/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.fltk.org/
ENTERED=20011129
KEYWORDS="x11 libs"
- SHORT="fltk is a fast light graphical toolkit for X11."
+ SHORT="fltk is a fast light graphical toolkit for X11 and Wayland"
cat << EOF
FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit for
-UNIX®/Linux® (X11), Microsoft® Windows®, and MacOS® X. FLTK provides
+UNIX®/Linux® (X11/Wayland), Microsoft® Windows®, and MacOS® X. FLTK provides
modern GUI functionality without the bloat and supports 3D graphics
via OpenGL® and its built-in GLUT emulation.
EOF
diff --git a/x11-toolkits/fltk/HISTORY b/x11-toolkits/fltk/HISTORY
index 5b98121..a4710ac 100644
--- a/x11-toolkits/fltk/HISTORY
+++ b/x11-toolkits/fltk/HISTORY
@@ -1,3 +1,10 @@
+2025-01-20 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.1
+ updated description
+ * PRE_BUILD: removed, no longer needed
+ * DEPENDS: converted JPEG, zlib and libpng into hard dependencies
+ added wayland
+
2019-06-25 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.3.5

diff --git a/x11-toolkits/fltk/PRE_BUILD b/x11-toolkits/fltk/PRE_BUILD
deleted file mode 100755
index bcc0060..0000000
--- a/x11-toolkits/fltk/PRE_BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-default_pre_build &&
-sedit 's:protected:public:' ${SOURCE_DIRECTORY}/FL/Fl_Input.H


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (5d20904ac5f594ff7bb015a70614c94c9fad988d), Ismael Luceno, 01/20/2025

Archive powered by MHonArc 2.6.24.

Top of Page