Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (99a87093076d0dc0c9e045b7ede2d1403b58fa14)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (99a87093076d0dc0c9e045b7ede2d1403b58fa14)
  • Date: Fri, 24 Nov 2023 16:55:31 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 3 +++
libs/ncurses/DEPENDS | 1 +
libs/ncurses/HISTORY | 3 +++
net/samba4/DEPENDS | 4 +++-
net/samba4/HISTORY | 5 +++++
qt5/qtbase/HISTORY | 4 ++++
qt5/qtbase/patches/0003-fix-libproxy-test.patch | 11 +++++++++++
security/nmap/BUILD | 1 -
security/nmap/DEPENDS | 4 ++--
security/nmap/HISTORY | 4 ++++
video/ffmpeg6/DEPENDS | 2 +-
video/ffmpeg6/HISTORY | 3 +++
12 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit 99a87093076d0dc0c9e045b7ede2d1403b58fa14
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ffmpeg6: really do not depend on opencv

commit af5dc93b6ecc5490f8ffc3a423739ab0ca51525b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nmap: really depends on python3 only, fix build

commit df61a890085e2791059b0bd89939666cb6d0ec38
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qtbase: fix libproxy test

commit 2392ca16cb75f84cda3bc7ae6d3630d07aca885b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

samba4: fix non-existent option and json dependency

commit 2b7b70e6c1d4e39fb21bfe62b96ade91af1a92c6
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ChangeLog: note cmake FUNCTIONS change

commit d0c8118d464f606c4cbf34b184990a1c195b9b27
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ncurses: warn about broken pcre2 option

diff --git a/ChangeLog b/ChangeLog
index 3b36ff5..2670401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
* utils/rdfind: new spell, find duplicate files utility
* wm-addons/louvre: new spell, C++ library for building Wayland
compositors

+2023-11-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * FUNCTIONS: defined parallelism in cmake_build
+
2023-03-30 Ismael Luceno <ismael AT sourcemage.org>
* devel/llvm16: new spell, LLVM version 16

diff --git a/libs/ncurses/DEPENDS b/libs/ncurses/DEPENDS
index 2a6507d..3d7e8c2 100755
--- a/libs/ncurses/DEPENDS
+++ b/libs/ncurses/DEPENDS
@@ -19,4 +19,5 @@ optional_depends gpm
\
"--without-gpm" \
"for mouse support on a GNU/Linux console" &&

+message "Warning: PCRE2 library usage seems broken and kills samba4 build."
&&
optional_depends pcre2 --with{,out}-pcre2 'use PCRE2 for regular-expressions'
diff --git a/libs/ncurses/HISTORY b/libs/ncurses/HISTORY
index 5c92405..89c8dac 100644
--- a/libs/ncurses/HISTORY
+++ b/libs/ncurses/HISTORY
@@ -1,3 +1,6 @@
+2023-11-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: warn about broken pcre2 usage
+
2023-01-26 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional pcre2

diff --git a/net/samba4/DEPENDS b/net/samba4/DEPENDS
index fceb0b9..a6ac3e1 100755
--- a/net/samba4/DEPENDS
+++ b/net/samba4/DEPENDS
@@ -1,6 +1,7 @@
depends dnspython &&
depends e2fsprogs &&
depends gnutls &&
+depends json &&
depends libcap &&
depends parse-yapp &&
depends popt &&
@@ -28,8 +29,9 @@ else
"--with-acl-support" \
"--without-acl-support" \
"for file system access control lists support" &&
+ # There is no --without-system-mitkrb5, but other --without exist.
optional_depends krb5 \
- --{with,without}-system-mitkrb5 \
+ --with-system-mitkrb5 '' \
"to use system MIT Kerberos"
fi &&

diff --git a/net/samba4/HISTORY b/net/samba4/HISTORY
index 62c47a0..0938a3b 100644
--- a/net/samba4/HISTORY
+++ b/net/samba4/HISTORY
@@ -1,3 +1,8 @@
+2023-11-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: Needs perl with JSON during build
+ (at least for internal heimdal), also there is
+ no --without-system-mitkrb5.
+
2023-04-18 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.16.10, SECURITY_PATCH++
CVE-2023-0225, CVE-2023-0922, CVE-2023-0614
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 4c2a3ee..0782b54 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2023-11-23 Thomas Orgs <sobukus AT sourcemage.org>
+ * patchs/0003-fix-libproxy-test.patch: libproxy detection
+ (broken since header move)
+
2023-04-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.9

diff --git a/qt5/qtbase/patches/0003-fix-libproxy-test.patch
b/qt5/qtbase/patches/0003-fix-libproxy-test.patch
new file mode 100644
index 0000000..ae402d7
--- /dev/null
+++ b/qt5/qtbase/patches/0003-fix-libproxy-test.patch
@@ -0,0 +1,11 @@
+--- a/src/network/configure.json.orig 2023-11-23 10:51:51.014007948 +0100
++++ b/src/network/configure.json 2023-11-23 11:05:10.351994250 +0100
+@@ -53,7 +53,7 @@
+ },
+ "headers": "proxy.h",
+ "sources": [
+- "-lproxy"
++ { "type": "pkgConfig", "args": "libproxy-1.0" }
+ ]
+ },
+ "openssl_headers": {
diff --git a/security/nmap/BUILD b/security/nmap/BUILD
index 39a4938..ae5f1cc 100755
--- a/security/nmap/BUILD
+++ b/security/nmap/BUILD
@@ -3,5 +3,4 @@ LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
OPTS="$NMAP_OPTS --with-libdnet=included $OPTS" &&
OPTS="--without-nmap-update $OPTS"

-export PYTHON=python2 &&
default_build
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index c0fb889..ccfcc08 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -1,12 +1,12 @@
depends -sub CXX gcc &&
depends apr &&
-depends PYTHON &&
+depends python3 &&

config_query_list ZENMAP "Who should provide the zenmap graphical frontend?"
\
none "python with sqlite support" "pysqlite" &&
case $ZENMAP in
none) depends gcc --without-zenmap ;;
- "python with sqlite support") depends -sub sqlite python && depends pygtk2
;;
+ "python with sqlite support") depends -sub sqlite python3 && depends
pygtk2 ;;
"pysqlite") depends pysqlite && depends pygtk2 ;;
*) false ;;
esac &&
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index ba715d6..021358a 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,7 @@
+2023-11-23 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: really python3
+ * BUILD: no python2
+
2023-10-20 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 7.94
* DEPENDS: PYTHON
diff --git a/video/ffmpeg6/DEPENDS b/video/ffmpeg6/DEPENDS
index 983ec52..f48d5ad 100755
--- a/video/ffmpeg6/DEPENDS
+++ b/video/ffmpeg6/DEPENDS
@@ -177,7 +177,7 @@ optional_depends libvdpau \

optional_depends OPENCV \
"--enable-libopencv" \
- "" \
+ "--disable-libopencv" \
"to video filtering via libopencv" &&

optional_depends libva '--enable-vaapi' '--disable-vaapi' 'Video
Acceleration API' &&
diff --git a/video/ffmpeg6/HISTORY b/video/ffmpeg6/HISTORY
index 8a66367..cb8efce 100644
--- a/video/ffmpeg6/HISTORY
+++ b/video/ffmpeg6/HISTORY
@@ -1,3 +1,6 @@
+2023-11-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: really disable opencv usage
+
2023-11-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 6.1
* PRE_BUILD patches/*: deleted



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (99a87093076d0dc0c9e045b7ede2d1403b58fa14), Thomas Orgis, 11/24/2023

Archive powered by MHonArc 2.6.24.

Top of Page