Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (4d7a700bd8c138353e9adf8ab0ed7442aed94226)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (4d7a700bd8c138353e9adf8ab0ed7442aed94226)
  • Date: Fri, 19 Sep 2008 06:20:01 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

xorg-app/bitmap/CONFIGURE | 5 -----
xorg-app/bitmap/DEPENDS | 15 +++++++++++++--
xorg-app/bitmap/HISTORY | 4 ++++
xorg-lib/libxaw/CONFIGURE | 2 +-
xorg-lib/libxaw/DETAILS | 1 +
xorg-lib/libxaw/HISTORY | 6 ++++++
xorg-lib/libxaw/PRE_SUB_DEPENDS | 1 +
xorg-lib/libxaw/SUB_DEPENDS | 2 ++
8 files changed, 28 insertions(+), 8 deletions(-)

New commits:
commit 77dd793cc0da9ecfb15b7516d182bac1496b2264
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

bitmap: added libxaw7 as a possible option instead of forcing 8

commit 8a8c2a6d4a6d4476c8991718d13ebee34b2b4504
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

libxaw: added xaw7 to the subdepends

diff --git a/xorg-app/bitmap/CONFIGURE b/xorg-app/bitmap/CONFIGURE
deleted file mode 100755
index c9d5418..0000000
--- a/xorg-app/bitmap/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-config_query_option BITMAP_OPTS \
- 'Enable XPrint support?' \
- y \
- '--enable-xprint' \
- '--disable-xprint'
diff --git a/xorg-app/bitmap/DEPENDS b/xorg-app/bitmap/DEPENDS
index 5c51929..e6abb14 100755
--- a/xorg-app/bitmap/DEPENDS
+++ b/xorg-app/bitmap/DEPENDS
@@ -4,5 +4,16 @@ depends util-macros &&
depends libx11 &&
depends libxmu &&
depends libxaw &&
-sub_depends libxaw XAW8 &&
-depends xbitmaps
+depends xbitmaps &&
+
+optional_depends libxp \
+ "--with-xprint" \
+ "--disable-xprint" \
+ "For printing support" &&
+
+# bitmap needs either Xaw7 or Xaw8. Xaw6 won't do
+if is_depends_enabled $SPELL libxp; then
+ sub_depends libxaw XAW8
+else
+ sub_depends libxaw XAW7
+fi
diff --git a/xorg-app/bitmap/HISTORY b/xorg-app/bitmap/HISTORY
index a2e64ee..3aa5236 100644
--- a/xorg-app/bitmap/HISTORY
+++ b/xorg-app/bitmap/HISTORY
@@ -1,3 +1,7 @@
+2008-09-17 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS,CONFIGURE: moved libxp to the proper place
+ * DEPENDS: added a sub_depends on xaw7 as an option
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

diff --git a/xorg-lib/libxaw/CONFIGURE b/xorg-lib/libxaw/CONFIGURE
index 2516d2d..2b6753e 100755
--- a/xorg-lib/libxaw/CONFIGURE
+++ b/xorg-lib/libxaw/CONFIGURE
@@ -1,5 +1,5 @@
config_query_option LIBXAW_OPTS \
- 'Enable building of libXaw.so.6 (recommended)?' \
+ 'Enable building of libXaw.so.6?' \
y \
'--enable-xaw6' \
'--disable-xaw6' &&
diff --git a/xorg-lib/libxaw/DETAILS b/xorg-lib/libxaw/DETAILS
index c9c4321..f1e3bc1 100755
--- a/xorg-lib/libxaw/DETAILS
+++ b/xorg-lib/libxaw/DETAILS
@@ -8,6 +8,7 @@
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
+ PATCHLEVEL=1
LICENSE[0]=XCL
SHORT="X Athena Widgets"
cat << EOF
diff --git a/xorg-lib/libxaw/HISTORY b/xorg-lib/libxaw/HISTORY
index 7924c7d..8842d38 100644
--- a/xorg-lib/libxaw/HISTORY
+++ b/xorg-lib/libxaw/HISTORY
@@ -1,3 +1,9 @@
+2008-09-17 Arjan Bouter <abouter AT sourcemage.org>
+ * PRE_SUB_DEPENDS: added XAW7
+ * SUB_DEPENDS: added XAW7
+ * CONFIGURE: removed recommended from Xaw6
+ * DETAILS: patchlevel=1
+
2008-09-11 Ethan Grammatikidis <eekee57 AT fastmail.fm>
* CONFIGURE: Made both options ask to enable as is normal for spells,
and made them default to y.
diff --git a/xorg-lib/libxaw/PRE_SUB_DEPENDS b/xorg-lib/libxaw/PRE_SUB_DEPENDS
index 913afef..b349d9f 100755
--- a/xorg-lib/libxaw/PRE_SUB_DEPENDS
+++ b/xorg-lib/libxaw/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
+ XAW7) [ -f $INSTALL_ROOT/usr/lib/libXaw7.so ] ;;
XAW8) [ -f $INSTALL_ROOT/usr/lib/libXaw8.so ] ||
is_depends_enabled $SPELL libxp ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
diff --git a/xorg-lib/libxaw/SUB_DEPENDS b/xorg-lib/libxaw/SUB_DEPENDS
index f75e4e1..3f9c586 100755
--- a/xorg-lib/libxaw/SUB_DEPENDS
+++ b/xorg-lib/libxaw/SUB_DEPENDS
@@ -1,4 +1,6 @@
case "$THIS_SUB_DEPENDS" in
+ XAW7) list_remove LIBXAW_OPTS "--disable-xaw7"
+ list_add LIBXAW_OPTS "--enable-xaw7";;
XAW8) depends libxp "--enable-xaw8" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (4d7a700bd8c138353e9adf8ab0ed7442aed94226), Arjan Bouter, 09/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page