Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (92ba11ef05ffb156f37cce77026a67477c53864f)
  • Date: Wed, 20 Sep 2006 12:56:10 -0500

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

doc/xpdf/DEPENDS | 8 +++-----
doc/xpdf/DETAILS | 2 +-
doc/xpdf/HISTORY | 3 +++
doc/xpdf/INSTALL | 9 ++++++---
4 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 92ba11ef05ffb156f37cce77026a67477c53864f
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

xpdf: made X11 optional

diff --git a/doc/xpdf/DEPENDS b/doc/xpdf/DEPENDS
index ef32b36..f093ce4 100755
--- a/doc/xpdf/DEPENDS
+++ b/doc/xpdf/DEPENDS
@@ -1,6 +1,4 @@
-depends freetype2 \
- "--with-freetype2-includes=$TRACK_ROOT/usr/include/freetype2" &&
-depends MOTIF &&
-depends ghostscript-fonts-std &&
-
+depends freetype2
"--with-freetype2-includes=$TRACK_ROOT/usr/include/freetype2"
&&
+optional_depends MOTIF "--with-x" "--without-x" "Build xpdf itself instead
of just the utils?" &&
+depends ghostscript-fonts-std
&&
optional_depends "t1lib" "" "" "to display (embedded) Type1 fonts"
diff --git a/doc/xpdf/DETAILS b/doc/xpdf/DETAILS
index 7f93e18..0799a6b 100755
--- a/doc/xpdf/DETAILS
+++ b/doc/xpdf/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_HASH=sha512:add411b8c27caeb32360c82c7b6e81245633c404681890d3bf662d5fe425bdbef6be0c61eded074db2823cf9c399722cbedf8d765dcde94049d7fae77b45c81e

SOURCE2_HASH=sha512:a6752adc588168562ddcfe5c1de9ef0ce4a196622ccf8825f2e69f5ecc5df2c6a401a9fd21f7119b9062fdcd489cd9cc9e26dde633152c9356f966ab9b8316ef
ENTERED=20010923
- UPDATED=20050817
+ PATCHLEVEL=1
LICENSE=GPL
KEYWORDS="pdf doc"
SHORT="xpdf: a PDF viewer for X11R6."
diff --git a/doc/xpdf/HISTORY b/doc/xpdf/HISTORY
index b0c8497..61d452c 100644
--- a/doc/xpdf/HISTORY
+++ b/doc/xpdf/HISTORY
@@ -1,3 +1,6 @@
+2006-09-20 Arjan Bouter <abouter AT sourcemage.org>
+ * DEPENDS: made MOTIF and X11 optional
+
2006-08-03 Eric Sandall <eric AT sandall.us>
* DEPENDS: Inform xpdf where to find the freetype2 headers.
Without this, the xpdf binary won't be built if we say 'n' to t1lib.
diff --git a/doc/xpdf/INSTALL b/doc/xpdf/INSTALL
index 7823f6b..b52021b 100755
--- a/doc/xpdf/INSTALL
+++ b/doc/xpdf/INSTALL
@@ -1,4 +1,7 @@
default_install &&
-install -d -m 755 $INSTALL_ROOT/usr/share/applications &&
-install -m 644 $SCRIPT_DIRECTORY/desktop/xpdf.desktop \
- $INSTALL_ROOT/usr/share/applications
+if [ -x $INSTALL_ROOT/usr/bin/xpdf ]; then
+ message "installing a desktop file for xpdf" &&
+ install -d -m 755 $INSTALL_ROOT/usr/share/applications &&
+ install -m 644 $SCRIPT_DIRECTORY/desktop/xpdf.desktop \
+ $INSTALL_ROOT/usr/share/applications
+fi



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (92ba11ef05ffb156f37cce77026a67477c53864f), Arjan Bouter, 09/20/2006

Archive powered by MHonArc 2.6.24.

Top of Page