Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b4e9dcf650ddf79bd3283ada1a0858ec7ed22bc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b4e9dcf650ddf79bd3283ada1a0858ec7ed22bc)
  • Date: Sat, 12 Jan 2019 12:40:16 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

editors/gawk/BUILD | 6 ------
editors/gawk/DEPENDS | 2 +-
editors/gawk/HISTORY | 5 +++++
editors/gawk/PRE_INSTALL | 4 ++++
libs/gmp/DETAILS | 1 -
libs/gmp/HISTORY | 4 ++++
libs/gmp/PRE_INSTALL | 4 ++++
xorg-lib/libinput/DETAILS | 2 +-
xorg-lib/libinput/HISTORY | 3 +++
9 files changed, 22 insertions(+), 9 deletions(-)

New commits:
commit 1b4e9dcf650ddf79bd3283ada1a0858ec7ed22bc
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libinput: => 1.12.5

commit b6d31b55610e0e201c3889b16159a7824cd7062d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gawk - improve

commit fd7c5bce959d8eec06029a6283913a7ab7690f73
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gmp - re-enable staging

diff --git a/editors/gawk/BUILD b/editors/gawk/BUILD
index db88225..2e61cbc 100755
--- a/editors/gawk/BUILD
+++ b/editors/gawk/BUILD
@@ -1,15 +1,9 @@
[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}"
-
-# Disable mpfr and readline as that complicates upgrade
-# of gmp ... which fails mid-way since sorcery really relies
-# on awk to work. Proper fix would be to protect all
-# base libraries during dispel, like libc. -- ThOr
./configure --build=${BUILD} \
--prefix=${TRACK_ROOT}/usr \
--bindir=${TRACK_ROOT}/bin \
--sysconfdir=${TRACK_ROOT}/etc \
--infodir=${TRACK_ROOT}/usr/share/info \
--mandir=${TRACK_ROOT}/usr/share/man \
- --without-mpfr --without-readline \
${OPTS} &&
make DESTDIR=$INSTALL_ROOT
diff --git a/editors/gawk/DEPENDS b/editors/gawk/DEPENDS
index ea5b442..a5b0ed3 100755
--- a/editors/gawk/DEPENDS
+++ b/editors/gawk/DEPENDS
@@ -1,6 +1,6 @@
depends gmp &&
-depends gnupg &&
depends mpfr &&
+depends readline &&
depends smgl-fhs &&

optional_depends libsigsegv '' '' 'for page fault handling support' &&
diff --git a/editors/gawk/HISTORY b/editors/gawk/HISTORY
index a4b5781..6b03cb4 100644
--- a/editors/gawk/HISTORY
+++ b/editors/gawk/HISTORY
@@ -1,3 +1,8 @@
+2019-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_INSTALL: added
+ * DEPENDS: delete gnupg, add readline
+ * BUILD: cleanup
+
2018-08-02 Pavel Vinogradov <public AT sourcemage.org>
* BUILD: added sysconfdir flag, otherwise we have /usr/etc

diff --git a/editors/gawk/PRE_INSTALL b/editors/gawk/PRE_INSTALL
new file mode 100755
index 0000000..fad2108
--- /dev/null
+++ b/editors/gawk/PRE_INSTALL
@@ -0,0 +1,4 @@
+if [[ "$GAWK_DEF" = y ]]; then
+ ln -sf gawk awk
+fi
+export PATH="$SOURCE_DIRECTORY:$PATH"
diff --git a/libs/gmp/DETAILS b/libs/gmp/DETAILS
index 3895f13..a2e3504 100755
--- a/libs/gmp/DETAILS
+++ b/libs/gmp/DETAILS
@@ -12,7 +12,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- STAGED_INSTALL=off
LICENSE[0]=LGPL
WEB_SITE=http://gmplib.org/
ENTERED=20010922
diff --git a/libs/gmp/HISTORY b/libs/gmp/HISTORY
index 0b66199..5c1cb6d 100644
--- a/libs/gmp/HISTORY
+++ b/libs/gmp/HISTORY
@@ -1,3 +1,7 @@
+2019-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_INSTALL: added
+ * DETAILS: enale staging
+
2017-08-14 Eric Sandall <sandalle AT sourcemage.org>
* BUILD, INSTALL: Need libgmp.so.3 symlink during transisiont from
4.3.2 (Bug #16031)

diff --git a/libs/gmp/PRE_INSTALL b/libs/gmp/PRE_INSTALL
new file mode 100755
index 0000000..5a89fc8
--- /dev/null
+++ b/libs/gmp/PRE_INSTALL
@@ -0,0 +1,4 @@
+source $GRIMOIRE/protect_special_libs
+
+protect_special_libs
+do_dispel
diff --git a/xorg-lib/libinput/DETAILS b/xorg-lib/libinput/DETAILS
index be5c43b..3278af5 100755
--- a/xorg-lib/libinput/DETAILS
+++ b/xorg-lib/libinput/DETAILS
@@ -1,6 +1,6 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=libinput
- VERSION=1.12.4
+ VERSION=1.12.5
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://www.freedesktop.org/software/$SPELL/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/xorg-lib/libinput/HISTORY b/xorg-lib/libinput/HISTORY
index 0102238..48accec 100644
--- a/xorg-lib/libinput/HISTORY
+++ b/xorg-lib/libinput/HISTORY
@@ -1,3 +1,6 @@
+2019-01-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.12.5
+
2018-12-18 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.12.4




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1b4e9dcf650ddf79bd3283ada1a0858ec7ed22bc), Treeve Jelbert, 01/12/2019

Archive powered by MHonArc 2.6.24.

Top of Page