summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2006-08-28 10:29:02 +0000
committerKeri Harris <keri@gentoo.org>2006-08-28 10:29:02 +0000
commitecbc4b07f4c7f63cbd05025aef20c9b7e617d49b (patch)
treea574a087985e0201cb981c0e9d403371c949e63b /dev-lang/swi-prolog
parentRe-packaged, several fixes, see bug #145249 (diff)
downloadhistorical-ecbc4b07f4c7f63cbd05025aef20c9b7e617d49b.tar.gz
historical-ecbc4b07f4c7f63cbd05025aef20c9b7e617d49b.tar.bz2
historical-ecbc4b07f4c7f63cbd05025aef20c9b7e617d49b.zip
Handle single-threaded check for X server. Bug #144665.
Package-Manager: portage-2.1.1_rc1
Diffstat (limited to 'dev-lang/swi-prolog')
-rw-r--r--dev-lang/swi-prolog/ChangeLog5
-rw-r--r--dev-lang/swi-prolog/Manifest16
-rw-r--r--dev-lang/swi-prolog/files/swi-prolog-packages-test.patch57
3 files changed, 44 insertions, 34 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index b142ec421a64..2d12a54e9862 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/swi-prolog
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.27 2006/08/24 07:26:02 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.28 2006/08/28 10:29:02 keri Exp $
+
+ 28 Aug 2006; keri <keri@gentoo.org> files/swi-prolog-packages-test.patch:
+ Handle single-threaded check for X server. Bug #144665.
24 Aug 2006; keri <keri@gentoo.org> files/swi-prolog-packages-test.patch:
Check for a running X server when running XPCE test-suite. Bug #144665.
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 8b849895172b..3b57c705d56f 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -34,10 +34,10 @@ AUX swi-prolog-packages-sparc-alignment.patch 493 RMD160 01dbb170b0ba4f808fcedfa
MD5 6e51d8bc5b62b73596a976e4e9ce4dc5 files/swi-prolog-packages-sparc-alignment.patch 493
RMD160 01dbb170b0ba4f808fcedfa4e4baa93177a40ff1 files/swi-prolog-packages-sparc-alignment.patch 493
SHA256 3cff34e6f3dedf5b549c93826593109669a486a188a11ae8d878286b52282e2a files/swi-prolog-packages-sparc-alignment.patch 493
-AUX swi-prolog-packages-test.patch 7657 RMD160 5cefe22cfc7199596cee1d41404c241d0763e55b SHA1 6523f2295f3061941294df10ea16d93c891ea56e SHA256 0c4bd31a16e1edbd6d417f02dce36e1ac5888c76c91385bdbcdddc91c575411e
-MD5 995c58630b5f8c8f483c567e284271a6 files/swi-prolog-packages-test.patch 7657
-RMD160 5cefe22cfc7199596cee1d41404c241d0763e55b files/swi-prolog-packages-test.patch 7657
-SHA256 0c4bd31a16e1edbd6d417f02dce36e1ac5888c76c91385bdbcdddc91c575411e files/swi-prolog-packages-test.patch 7657
+AUX swi-prolog-packages-test.patch 8017 RMD160 35756ef63a311e9b75b5b33faca71eda02e1d3b9 SHA1 13d2c347fa08a513a404209c191f7327a60bdcb2 SHA256 7109f8cf753ba0397e875b4bc5868f2eca4d41f6b1925a75bd139f0ef454929c
+MD5 42541efa6c6cf06c3786eee8669ade82 files/swi-prolog-packages-test.patch 8017
+RMD160 35756ef63a311e9b75b5b33faca71eda02e1d3b9 files/swi-prolog-packages-test.patch 8017
+SHA256 7109f8cf753ba0397e875b4bc5868f2eca4d41f6b1925a75bd139f0ef454929c files/swi-prolog-packages-test.patch 8017
AUX swi-prolog-test.patch 549 RMD160 c9e997ed980a1821a5113b8f42ee21444da91096 SHA1 2cac0dba39db04eff6b607ce3c91ac2b92443eac SHA256 81fc9a77480226ad519a7020d3c97fb59be6e9bba8e3d8b3b22553c5c6fc7e30
MD5 7ab7ba6c84ff9a85c66105fdcb3434b9 files/swi-prolog-test.patch 549
RMD160 c9e997ed980a1821a5113b8f42ee21444da91096 files/swi-prolog-test.patch 549
@@ -56,10 +56,10 @@ EBUILD swi-prolog-5.6.8.ebuild 3535 RMD160 53fdbdda0ba795e9590b9ec4c094984f0cd50
MD5 66b0e48b5e024bebc6040b005693ef10 swi-prolog-5.6.8.ebuild 3535
RMD160 53fdbdda0ba795e9590b9ec4c094984f0cd50780 swi-prolog-5.6.8.ebuild 3535
SHA256 0a5a0a46d97b8603f18a12c93948581e844f38fa5cbe9a88256da52d97a297ea swi-prolog-5.6.8.ebuild 3535
-MISC ChangeLog 5159 RMD160 702ece95440906ebba7263c5b43c65e4a20b35ab SHA1 7433015f14172e25cdfb4a03c26e94ed3b45898f SHA256 8970850bbcaefa257fc752e4bdafee593bc3931311bf7c6365eb8a17012e4231
-MD5 cc35c12508c856437c269e3eacb1d282 ChangeLog 5159
-RMD160 702ece95440906ebba7263c5b43c65e4a20b35ab ChangeLog 5159
-SHA256 8970850bbcaefa257fc752e4bdafee593bc3931311bf7c6365eb8a17012e4231 ChangeLog 5159
+MISC ChangeLog 5294 RMD160 626e3854c5c695d4e327dd45941125f5f88ec5e0 SHA1 73dafdf0dba35fc789966804a5a6155fb1b68f06 SHA256 ee501133e9d6793aacbe49e9495762835767f1922706160524ecfca6211d063a
+MD5 c687cdc2541e7cdcd7ab6a50b5519b0d ChangeLog 5294
+RMD160 626e3854c5c695d4e327dd45941125f5f88ec5e0 ChangeLog 5294
+SHA256 ee501133e9d6793aacbe49e9495762835767f1922706160524ecfca6211d063a ChangeLog 5294
MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-test.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-test.patch
index 6f8848c0f615..4ede28bc3309 100644
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-test.patch
+++ b/dev-lang/swi-prolog/files/swi-prolog-packages-test.patch
@@ -125,18 +125,35 @@
XINCLUDES=@XINCLUDES@
XLIB=@XLIB@
-@@ -896,7 +897,7 @@
+@@ -896,7 +897,8 @@
################################################################
check::
- $(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
++ $(PCEBUILD) -q -g "['./find_display.pl'],find_display,halt" -t 'halt(0)'
+ $(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
################################################################
+--- pl-5.6.17.orig/packages/xpce/src/find_display.pl 1970-01-01 12:00:00.000000000 +1200
++++ pl-5.6.17/packages/xpce/src/find_display.pl 2006-08-28 21:47:54.000000000 +1200
+@@ -0,0 +1,13 @@
++:- asserta(library_directory('../prolog/lib')).
++:- use_module(library(pce)).
++
++find_display :-
++ current_input(InputStream),
++ open_null_stream(NullStream),
++ set_prolog_IO(InputStream, NullStream, NullStream),
++ ( exists_file('display_exists')
++ -> delete_file('display_exists')
++ ; true),
++ get(@display, visual_type, _),
++ open('display_exists', update, Fd),
++ close(Fd).
--- pl-5.6.17.orig/packages/xpce/src/test.pl 2006-03-30 01:42:18.000000000 +1200
-+++ pl-5.6.17/packages/xpce/src/test.pl 2006-08-24 19:16:27.000000000 +1200
-@@ -35,11 +35,33 @@
++++ pl-5.6.17/packages/xpce/src/test.pl 2006-08-28 21:47:10.000000000 +1200
+@@ -35,11 +35,23 @@
?- test.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@@ -149,28 +166,18 @@
To run all tests run ?- test.~n~n', [V]).
+:- dynamic
-+ default_output_stream/1,
+ display_enabled/0.
-+:- current_input(InputStream),
-+ current_output(OutputStream),
-+ assert(default_output_stream(OutputStream)),
-+ open_null_stream(NullStream),
-+ set_prolog_IO(InputStream, NullStream, NullStream),
-+ get(@display, visual_type, _),
-+ assert(display_enabled).
-+
-+:- current_input(InputStream),
-+ default_output_stream(OutputStream),
-+ set_prolog_IO(InputStream, OutputStream, OutputStream),
-+ ( display_enabled
-+ -> true
-+ ; format('No X server found. Some tests are disabled.~n~n', [])
++:- format('Checking for usable X server~n', []),
++ ( exists_file('display_exists')
++ -> format('X server found.~n~n', []),
++ assert(display_enabled)
++ ; format('No usable X server found. Some tests are disabled.~n~n', [])
+ ).
/*******************************
* NAMES *
-@@ -163,12 +185,12 @@
+@@ -163,12 +175,12 @@
*******************************/
srcsink(contents-1) :-
@@ -186,7 +193,7 @@
get(File, contents, String),
delete_file(Tmp),
get(String, value, Atom),
-@@ -193,7 +215,7 @@
+@@ -193,7 +205,7 @@
*******************************/
foreign(Name) :-
@@ -195,7 +202,7 @@
file(env-1) :-
new(F, file('$PCEHOME/Defaults')),
-@@ -202,11 +224,6 @@
+@@ -202,11 +214,6 @@
get(F, name, PceName),
same_file(PceName, PlName),
send(F, same, PlName).
@@ -207,7 +214,7 @@
file(abs-1) :-
new(F, file(foobar)),
get(F, absolute_path, Abs),
-@@ -221,13 +238,15 @@
+@@ -221,13 +228,15 @@
-> send(file(F), exists)
; \+ send(file(F), exists)
)).
@@ -224,7 +231,7 @@
exists_file(Name),
send(F2, exists),
get(F2, contents, string('Hello world\n')),
-@@ -312,12 +331,12 @@
+@@ -312,12 +321,12 @@
atom_concat(hello, Wide, New).
textbuffer(file-1) :-
new(TB, text_buffer),
@@ -240,7 +247,7 @@
delete_file(Tmp),
Copy == WAtom.
textbuffer(store-1) :-
-@@ -635,6 +654,10 @@
+@@ -635,6 +644,10 @@
testset(regex). % Regular expression matches
testset(type). % Check type logic
@@ -251,7 +258,7 @@
% testdir(Dir)
%
% Enumerate directories holding tests.
-@@ -683,6 +706,10 @@
+@@ -683,6 +696,10 @@
).
runtest(Name) :-