sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (2a7bfb586d33cea5091810257afe5ab035b4907e)

From: Florian Franzmann <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2a7bfb586d33cea5091810257afe5ab035b4907e)
Date: Sat, 4 Feb 2023 14:42:52 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

ChangeLog | 3 +++
FUNCTIONS | 16 ++++++++--------
archive/ncompress/BUILD | 4 ++--
archive/ncompress/HISTORY | 4 ++++
archive/ncompress/INSTALL | 18 ++++++++++--------
xorg-lib/libxpm/DEPENDS | 10 +++++++++-
xorg-lib/libxpm/HISTORY | 3 +++
7 files changed, 39 insertions(+), 19 deletions(-)

New commits:
commit 2a7bfb586d33cea5091810257afe5ab035b4907e
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

xorg-lib/libxpm: add optional dependency on ncompress

commit 893ef3fd5c7a58e780e49fcef86f3118c87cc2d4
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

archive/ncompress: fix installation

commit 614704c0199877bfa1d8e0b0c1039038fdaf0e74
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

FUNCTIONS: quote $INSTALL_ROOT to avoid words splitting

diff --git a/ChangeLog b/ChangeLog
index e310057..0134fa0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2023-02-04 Florian Franzmann <bwlf AT bandrate.org>
+ * FUNCTIONS: quote INSTALL_ROOT to avoid word splitting
+
2023-02-02 Treeve Jelbert <treeve AT sourcemage.org>
* rename libkdegames5 => libkdegames

diff --git a/FUNCTIONS b/FUNCTIONS
index 9081b45..849b383 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -147,8 +147,8 @@ function install_shell ()

#installing shell into /etc/shells
message "installing $1 into /etc/shells"
- if ! ( grep -q "^${2}$" ${INSTALL_ROOT}/etc/shells ) ; then
- echo "$2" >> ${INSTALL_ROOT}/etc/shells
+ if ! ( grep -q "^${2}$" "${INSTALL_ROOT}"/etc/shells ) ; then
+ echo "$2" >> "${INSTALL_ROOT}"/etc/shells
fi || return 1

#installing shell into qingy's session dir if it's installed
@@ -694,7 +694,7 @@ cmake_build() {
fi &&
cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
+ -DCMAKE_INSTALL_SYSCONFDIR="$INSTALL_ROOT"/etc \
-DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
@@ -876,11 +876,11 @@ function default_build_configure() {
# We could write wrappers for all of the possible binaries
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"

- ./configure --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
+ ./configure --prefix="${INSTALL_ROOT}"/usr \
+ --sysconfdir="${INSTALL_ROOT}"/etc \
+ --localstatedir="${INSTALL_ROOT}"/var \
+ --mandir="${INSTALL_ROOT}"/usr/share/man \
+ --infodir="${INSTALL_ROOT}"/usr/share/info \
$OPTS
}

diff --git a/archive/ncompress/BUILD b/archive/ncompress/BUILD
index 189f4b5..641a493 100755
--- a/archive/ncompress/BUILD
+++ b/archive/ncompress/BUILD
@@ -1,3 +1,3 @@
CFLAGS+=' -DLSTAT=1 -DUTIME_H=1' &&
-touch Makefile &&
-make -f Makefile.def CC="$CC"
+
+make compress
diff --git a/archive/ncompress/HISTORY b/archive/ncompress/HISTORY
index 63682a6..5fdde61 100644
--- a/archive/ncompress/HISTORY
+++ b/archive/ncompress/HISTORY
@@ -1,3 +1,7 @@
+2023-02-04 Florian Franzmann <bwlf AT bandrate.org>
+ * BUILD: simplify
+ * INSTALL: fix error due to wrong target directory
+
2021-09-18 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, ncompress-gcc34.patch: removed, no longer needed
* BUILD: simplified
diff --git a/archive/ncompress/INSTALL b/archive/ncompress/INSTALL
index f7a1461..089e348 100755
--- a/archive/ncompress/INSTALL
+++ b/archive/ncompress/INSTALL
@@ -1,9 +1,11 @@
-cp -f compress $INSTALL_ROOT/usr/bin/compress &&
-cp -f zcmp $INSTALL_ROOT/usr/bin/zcmp.real &&
-cp -f zdiff $INSTALL_ROOT/usr/bin/zdiff.real &&
-cp -f zmore $INSTALL_ROOT/usr/bin/zmore.real &&
-cp -f compress.1 $INSTALL_ROOT/usr/man/man1/compress.real.1 &&
-cp -f zcmp.1 $INSTALL_ROOT/usr/man/man1/zcmp.real.1 &&
-cp -f zmore.1 $INSTALL_ROOT/usr/man/man1/zmore.real.1 &&
-ln -sf compress $INSTALL_ROOT/usr/bin/compress.real &&
+cp -f compress $INSTALL_ROOT/usr/bin/compress &&
+cp -f zcmp $INSTALL_ROOT/usr/bin/zcmp.real &&
+cp -f zdiff $INSTALL_ROOT/usr/bin/zdiff.real &&
+cp -f zmore $INSTALL_ROOT/usr/bin/zmore.real &&
+
+cp -f compress.1 $INSTALL_ROOT/usr/share/man/man1/compress.real.1 &&
+cp -f zcmp.1 $INSTALL_ROOT/usr/share/man/man1/zcmp.real.1 &&
+cp -f zmore.1 $INSTALL_ROOT/usr/share/man/man1/zmore.real.1 &&
+
+ln -sf compress $INSTALL_ROOT/usr/bin/compress.real &&
ln -sf compress $INSTALL_ROOT/usr/bin/uncompress.real
diff --git a/xorg-lib/libxpm/DEPENDS b/xorg-lib/libxpm/DEPENDS
index 8ebecbe..1c81561 100755
--- a/xorg-lib/libxpm/DEPENDS
+++ b/xorg-lib/libxpm/DEPENDS
@@ -10,4 +10,12 @@ depends libxext &&
depends libxt &&
depends PKG-CONFIG &&
depends util-macros &&
-optional_depends gzip '' '--disable-open-zfile' 'compression support'
+
+optional_depends gzip \
+ '--disable-open-zfile' \
+ 'compression support' \
+ 'to search for files with .gz and extension automatically'
&&
+optional_depends ncompress \
+ '--enable-stat-zfile' \
+ '--disable-stat-zfile' \
+ 'to search for files with .Z and extension automatically'
diff --git a/xorg-lib/libxpm/HISTORY b/xorg-lib/libxpm/HISTORY
index 7b523a5..22c4af6 100644
--- a/xorg-lib/libxpm/HISTORY
+++ b/xorg-lib/libxpm/HISTORY
@@ -1,3 +1,6 @@
+2023-02-04 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: add optional dependency on ncompress
+
2023-01-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.5.15
SECURITY_PATCH=1 fix CVE-2022-{46285,44617,4883}

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (2a7bfb586d33cea5091810257afe5ab035b4907e), Florian Franzmann, 02/04/2023