Skip to Content.
Sympa Menu

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

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 (443d86dc75d96d149f2146a52668fb5e066377e1)
  • Date: Wed, 9 Jan 2019 10:07:22 +0000

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

ChangeLog | 4 ++++
libs/readline/BUILD | 10 +---------
libs/readline/DETAILS | 1 -
libs/readline/HISTORY | 6 ++++++
libs/readline/INSTALL | 4 ++++
libs/readline/PRE_INSTALL | 4 ++++
protect_special_libs | 29 +++++++++++++++++++++++++++++
qt5-cmake/otter/DETAILS | 4 ++--
qt5-cmake/otter/HISTORY | 3 +++
9 files changed, 53 insertions(+), 12 deletions(-)

New commits:
commit 443d86dc75d96d149f2146a52668fb5e066377e1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

readline - more fixes

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

add protect_special_libs function

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

otter: => 1.0.01

diff --git a/ChangeLog b/ChangeLog
index b814dac..b2f75ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * protect_special_libs: added, function to protect special libraries
+ in such spells as glibc, readlin, ncurses
+
2019-01-08 Pavel Vinogradov <public AT sourcemage.org>
* kernel.gpg: added new key, 95CDE47E,
Stephen Hemminger (Microsoft corporate) <sthemmin AT microsoft.com>
diff --git a/libs/readline/BUILD b/libs/readline/BUILD
index 401c630..eefc216 100755
--- a/libs/readline/BUILD
+++ b/libs/readline/BUILD
@@ -7,12 +7,4 @@
--infodir=${TRACK_ROOT}/usr/share/info \
--mandir=${TRACK_ROOT}/usr/share/man \
$OPTS &&
-make DESTDIR=$INSTALL_ROOT &&
-
-export LD_LIBRARY_PATH="${SOURCE_DIRECTORY}/shlib:${LD_LIBRARY_PATH}" &&
-
-for i in readline history; do
- ln -sf lib${i}.so.${VERSION} shlib/lib${i}.so.${VERSION%.*}
-# also symlink old version
- ln -sf lib${i}.so.${VERSION} shlib/lib${i}.so.7
-done
+make DESTDIR=$INSTALL_ROOT
diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index 7f4f03f..467cde1 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -1,6 +1,5 @@
SPELL=readline
VERSION=8.0
- STAGED_INSTALL=off
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index a8355a6..39599ca 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,3 +1,9 @@
+2019-01-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_INSTALL: added, to protect special libraries
+ * DETAILS: re-enable staging
+ * BUILD: remove symlinks
+ * INSTALL: fix symlinks
+
2019-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: disable staging again
* DEPENDS: delete gnupg
diff --git a/libs/readline/INSTALL b/libs/readline/INSTALL
index 60a277b..1998911 100755
--- a/libs/readline/INSTALL
+++ b/libs/readline/INSTALL
@@ -1,4 +1,8 @@
make install DESTDIR="$INSTALL_ROOT" &&
+# also symlink old version, to keep bash working during an upgrade
+for i in readline history; do
+ ln -vsf "$TRACK_ROOT/lib/lib$i.so.$VERSION" "$INSTALL_ROOT/lib/lib$i.so.7"
+done

# install inputrc stuff to have better key mappings in console
if [[ "$INSTALL_INPUTRC" == y ]]; then
diff --git a/libs/readline/PRE_INSTALL b/libs/readline/PRE_INSTALL
new file mode 100755
index 0000000..5a89fc8
--- /dev/null
+++ b/libs/readline/PRE_INSTALL
@@ -0,0 +1,4 @@
+source $GRIMOIRE/protect_special_libs
+
+protect_special_libs
+do_dispel
diff --git a/protect_special_libs b/protect_special_libs
new file mode 100644
index 0000000..b258c61
--- /dev/null
+++ b/protect_special_libs
@@ -0,0 +1,29 @@
+# some spells install their libraries to /lib and these are linked to by
bash.
+# these libraries must be preserved while the spell is being upgraded
+# these functions should be called during the PRE_INSTALL of such spells
+# candidate spells for this would be glibc, ncurses, readline
+
+lock_resources "libgrimoire" "install" &&
+PROTECT=$SOURCE_DIRECTORY/$SPELL.old.libs &&
+
+if [[ -z $INSTALL_ROOT ]]; then
+ protect_special_libs() {
+ mkdir -p $PROTECT &&
+ local each &&
+ for each in /lib{,64,32}/*; do
+ if test -f "$each"; then
+ cp -a "$each" $PROTECT
+ fi
+ done &&
+ ldconfig $PROTECT
+ }
+fi
+
+# some spells, such as glibc may need some special processing between calls
to
+# these two fucnctions
+
+do_dispel() {
+ if spell_ok $SPELL; then
+ dispel --notriggers --nosustain $SPELL
+ fi
+}
diff --git a/qt5-cmake/otter/DETAILS b/qt5-cmake/otter/DETAILS
index 15c568d..cec7686 100755
--- a/qt5-cmake/otter/DETAILS
+++ b/qt5-cmake/otter/DETAILS
@@ -1,7 +1,7 @@
SPELL=otter
SPELLX=otter-browser
- VERSION=0.9.99.3
-
SOURCE_HASH=sha512:35a8f24e6c9daf8cdc7aac8467ac4e3e32ea8447df2ded4effe0f514da2d248fa783e5edec8db910c8374905dc7171c45f4ef2a5f1d1f8b430c459cf15fba6e2
+ VERSION=1.0.01
+
SOURCE_HASH=sha512:594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
SOURCE=$SPELLX-$VERSION.tar.gz

SOURCE_URL=https://github.com/OtterBrowser/otter-browser/archive/v${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/qt5-cmake/otter/HISTORY b/qt5-cmake/otter/HISTORY
index 8d82c62..19aef3c 100644
--- a/qt5-cmake/otter/HISTORY
+++ b/qt5-cmake/otter/HISTORY
@@ -1,3 +1,6 @@
+2019-01-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.01
+
2018-09-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.99.3





Archive powered by MHonArc 2.6.24.

Top of Page