Skip to Content.
Sympa Menu

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

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
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (025a0edfdc53056044179e2f48120412792e9452)
  • Date: Tue, 13 Dec 2022 16:29:31 +0000

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

devel/llvm/DEPENDS | 1 +
devel/llvm/HISTORY | 7 +++++--
mail/claws-mail/DETAILS | 4 ++--
mail/claws-mail/HISTORY | 3 +++
python-pypi/mako/DETAILS | 3 +--
python-pypi/mako/HISTORY | 3 +++
utils/dbus-python/BUILD | 2 +-
utils/dbus-python/HISTORY | 3 +++
video-libs/libplacebo/DEPENDS | 2 ++
video-libs/libplacebo/HISTORY | 3 +++
video/mpv/CONFIGURE | 2 +-
video/mpv/DEPENDS | 10 ++++++----
video/mpv/HISTORY | 11 ++++++++---
video/mpv/PRE_BUILD | 15 +++++++++++++++
windowmanagers/sway/DETAILS | 2 +-
windowmanagers/sway/HISTORY | 4 ++++
windowmanagers/sway/PRE_BUILD | 1 -
windowmanagers/sway/patches/nag.patch | 20 --------------------
xorg-proto/wayland-protocols/HISTORY | 3 +++
xorg-proto/wayland-protocols/PRE_BUILD | 5 +++++
20 files changed, 67 insertions(+), 37 deletions(-)

New commits:
commit 025a0edfdc53056044179e2f48120412792e9452
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

claws-mail 4.1.1

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

mako 1.2.4

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

llvm: Add missing dependency on mako

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

sway 1.8-rc3

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

wayland-protocols: Fix script interpreter path

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

mpv: Fix scripts interpreter path

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

libplacebo: Add missing deps (python3 & jinja2)

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

mpv: Make GPL build the default (match upstream)

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

mpv: Mark dvdnav opt dependency as GPL

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

dbus-python: Fix syntax error in BUILD

Also, no need to guess the full path.

Fixes: 1a835b94dcf2 ("dbus-python: => 1.2.8")

diff --git a/devel/llvm/DEPENDS b/devel/llvm/DEPENDS
index 717e93d..439d85a 100755
--- a/devel/llvm/DEPENDS
+++ b/devel/llvm/DEPENDS
@@ -10,6 +10,7 @@ depends -sub CXX gcc &&
depends PKG-CONFIG &&
depends zlib '-DLLVM_ENABLE_ZLIB=1' &&
depends python3 &&
+depends mako &&
if [[ "$LLVM_WITH_ANALYZER" == "y" ]]
then
optional_depends z3 \
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 25a12b4..00bd77d 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,8 +1,11 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: added missing dependency on mako
+
2022-11-29 Pavel Vinogradov <public AT sourcemage.org>
- * DETAILS: version 15.0.6
+ * DETAILS: version 15.0.6

2022-11-16 Florian Franzmann <bwlf AT bandrate.org>
- * DETAILS: version 15.0.5
+ * DETAILS: version 15.0.5

2022-11-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 15.0.4
diff --git a/mail/claws-mail/DETAILS b/mail/claws-mail/DETAILS
index 5ccb5c2..76a12f3 100755
--- a/mail/claws-mail/DETAILS
+++ b/mail/claws-mail/DETAILS
@@ -1,9 +1,9 @@
SPELL=claws-mail
- VERSION=4.1.0
+ VERSION=4.1.1
SECURITY_PATCH=2
SOURCE=$SPELL-${VERSION}.tar.xz

SOURCE_URL="http://www.claws-mail.org/download.php?file=releases/${SOURCE}";
-
SOURCE_HASH=sha512:83c7b1a8065628b1dcac58feb4d852b759b3fc376531572e88450b8e9517172a641f710a219b7e16bbc672dbe69853783e4edd1d7647a3f2aacb92e47be9175b
+
SOURCE_HASH=sha512:4157772fd0e918bae1df11230ce52691ff86181a0c164c0c5116d1ebb91885910e2e24ff18ae5e5ad4ed1c83ef830773de0b4ab40da988607909e0c17efb26b4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.claws-mail.org/
ENTERED=20061209
diff --git a/mail/claws-mail/HISTORY b/mail/claws-mail/HISTORY
index e121b30..519de27 100644
--- a/mail/claws-mail/HISTORY
+++ b/mail/claws-mail/HISTORY
@@ -1,3 +1,6 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 4.1.1
+
2022-06-21 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.1.0

diff --git a/python-pypi/mako/DETAILS b/python-pypi/mako/DETAILS
index a359421..72f2f23 100755
--- a/python-pypi/mako/DETAILS
+++ b/python-pypi/mako/DETAILS
@@ -1,6 +1,6 @@
SPELL=mako
SPELLX=Mako
- VERSION=1.1.3
+ VERSION=1.2.4
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]=https://pypi.python.org/packages/source/M/$SPELLX/$SOURCE
SOURCE2=$SOURCE.asc
@@ -10,7 +10,6 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=https://www.makotemplates.org/
LICENSE[0]='MIT'
- UPDATED=20081004
DOCS='docs/* *.txt'
SHORT='template library with non-XML syntax'
cat << EOF
diff --git a/python-pypi/mako/HISTORY b/python-pypi/mako/HISTORY
index 7b9c8a6..dfe75b0 100644
--- a/python-pypi/mako/HISTORY
+++ b/python-pypi/mako/HISTORY
@@ -1,3 +1,6 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.4
+
2021-01-01 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 1.1.3

diff --git a/utils/dbus-python/BUILD b/utils/dbus-python/BUILD
index de6da9e..9dce6e9 100755
--- a/utils/dbus-python/BUILD
+++ b/utils/dbus-python/BUILD
@@ -1,2 +1,2 @@
-export PYTHON=$(get_spell_provider_file $SPELL PYTHON
'/usr/bin/python[0-9\.]*$') \
+export PYTHON=python3 &&
default_build
diff --git a/utils/dbus-python/HISTORY b/utils/dbus-python/HISTORY
index 67fd491..6ae4675 100644
--- a/utils/dbus-python/HISTORY
+++ b/utils/dbus-python/HISTORY
@@ -1,3 +1,6 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: fixed syntax error
+
2022-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: add gpg checking
* DETAILS: version 1.3.2
diff --git a/video-libs/libplacebo/DEPENDS b/video-libs/libplacebo/DEPENDS
index 20212b4..df483af 100755
--- a/video-libs/libplacebo/DEPENDS
+++ b/video-libs/libplacebo/DEPENDS
@@ -1,5 +1,7 @@
. "${GRIMOIRE}/MESON_DEPENDS" &&

+depends python3 &&
+depends jinja2 &&
depends glad2 &&

optional_depends glslang \
diff --git a/video-libs/libplacebo/HISTORY b/video-libs/libplacebo/HISTORY
index 261a0bc..e511835 100644
--- a/video-libs/libplacebo/HISTORY
+++ b/video-libs/libplacebo/HISTORY
@@ -1,3 +1,6 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: added missing deps (python3 & jinja2)
+
2022-11-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 5.229.1

diff --git a/video/mpv/CONFIGURE b/video/mpv/CONFIGURE
index 8dcf5ff..75a355d 100755
--- a/video/mpv/CONFIGURE
+++ b/video/mpv/CONFIGURE
@@ -6,7 +6,7 @@ list_remove MPV_OPTS "--disable-dvb" &&
list_remove MPV_OPTS "--enable-dvbin" &&
list_remove MPV_OPTS "--disable-dvbin" &&

-config_query_option MPV_OPTS "Build GPLv2+ version of MPV?" n \
+config_query_option MPV_OPTS "Build GPLv2+ version of MPV?" y \
"gpl=true" \
"gpl=false" &&
if list_find "$MPV_OPTS" "gpl=true"; then
diff --git a/video/mpv/DEPENDS b/video/mpv/DEPENDS
index cff7669..5212534 100755
--- a/video/mpv/DEPENDS
+++ b/video/mpv/DEPENDS
@@ -147,10 +147,12 @@ optional_depends libbluray \
"libbluray=disabled" \
"for Blu-ray support" &&

-optional_depends libdvdnav \
- "dvdnav=enabled" \
- "dvdnav=disabled" \
- "for dvd navigation support" &&
+if list_find "$MPV_OPTS" "gpl=true"; then
+ optional_depends libdvdnav \
+ "dvdnav=enabled" \
+ "dvdnav=disabled" \
+ "for dvd navigation support"
+fi &&

optional_depends uchardet \
"uchardet=enabled" \
diff --git a/video/mpv/HISTORY b/video/mpv/HISTORY
index 07d9038..b3cf7cd 100644
--- a/video/mpv/HISTORY
+++ b/video/mpv/HISTORY
@@ -1,6 +1,11 @@
-2022-12-04 Florian Franzmann <bwlf AT bandrate.org>
- * TRIGGERS: on_cast libunibreak check self
- * DETAILS: PATCHLEVEL++
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: marked dvdnav as GPL
+ * CONFIGURE: made GPL build the default (match upstream)
+ * PRE_BUILD: fixed scripts interpreter path
+
+2022-12-04 Florian Franzmann <bwlf AT bandrate.org>
+ * TRIGGERS: on_cast libunibreak check self
+ * DETAILS: PATCHLEVEL++

2022-11-12 Pavel Vinogradov <public AT sourcemage.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS: completely switched to meson,
dvbin
diff --git a/video/mpv/PRE_BUILD b/video/mpv/PRE_BUILD
new file mode 100755
index 0000000..1d30655
--- /dev/null
+++ b/video/mpv/PRE_BUILD
@@ -0,0 +1,15 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# fix path to env
+sed -s -i '1s@^#!/usr/bin/env@#!/bin/env@' \
+ TOOLS/dylib-unhell.py \
+ TOOLS/file2string.py \
+ TOOLS/macos-sdk-version.py \
+ TOOLS/macos-swift-lib-directory.py \
+ TOOLS/matroska.py \
+ TOOLS/osxbundle.py \
+ TOOLS/stats-conv.py \
+ bootstrap.py \
+ version.py \
+ waftools/__init__.py \
+ waftools/clang_compilation_database.py
diff --git a/windowmanagers/sway/DETAILS b/windowmanagers/sway/DETAILS
index 6226920..5428abd 100755
--- a/windowmanagers/sway/DETAILS
+++ b/windowmanagers/sway/DETAILS
@@ -9,7 +9,7 @@ if [[ "${SWAY_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION=1.7
+ VERSION=1.8-rc3
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"

SOURCE_URL[0]="https://github.com/swaywm/sway/releases/download/$VERSION/$SOURCE";
diff --git a/windowmanagers/sway/HISTORY b/windowmanagers/sway/HISTORY
index f1eaced..0645316 100644
--- a/windowmanagers/sway/HISTORY
+++ b/windowmanagers/sway/HISTORY
@@ -1,3 +1,7 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PRE_BUILD: updated spell to 1.8-rc3
+ * patches/nag.patch: removed, no longer needed
+
2022-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: use LOGIN-DAEMON
* PRE_BUILD patches/*: added, fix build with gcc-12.2
diff --git a/windowmanagers/sway/PRE_BUILD b/windowmanagers/sway/PRE_BUILD
index a11588c..4604ffc 100755
--- a/windowmanagers/sway/PRE_BUILD
+++ b/windowmanagers/sway/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-sed -i 's/strncpy/memcpy/' sway/criteria.c &&
apply_patch_dir patches
diff --git a/windowmanagers/sway/patches/nag.patch
b/windowmanagers/sway/patches/nag.patch
deleted file mode 100644
index b986149..0000000
--- a/windowmanagers/sway/patches/nag.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/swaynag/swaynag.c b/swaynag/swaynag.c
-index 9b57d57856..03ec0411b7 100644
---- a/swaynag/swaynag.c
-+++ b/swaynag/swaynag.c
-@@ -511,13 +511,8 @@ void swaynag_destroy(struct swaynag *swaynag) {
- swaynag_seat_destroy(seat);
- }
-
-- if (&swaynag->buffers[0]) {
-- destroy_buffer(&swaynag->buffers[0]);
-- }
--
-- if (&swaynag->buffers[1]) {
-- destroy_buffer(&swaynag->buffers[1]);
-- }
-+ destroy_buffer(&swaynag->buffers[0]);
-+ destroy_buffer(&swaynag->buffers[1]);
-
- if (swaynag->outputs.prev || swaynag->outputs.next) {
- struct swaynag_output *output, *temp;
diff --git a/xorg-proto/wayland-protocols/HISTORY
b/xorg-proto/wayland-protocols/HISTORY
index 624918a..d1fa207 100644
--- a/xorg-proto/wayland-protocols/HISTORY
+++ b/xorg-proto/wayland-protocols/HISTORY
@@ -1,3 +1,6 @@
+2022-12-13 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: fixed wrong path in script interpreter
+
2022-11-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.31

diff --git a/xorg-proto/wayland-protocols/PRE_BUILD
b/xorg-proto/wayland-protocols/PRE_BUILD
new file mode 100755
index 0000000..7a0e865
--- /dev/null
+++ b/xorg-proto/wayland-protocols/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+# fix interpreter path
+sed -s -i '1s@^#!/usr/bin/env@#!/bin/env@' \
+ tests/replace.py



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (025a0edfdc53056044179e2f48120412792e9452), Ismael Luceno, 12/13/2022

Archive powered by MHonArc 2.6.24.

Top of Page