summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2008-07-01 21:30:33 +0200
committerArwed von Merkatz2008-07-01 21:30:33 +0200
commitfcb072bbdbeb9545258a10a23ad5bea02e06d268 (patch)
treebd82077a217ade959276ebb3482a7aade6fc0323
parentf899a83433a1de9e8f5011e65c5fde4dd34cd733 (diff)
Revert "gcj: Depend on libxtst if AWT is requested and using xorg-modular (Bug #13975)"
This reverts commit d1cefa7ef55c17655424074e5c6c6c84dc984caf.
-rwxr-xr-xgnu/gcj/DEPENDS16
-rw-r--r--gnu/gcj/HISTORY4
2 files changed, 5 insertions, 15 deletions
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index a8f12d488b..7d0cccae76 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -1,15 +1,9 @@
-. $GRIMOIRE/libcompat &&
-depends gcc &&
-
+. $GRIMOIRE/libcompat &&
+depends gcc &&
if [ "$GCJ_AWT" = "y" ]; then
- depends gtk+2 '--enable-java-awt=gtk' &&
- depends libart_lgpl &&
- . $GRIMOIRE/FUNCTIONS &&
- if check_if_xorg_modular_libs gtk+2; then
- depends libxtst
- fi
-fi &&
-
+ depends gtk+2 '--enable-java-awt=gtk' &&
+ depends libart_lgpl
+fi &&
if [[ $VERSION != $(installed_version gcc) ]]; then
force_depends gcc
fi &&
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 4f484452bd..5312255204 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,7 +1,3 @@
-2008-04-13 Eric Sandall <sandalle@sourcemage.org>
- * DEPENDS: AWT support depends on libxtst if using xorg-modular
- Bug #13975
-
2008-03-15 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated to 4.3.0
* DEPENDS: Depends on gmp and mpfr