Skip to Content.
Sympa Menu

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

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 (920933f4e6bd77b92db0f00d42d019b06e02f2fa)
  • Date: Sun, 30 Aug 2020 11:29:39 +0000

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

archive/zip/DEPENDS | 1 +
archive/zip/HISTORY | 3 +++
devel/pkgconfig/BUILD | 2 +-
devel/pkgconfig/DETAILS | 1 +
devel/pkgconfig/HISTORY | 4 ++++
graphics/gimp/DEPENDS | 3 ++-
graphics/gimp/HISTORY | 3 +++
printer/foomatic-db/HISTORY | 3 +++
printer/foomatic-db/PRE_BUILD | 5 ++++-
shell-term-fm/busybox/BUILD | 9 +++++++--
shell-term-fm/busybox/HISTORY | 6 ++++++
shell-term-fm/busybox/PRE_BUILD | 4 ++--
12 files changed, 37 insertions(+), 7 deletions(-)

New commits:
commit 920933f4e6bd77b92db0f00d42d019b06e02f2fa
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

busybox: fix library linking

At least on my setup (as-needed?), explicit naming of those extra libs is
necessary or busybox won't build.

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

pkgconfig: runtime search in TRACK_ROOT

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

gimp: fix deps (gegl, mypaint-brushes)

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

zip: uses bzip2 compression

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

busybox: ensure non-interactive build

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

foomatic-db: add -f to gzip to avoid asking for overwriting existing files

The cast can get really stuck if you have to answer for each compressed
PPD.

diff --git a/archive/zip/DEPENDS b/archive/zip/DEPENDS
new file mode 100644
index 0000000..b23515c
--- /dev/null
+++ b/archive/zip/DEPENDS
@@ -0,0 +1 @@
+depends bzip2
diff --git a/archive/zip/HISTORY b/archive/zip/HISTORY
index da32686..824a817 100644
--- a/archive/zip/HISTORY
+++ b/archive/zip/HISTORY
@@ -1,3 +1,6 @@
+2020-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: uses bzip2 since 3.0
+
2008-10-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0; fixed source ext, desc; quoting paths
* BUILD: fixed flags autodetection; cleaned up
diff --git a/devel/pkgconfig/BUILD b/devel/pkgconfig/BUILD
index 604e69a..03a46e9 100755
--- a/devel/pkgconfig/BUILD
+++ b/devel/pkgconfig/BUILD
@@ -2,5 +2,5 @@
# subsequently be built when pkg-config is also broken due to linking to
# system glib2.
OPTS="$OPTS --with-internal-glib" &&
-OPTS="$OPTS
--with-pc-path=/usr/lib/pkgconfig:/usr/share/pkgconfig:/lib/pkgconfig" &&
+OPTS="$OPTS
--with-pc-path=$TRACK_ROOT/usr/lib/pkgconfig:$TRACK_ROOT/usr/share/pkgconfig:$TRACK_ROOT/lib/pkgconfig"
&&
default_build
diff --git a/devel/pkgconfig/DETAILS b/devel/pkgconfig/DETAILS
index 34e1516..3a50274 100755
--- a/devel/pkgconfig/DETAILS
+++ b/devel/pkgconfig/DETAILS
@@ -1,5 +1,6 @@
SPELL=pkgconfig
VERSION=0.29.2
+ PATCHLEVEL=1

SOURCE_HASH=sha512:4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
SOURCE=pkg-config-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pkg-config-$VERSION
diff --git a/devel/pkgconfig/HISTORY b/devel/pkgconfig/HISTORY
index 00014d6..5b68f76 100644
--- a/devel/pkgconfig/HISTORY
+++ b/devel/pkgconfig/HISTORY
@@ -1,3 +1,7 @@
+2020-08-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: use TRACK_ROOT for runtime paths
+ * DETAILS: ++PATCHLEVEL
+
2020-08-23 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD: ensure to search /lib/pkgconfig

diff --git a/graphics/gimp/DEPENDS b/graphics/gimp/DEPENDS
index 7f57a8a..9c9189c 100755
--- a/graphics/gimp/DEPENDS
+++ b/graphics/gimp/DEPENDS
@@ -22,7 +22,8 @@ depends libmypaint &&
depends libpng &&
depends librsvg2 &&
depends LZMA &&
-depends mypaint &&
+depends mypaint-brushes &&
+depends gegl &&
depends pango &&
depends poppler &&
depends tiff &&
diff --git a/graphics/gimp/HISTORY b/graphics/gimp/HISTORY
index d1dc754..258b855 100644
--- a/graphics/gimp/HISTORY
+++ b/graphics/gimp/HISTORY
@@ -1,3 +1,6 @@
+2020-08-30 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: gegl and mypaint-brushes (instead of mypaint)
+
2019-10-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.10.24

diff --git a/printer/foomatic-db/HISTORY b/printer/foomatic-db/HISTORY
index 207be6a..905538d 100644
--- a/printer/foomatic-db/HISTORY
+++ b/printer/foomatic-db/HISTORY
@@ -1,3 +1,6 @@
+2020-08-29 Thomas Orgis <sobukus AT orgis.org>
+ * PRE_BUILD: add -f to gzip to avoid stalled install
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/printer/foomatic-db/PRE_BUILD b/printer/foomatic-db/PRE_BUILD
index a940a1d..3eb8b59 100755
--- a/printer/foomatic-db/PRE_BUILD
+++ b/printer/foomatic-db/PRE_BUILD
@@ -2,4 +2,7 @@ CURRENT_RELEASE=`tar tzf
${SOURCE_CACHE}/foomatic-db-current.tar.gz | head -1 |
mk_source_dir ${BUILD_DIRECTORY}/${CURRENT_RELEASE}
&&
unpack_file &&
cd ${BUILD_DIRECTORY}
&&
-ln -s ${CURRENT_RELEASE} foomatic-db-current
+ln -s ${CURRENT_RELEASE} foomatic-db-current &&
+cd "$SOURCE_DIRECTORY" &&
+# Avoid stupid overwrite questions from gzip, halting the build.
+sed -i -e 's:\(-exec \$(GZIP)\):\1 -f:' Makefile.in
diff --git a/shell-term-fm/busybox/BUILD b/shell-term-fm/busybox/BUILD
index 2af791d..844f377 100755
--- a/shell-term-fm/busybox/BUILD
+++ b/shell-term-fm/busybox/BUILD
@@ -1,2 +1,7 @@
-CFLAGS="${CFLAGS} -isystem /usr/include/tirpc" &&
-default_build_make
+CFLAGS="${CFLAGS} -isystem /usr/include/tirpc" &&
+# Some library linking needs to be enforced (static build, as-needed, maybe).
+extralibs="pthread tirpc" &&
+if is_depends_enabled "$SPELL" linux-pam; then
+ extralibs+=" pam"
+fi &&
+make CONFIG_EXTRA_LDLIBS="$extralibs"
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index 891990c..5f3b39a 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,9 @@
+2020-08-30 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: ensure non-interative oldconfig, build halting at
+ that point for questions is unacceptable (and happens depending
+ on stored config)
+ * BUILD: link more explicitly (needed on my setup at least)
+
2020-08-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.31.1
* PRE_BUILD: run make oldconfig after restoring a configuration
diff --git a/shell-term-fm/busybox/PRE_BUILD b/shell-term-fm/busybox/PRE_BUILD
index ac703f3..400ae61 100755
--- a/shell-term-fm/busybox/PRE_BUILD
+++ b/shell-term-fm/busybox/PRE_BUILD
@@ -6,11 +6,11 @@ apply_patch_dir patches &&
if [ -f $CONFIG_CACHE/busybox.config ]; then
message "${MESSAGE_COLOR}restoring configuration from
${FILE_COLOR}${CONFIG_CACHE}/busybox.config${DEFAULT_COLOR}" &&
cp ${CONFIG_CACHE}/busybox.config .config &&
- make oldconfig
+ yes "" | make oldconfig
else
message "${MESSAGE_COLOR}using
${FILE_COLOR}${SCRIPT_DIRECTOY}/busybox.config as default
configuration${DEFAULT_COLOR}" &&
cp ${SCRIPT_DIRECTORY}/busybox.config .config &&
- make oldconfig
+ yes "" | make oldconfig
fi &&

if [[ "$BB_CONFIG" = "y" ]] && [[ $RECONFIGURE ]] ; then



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (920933f4e6bd77b92db0f00d42d019b06e02f2fa), Thomas Orgis, 08/30/2020

Archive powered by MHonArc 2.6.24.

Top of Page