Skip to Content.
Sympa Menu

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

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 (65dcd4b2feea56e1697e0e3f75aa70884855c9d0)
  • Date: Mon, 3 Jun 2019 15:24:49 +0000

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

display/fbterm/HISTORY | 3 +++
display/fbterm/PRE_BUILD | 2 ++
printer/ghostscript/HISTORY | 3 +++
printer/ghostscript/PRE_BUILD | 3 +++
utils/fbset/BUILD | 2 +-
utils/fbset/HISTORY | 3 +++
6 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 65dcd4b2feea56e1697e0e3f75aa70884855c9d0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ghostscript: Fix linking issues with libtiff

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

fbterm: Add missing edit for musl

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

fbset: Fix missing __u32 type on non-glibc systems

diff --git a/display/fbterm/HISTORY b/display/fbterm/HISTORY
index 5359dd1..3b9e41f 100644
--- a/display/fbterm/HISTORY
+++ b/display/fbterm/HISTORY
@@ -1,3 +1,6 @@
+2019-06-02 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Added missing edit for musl
+
2019-05-21 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD, fix-musl-compile.patch: Fixed build against musl

diff --git a/display/fbterm/PRE_BUILD b/display/fbterm/PRE_BUILD
index 11fe7e6..891264a 100755
--- a/display/fbterm/PRE_BUILD
+++ b/display/fbterm/PRE_BUILD
@@ -2,4 +2,6 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

patch -fp1 -i "$SPELL_DIRECTORY/fix-musl-compile.patch" &&
+# Use system signalfd.h instead of the bundled one
+sedit '/^#include "signalfd/{s!"!<sys/!;s!"$!>!}' src/fbterm.cpp &&
patch -fp1 -i "$SPELL_DIRECTORY/0001-fix-compilation-with-gcc-7.patch"
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index f757675..3e7cab2 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,6 @@
+2019-06-02 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed linking issues with libtiff
+
2019-05-25 Ismael Luceno <ismael AT sourcemage.org>
* CONFLICTS: Added conflict with ijs

diff --git a/printer/ghostscript/PRE_BUILD b/printer/ghostscript/PRE_BUILD
index c21f123..94dbf1d 100755
--- a/printer/ghostscript/PRE_BUILD
+++ b/printer/ghostscript/PRE_BUILD
@@ -3,6 +3,9 @@ cd $SOURCE_DIRECTORY &&

apply_patch_dir patches &&

+# The custom libtiff test is flaky, and fails to add dependencies
+sed -i 's/--libs libtiff-4/--static &/' configure{.ac,} &&
+
# remove most of the embedded libraries. use the system ones instead
rm -rf freetype jpeg libpng tiff lcms2 ijs openjpeg zlib &&

diff --git a/utils/fbset/BUILD b/utils/fbset/BUILD
index 339cc02..326cceb 100755
--- a/utils/fbset/BUILD
+++ b/utils/fbset/BUILD
@@ -1,4 +1,4 @@
sedit 's/usr\/man/usr\/share\/man/' Makefile &&
make_single &&
-make CC="gcc -I. $CFLAGS" &&
+make CC="gcc -I. $CFLAGS -D__u32=uint32_t" &&
make_normal
diff --git a/utils/fbset/HISTORY b/utils/fbset/HISTORY
index c606561..a8ca424 100644
--- a/utils/fbset/HISTORY
+++ b/utils/fbset/HISTORY
@@ -1,3 +1,6 @@
+2019-06-02 Ismael Luceno ismael AT sourcemage.org
+ * BUILD: Fixed missing type __u32
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.




  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (65dcd4b2feea56e1697e0e3f75aa70884855c9d0), Ismael Luceno, 06/03/2019

Archive powered by MHonArc 2.6.24.

Top of Page