Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master xorg-modular grimoire by Eric Sandall (d8f047236b32376296eb86223e8aefbcc229c553)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master xorg-modular grimoire by Eric Sandall (d8f047236b32376296eb86223e8aefbcc229c553)
  • Date: Sat, 2 Sep 2006 03:03:46 -0500

GIT changes to master xorg-modular grimoire by Eric Sandall
<sandalle@cerberus.(none)>:

libcompat | 44
+++++++++++++++++++++++++++++++++++++++
xorg-xserver/xorg-server/BUILD | 1
xorg-xserver/xorg-server/DEPENDS | 8 +++----
xorg-xserver/xorg-server/HISTORY | 3 ++
4 files changed, 52 insertions(+), 4 deletions(-)

New commits:
commit d8f047236b32376296eb86223e8aefbcc229c553
Author: Eric Sandall <sandalle@cerberus.(none)>
Commit: Eric Sandall <sandalle@cerberus.(none)>

Disable libxp support in xorg-server (Bug #12713)

commit 16b9c5b2fa4168669644348548b77c4786d9c253
Author: Eric Sandall <sandalle@cerberus.(none)>
Commit: Eric Sandall <sandalle@cerberus.(none)>

Add missing libcompat for non-devel Sorcery and sub_depends

diff --git a/libcompat b/libcompat
new file mode 100755
index 0000000..515697f
--- /dev/null
+++ b/libcompat
@@ -0,0 +1,44 @@
+# ignore sub_depends if not supported by sorcery
+declare -f sub_depends &> /dev/null ||
+{
+ function sub_depends() {
+ :
+ }
+
+ function depends() {
+ [[ $1 == "-sub" ]] && shift 2
+ real_depends "$@"
+ }
+
+ function optional_depends() {
+ [[ $1 == "-sub" ]] && shift 2
+ real_optional_depends "$@"
+ }
+}
+
+# ignore force_depends if not supported by sorcery
+declare -f force_depends &> /dev/null ||
+function force_depends() {
+ :
+}
+
+#-------------------------------------------------------------------------
+## Grimoire gaze depends alternative
+## Uses gaze depends if the internal sorcery function isn't available
+#-------------------------------------------------------------------------
+declare -f show_up_depends &> /dev/null ||
+function show_up_depends() {
+ gaze -q depends --fast "$@"
+}
+
+# fall back to optional_depends if suggest_depends isn't implemented
+declare -f suggest_depends &> /dev/null ||
+function suggest_depends() {
+ optional_depends "$@"
+}
+
+# fall back to depends if runtime_depends isn't implemented
+declare -f runtime_depends &> /dev/null ||
+function runtime_depends() {
+ depends "$@"
+}
diff --git a/xorg-xserver/xorg-server/BUILD b/xorg-xserver/xorg-server/BUILD
index bc2e7c4..b2b9a28 100755
--- a/xorg-xserver/xorg-server/BUILD
+++ b/xorg-xserver/xorg-server/BUILD
@@ -1,4 +1,5 @@
OPTS="${XORG_SERVER_OPTS} \
--with-mesa-source=${BUILD_DIRECTORY}/Mesa-${VERSION2} \
+ --disable-xprint \
${OPTS}" &&
default_build
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index fe4d654..0f3ec8b 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -32,10 +32,10 @@ optional_depends libxxf86dga
"--enable-dga" \
"--disable-dga" \
"Build DGA extension" &&
-optional_depends libxp \
- "--enable-xprint" \
- "--disable-xprint" \
- "Build Xprint extension and server" &&
+#optional_depends libxp \
+# "--enable-xprint" \
+# "--disable-xprint" \
+# "Build Xprint extension and server" &&
optional_depends libdmx \
"--enable-dmx" \
"--disable-dmx" \
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index ce46d9d..21bb594 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2006-09-02 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Disable xprint (breaks build) (Bug #12713)
+
2006-08-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 1.1.1, SECURITY_PATCH +





Archive powered by MHonArc 2.6.24.

Top of Page