Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0965255cebdef07c928375ebaf0d5841036955c1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0965255cebdef07c928375ebaf0d5841036955c1)
  • Date: Wed, 2 Sep 2009 15:50:46 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/t1lib/BUILD | 2 +
libs/t1lib/CONFIGURE | 14
++++++++++
libs/t1lib/DEPENDS | 10
+++++++
libs/t1lib/HISTORY | 6
++++
x11-libs/wine/DEPENDS | 7
++++-
x11-libs/wine/DETAILS | 2 -
x11-libs/wine/HISTORY | 4 ++
xorg-lib/libxaw/HISTORY | 7
+++++
xorg-lib/libxaw/PRE_SUB_DEPENDS | 1
xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS | 1
xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS | 9
++++++
xorg-lib/libxaw/SUB_DEPENDS | 2 +
12 files changed, 63 insertions(+), 2 deletions(-)

New commits:
commit 0965255cebdef07c928375ebaf0d5841036955c1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

t1lib: Fix Bug #15382 (missing dependencies)
Query for building X11 support
Depends on libice, libsm, libx11, libxext, libxmu,
libxpm and libxaw with XAW6 enabled (Bug #15382)
Add T1LIB_X11 to OPTS

commit 5d6820e29f9a4921712f8c0674b6d21d4e7889d3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libxaw: Allow forcing XAW6 (Bug #15382)
Updated with XAW6 sub-dependency
A REPAIR file specifically for the old PRE_SUB_DEPENDS is
pointless with the above ^all^ replacement

commit 3e67f5e89f781423fcd5971d0646d3590722b2e7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

wine: Updated to 1.1.29
Optionally depends on mpg123

diff --git a/libs/t1lib/BUILD b/libs/t1lib/BUILD
index 3b517d5..855b496 100755
--- a/libs/t1lib/BUILD
+++ b/libs/t1lib/BUILD
@@ -1,3 +1,5 @@
+OPTS="$T1LIB_X11 $OPTS" &&
+
if [ "$DOCUMENTATION" = "n" ]; then

./configure --prefix=${INSTALL_ROOT}/usr \
diff --git a/libs/t1lib/CONFIGURE b/libs/t1lib/CONFIGURE
index 58c269d..8e84617 100755
--- a/libs/t1lib/CONFIGURE
+++ b/libs/t1lib/CONFIGURE
@@ -1 +1,15 @@
config_query DOCUMENTATION "Do you want to install extra documentation (it
needs tetex)?" n
+
+if spell_ok libice &&
+ spell_ok libsm &&
+ spell_ok libx11 &&
+ spell_ok libxext &&
+ spell_ok libxmu &&
+ spell_ok libxpm
+then
+ config_query_option T1LIB_X11 "Build with X11? support" y \
+ '--with-x' '--without-x'
+else
+ config_query_option T1LIB_X11 "Build with X11 support?" n \
+ '--with-x' '--without-x'
+fi
diff --git a/libs/t1lib/DEPENDS b/libs/t1lib/DEPENDS
old mode 100755
new mode 100644
index 00dd323..cb50fcf
--- a/libs/t1lib/DEPENDS
+++ b/libs/t1lib/DEPENDS
@@ -3,3 +3,13 @@ if [ "$DOCUMENTATION" = "y" ] ; then
depends tetex

fi
+
+if [ "$T1LIB_X11" = "--with-x" ]; then
+ depends libice &&
+ depends libsm &&
+ depends libx11 &&
+ depends -sub "XAW6" libxaw &&
+ depends libxext &&
+ depends libxmu &&
+ depends libxpm
+fi
diff --git a/libs/t1lib/HISTORY b/libs/t1lib/HISTORY
index 054bdf7..9d64fab 100644
--- a/libs/t1lib/HISTORY
+++ b/libs/t1lib/HISTORY
@@ -1,3 +1,9 @@
+2009-09-02 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Query for building X11 support
+ * DEPENDS: Depends on libice, libsm, libx11, libxext, libxmu, libxpm
+ and libxaw with XAW6 enabled (Bug #15382)
+ * BUILD: Add T1LIB_X11 to OPTS
+
2009-05-14 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 5.1.2

diff --git a/x11-libs/wine/DEPENDS b/x11-libs/wine/DEPENDS
index f5809bc..7994f95 100755
--- a/x11-libs/wine/DEPENDS
+++ b/x11-libs/wine/DEPENDS
@@ -168,4 +168,9 @@ suggest_depends 'wine-gecko' \
'' \
'' \
'for pre-downloaded GECKO engine' \
- 'z-rejected'
+ 'z-rejected' &&
+
+optional_depends mpg123 \
+ '--with-mpg123' \
+ '--without-mpg123' \
+ 'for MP3 decoding support'
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 023a28d..213a9d7 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_DEVEL == y ]]; then
- VERSION=1.1.28
+ VERSION=1.1.29
else
VERSION=1.0.1
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 927df63..90056bd 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,7 @@
+2009-09-02 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.1.29
+ * DEPENDS: Optionally depends on mpg123
+
2009-08-21 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.1.28

diff --git a/xorg-lib/libxaw/HISTORY b/xorg-lib/libxaw/HISTORY
index 3fa4f02..204771d 100644
--- a/xorg-lib/libxaw/HISTORY
+++ b/xorg-lib/libxaw/HISTORY
@@ -1,3 +1,10 @@
+2009-09-02 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing XAW6 (Bug #15382)
+ * REPAIR^all^PRE_SUB_DEPENDS: Updated with XAW6
+ A REPAIR file specifically for the old PRE_SUB_DEPENDS is pointless
+ with the above ^all^ replacement
+ * REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS: Added fo XAW6
+
2009-07-02 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.6
SOURCE matches upstream posted MD5
diff --git a/xorg-lib/libxaw/PRE_SUB_DEPENDS b/xorg-lib/libxaw/PRE_SUB_DEPENDS
index 98672ab..a27db61 100755
--- a/xorg-lib/libxaw/PRE_SUB_DEPENDS
+++ b/xorg-lib/libxaw/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
+ XAW6) [ -f $INSTALL_ROOT/usr/lib/libXaw6.so ] ;;
XAW7) [ -f $INSTALL_ROOT/usr/lib/libXaw7.so ] ;;
XAW8) true ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
diff --git a/xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS
b/xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS
index 98672ab..a27db61 100755
--- a/xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS
+++ b/xorg-lib/libxaw/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
+ XAW6) [ -f $INSTALL_ROOT/usr/lib/libXaw6.so ] ;;
XAW7) [ -f $INSTALL_ROOT/usr/lib/libXaw7.so ] ;;
XAW8) true ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
diff --git
a/xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS
b/xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS
new file mode 100755
index 0000000..47fa062
--- /dev/null
+++ b/xorg-lib/libxaw/REPAIR^eda0c012942c622b558bca699b5536b0^SUB_DEPENDS
@@ -0,0 +1,9 @@
+case "$THIS_SUB_DEPENDS" in
+ XAW6) list_remove LIBXAW_OPTS "--disable-xaw6"
+ list_add LIBXAW_OPTS "--enable-xaw6";;
+ XAW7) list_remove LIBXAW_OPTS "--disable-xaw7"
+ list_add LIBXAW_OPTS "--enable-xaw7";;
+ XAW8) true ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/xorg-lib/libxaw/SUB_DEPENDS b/xorg-lib/libxaw/SUB_DEPENDS
index c58d5fb..47fa062 100755
--- a/xorg-lib/libxaw/SUB_DEPENDS
+++ b/xorg-lib/libxaw/SUB_DEPENDS
@@ -1,4 +1,6 @@
case "$THIS_SUB_DEPENDS" in
+ XAW6) list_remove LIBXAW_OPTS "--disable-xaw6"
+ list_add LIBXAW_OPTS "--enable-xaw6";;
XAW7) list_remove LIBXAW_OPTS "--disable-xaw7"
list_add LIBXAW_OPTS "--enable-xaw7";;
XAW8) true ;;



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0965255cebdef07c928375ebaf0d5841036955c1), Eric Sandall, 09/02/2009

Archive powered by MHonArc 2.6.24.

Top of Page