Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (4f04e5f550b2226414631fd3012d354a074a959a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (4f04e5f550b2226414631fd3012d354a074a959a)
  • Date: Thu, 26 May 2022 04:16:53 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

gnome2-libs/json-glib/DEPENDS | 2 ++
gnome2-libs/json-glib/HISTORY | 3 +++
libs/findlib/DEPENDS | 3 ++-
libs/findlib/HISTORY | 3 +++
libs/libidn/BUILD | 18 ++++++++++++++++++
libs/libidn/HISTORY | 3 +++
libs/libsigc++3/DEPENDS | 1 +
libs/libsigc++3/HISTORY | 4 ++++
security-libs/cracklib/HISTORY | 3 +++
security-libs/cracklib/PRE_BUILD | 5 +++++
utils/libnotify/DEPENDS | 1 +
utils/libnotify/HISTORY | 4 ++++
12 files changed, 49 insertions(+), 1 deletion(-)

New commits:
commit c1b00f241b0df736ae31cdca9c9d9399e5796745
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "inih: Depends on ninja-build-system (or have samurai installed)"

This reverts commit 3dbfc0132fc2426220971ad8fee1e9be4ebf9019.

Someone else did this using MESON_DEPENDS instead.

commit 55045abdc168b9754443a7070dd2f8fc985b8cf8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

cracklib: Fix cracklib not finding python 3.10, instead thinking it is 3.1

commit 2ba66075db73a963ca4390432cab4d66e17805c9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

findlib: Requires ocamlbuild as well

commit 3dbfc0132fc2426220971ad8fee1e9be4ebf9019
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

inih: Depends on ninja-build-system (or have samurai installed)

See MESON_FUNCTIONS

commit 791ac6188d12952ddfeb07c3da45cb6276103d58
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libsigc++3: Fix HISTORY formatting

commit 2504e57770b333f89abee6633afbb58fe22dbce7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libidn: Source java.sh if optional dependency on JAVA is selected

commit dd03daa335616729d20f4bf110231d05c3e6bbb1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

json-glib: Depends on python-markdown and typogrify Python 3 modules

commit 90ffbe827fa4e916cc511d5acea3cd7f6a4e74ea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libsigc++3: Depends on ninja-build-system (or have samurai installed)

See MESON_FUNCTIONS

commit 4529cb07ab0bd5c32039f910c9bfc6d7973bb9f9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libnotify: Depends on ninja-build-system (or have samurai installed)

See MESON_FUNCTIONS

diff --git a/gnome2-libs/json-glib/DEPENDS b/gnome2-libs/json-glib/DEPENDS
index 7ba2e27..32540d4 100755
--- a/gnome2-libs/json-glib/DEPENDS
+++ b/gnome2-libs/json-glib/DEPENDS
@@ -1,4 +1,6 @@
. ${GRIMOIRE}/MESON_DEPENDS &&
+depends python-markdown &&
+depends typogrify &&

depends glib2 &&

diff --git a/gnome2-libs/json-glib/HISTORY b/gnome2-libs/json-glib/HISTORY
index b6dd68b..e446481 100644
--- a/gnome2-libs/json-glib/HISTORY
+++ b/gnome2-libs/json-glib/HISTORY
@@ -1,3 +1,6 @@
+2022-05-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on python-markdown and typogrify Python 3 modules
+
2022-05-14 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS: use MESON_DEPENDS

diff --git a/libs/findlib/DEPENDS b/libs/findlib/DEPENDS
index 8da72f2..f182595 100755
--- a/libs/findlib/DEPENDS
+++ b/libs/findlib/DEPENDS
@@ -1 +1,2 @@
-depends ocaml
+depends ocaml &&
+depends ocamlbuild
diff --git a/libs/findlib/HISTORY b/libs/findlib/HISTORY
index 75988da..bff8c31 100644
--- a/libs/findlib/HISTORY
+++ b/libs/findlib/HISTORY
@@ -1,3 +1,6 @@
+2022-05-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Requires ocamlbuild as well
+
2019-08-20 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.8.1
* BUILD: build native libraries too
diff --git a/libs/libidn/BUILD b/libs/libidn/BUILD
index 448e746..0b68d30 100755
--- a/libs/libidn/BUILD
+++ b/libs/libidn/BUILD
@@ -1,2 +1,20 @@
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL JAVA); then
+ #
+ # Setup JAVA_HOME
+ #
+ if [ -f $INSTALL_ROOT/etc/profile.d/java.sh ]; then
+ . $INSTALL_ROOT/etc/profile.d/java.sh
+ else
+ #
+ # JAVA must not be installed
+ #
+ message "${PROBLEM_COLOR}The provider
${SPELL_COLOR}JAVA${DEFAULT_COLOR}" \
+ "${PROBLEM_COLOR} is not installed.${DEFAULT_COLOR}"
&&
+ return 1
+ fi
+ #
+ # End JAVA_HOME setup
+ #
+fi &&
OPTS+=' --disable-static' &&
default_build
diff --git a/libs/libidn/HISTORY b/libs/libidn/HISTORY
index 774ae4a..24c1648 100644
--- a/libs/libidn/HISTORY
+++ b/libs/libidn/HISTORY
@@ -1,3 +1,6 @@
+2022-05-21 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Source java.sh if optional dependency on JAVA is selected
+
2022-03-16 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.38
* PRE_BUILD: disabled installation of libtool pseudo-libraries
diff --git a/libs/libsigc++3/DEPENDS b/libs/libsigc++3/DEPENDS
index bc815c8..26d8377 100755
--- a/libs/libsigc++3/DEPENDS
+++ b/libs/libsigc++3/DEPENDS
@@ -1,3 +1,4 @@
depends meson &&
+depends ninja-build-system &&
depends pkgconfig &&
depends -sub CXX gcc
diff --git a/libs/libsigc++3/HISTORY b/libs/libsigc++3/HISTORY
index 9594af2..ec1e8ad 100644
--- a/libs/libsigc++3/HISTORY
+++ b/libs/libsigc++3/HISTORY
@@ -1,3 +1,7 @@
+2022-05-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on ninja-build-system (or have samurai installed)
+ See MESON_FUNCTIONS
+
2021-05-22 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.10.7

diff --git a/security-libs/cracklib/HISTORY b/security-libs/cracklib/HISTORY
index fdbcede..b698455 100644
--- a/security-libs/cracklib/HISTORY
+++ b/security-libs/cracklib/HISTORY
@@ -1,3 +1,6 @@
+2022-05-21 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Fix cracklib not finding python 3.10, instead thinking
it's 3.1
+
2021-05-16 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: removed autotools, not needed anymore
* INSTALL, PRE_BUILD: moved unpacking of wordlist to PRE_BUILD
diff --git a/security-libs/cracklib/PRE_BUILD
b/security-libs/cracklib/PRE_BUILD
index 9e646fb..192fd7f 100755
--- a/security-libs/cracklib/PRE_BUILD
+++ b/security-libs/cracklib/PRE_BUILD
@@ -1,5 +1,10 @@
default_pre_build &&
# the next instruction checks the file but doesn't decompress it
unpack_file 2 &&
+# Fix cracklib not finding python 3.10, instead thinking it's 3.1
+if [[ "$(installed_version python3 | cut -d. -f2)" -gt '9' ]]; then
+ message "${MESSAGE_COLOR}Fixing detection of Python 3 version if it's more
than 3 characters...${DEFAULT_COLOR}" &&
+ sedit 's:PYTHON -c "import sys;
sys.stdout.write(sys.version\[\:3\]):PYTHON -c "import sys;
sys.stdout.write(sys.version\[\:4\]):' "${SOURCE_DIRECTORY}"/configure
+fi &&
# decompress cracklib's own wordlist file
gzip -cd "$SOURCE_CACHE/$SOURCE2" > "$SOURCE_DIRECTORY/${SOURCE2%.gz}"
diff --git a/utils/libnotify/DEPENDS b/utils/libnotify/DEPENDS
index 9120ca8..8ec1d2a 100755
--- a/utils/libnotify/DEPENDS
+++ b/utils/libnotify/DEPENDS
@@ -5,6 +5,7 @@ depends glib2 &&
depends libpng &&
depends pygments &&
depends gtk+3 &&
+depends ninja-build-system &&

optional_depends gtk-doc \
"gtk_doc=true" \
diff --git a/utils/libnotify/HISTORY b/utils/libnotify/HISTORY
index ad30b2f..7000ffc 100644
--- a/utils/libnotify/HISTORY
+++ b/utils/libnotify/HISTORY
@@ -1,3 +1,7 @@
+2022-05-21 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on ninja-build-system (or have samurai installed)
+ See MESON_FUNCTIONS
+
2022-05-06 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 0.7.12





Archive powered by MHonArc 2.6.24.

Top of Page