summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-scheme/guile-www/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-scheme/guile-www/files')
-rw-r--r--dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch74
-rw-r--r--dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch51
2 files changed, 125 insertions, 0 deletions
diff --git a/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch b/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
new file mode 100644
index 000000000000..fdd3b601533b
--- /dev/null
+++ b/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
@@ -0,0 +1,74 @@
+From f41bf9380f7b08f5e8c07c9c58d66cd5da7bc356 Mon Sep 17 00:00:00 2001
+From: Thien-Thi Nguyen <ttn@gnuvola.org>
+Date: Thu, 28 Apr 2011 05:13:52 +0000
+Subject: [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
+
+Reported by Bernardo Ezequiel Contreras:
+<https://savannah.nongnu.org/bugs/?33175>
+
+* source/alive.test: If guile has ‘%load-extensions’, create a
+preload file that removes ".scm" from it; use that file for
+all invocations; and delete it when done. If in debug mode,
+display ponderings, as well as ‘guile --version’ output.
+---
+diff --git a/source/ChangeLog b/source/ChangeLog
+index 2b5bd1b..2de79f4 100644
+--- a/source/ChangeLog
++++ b/source/ChangeLog
+@@ -1,3 +1,15 @@
++2011-04-28 Thien-Thi Nguyen <ttn@gnuvola.org>
++
++ [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
++
++ Reported by Bernardo Ezequiel Contreras:
++ <https://savannah.nongnu.org/bugs/?33175>
++
++ * alive.test: If guile has ‘%load-extensions’, create a
++ preload file that removes ".scm" from it; use that file for
++ all invocations; and delete it when done. If in debug mode,
++ display ponderings, as well as ‘guile --version’ output.
++
+ 2011-01-24 Thien-Thi Nguyen <ttn@gnuvola.org>
+
+ Release: 2.29
+diff --git a/source/alive.test b/source/alive.test
+index 3521fcc..76e91c8 100755
+--- a/source/alive.test
++++ b/source/alive.test
+@@ -35,6 +35,25 @@ decho ()
+ if $debug ; then echo "$1" ; fi
+ }
+
++decho 'guile:'
++if $debug ; then ${GUILE-guile} --version ; fi
++
++if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
++ preload=alive.preload
++ echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
++ if $debug ; then
++ decho 'preload:'
++ cat $preload
++ decho 'before:'
++ $guile -c '(begin (write %load-extensions) (newline))'
++ fi
++ guile="$guile -l $preload"
++ if $debug ; then
++ decho 'after:'
++ $guile -c '(begin (write %load-extensions) (newline))'
++ fi
++fi
++
+ decho 'indivdually:'
+ { while read m ;
+ do
+@@ -48,4 +67,8 @@ all="`cat $all`"
+ decho "$guile -c '(use-modules $all)'"
+ $guile -c "(use-modules $all)"
+
++if [ "$preload" ] ; then rm $preload ; fi
++
++exit 0
++
+ # alive.test ends here
+--
+cgit v0.9.0.2
diff --git a/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch b/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
new file mode 100644
index 000000000000..9cf7efe984ab
--- /dev/null
+++ b/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
@@ -0,0 +1,51 @@
+From cfabb94ca727d63f5712860c3fe4132926e498c9 Mon Sep 17 00:00:00 2001
+From: Thien-Thi Nguyen <ttn@gnuvola.org>
+Date: Mon, 02 May 2011 08:32:02 +0000
+Subject: [v] Refine preload: Prioritize "" instead of deleting ".scm".
+
+The 2011-04-28 change goes too far; it impedes
+loading system modules used by Guile-WWW modules.
+Reported by (Savannah user) vonbecmann:
+<https://savannah.nongnu.org/bugs/?33175>.
+
+* source/alive.test: Don't delete ".scm" from ‘%load-extensions’;
+instead, ensure only that "" is at the beginning of the list.
+---
+diff --git a/source/ChangeLog b/source/ChangeLog
+index 2de79f4..ece831e 100644
+--- a/source/ChangeLog
++++ b/source/ChangeLog
+@@ -1,3 +1,15 @@
++2011-05-02 Thien-Thi Nguyen <ttn@gnuvola.org>
++
++ [v] Refine preload: Prioritize "" instead of deleting ".scm".
++
++ The 2011-04-28 change goes too far; it impedes
++ loading system modules used by Guile-WWW modules.
++ Reported by (Savannah user) vonbecmann:
++ <https://savannah.nongnu.org/bugs/?33175>.
++
++ * alive.test: Don't delete ".scm" from ‘%load-extensions’;
++ instead, ensure only that "" is at the beginning of the list.
++
+ 2011-04-28 Thien-Thi Nguyen <ttn@gnuvola.org>
+
+ [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
+diff --git a/source/alive.test b/source/alive.test
+index 76e91c8..6e430f4 100755
+--- a/source/alive.test
++++ b/source/alive.test
+@@ -39,8 +39,10 @@ decho 'guile:'
+ if $debug ; then ${GUILE-guile} --version ; fi
+
+ if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
++ # Make sure "" is at head of list.
+ preload=alive.preload
+- echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
++ echo '(set! %load-extensions (delete "" %load-extensions))' > $preload
++ echo '(set! %load-extensions (cons "" %load-extensions))' >> $preload
+ if $debug ; then
+ decho 'preload:'
+ cat $preload
+--
+cgit v0.9.0.2