Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Treeve Jelbert (98d11f75e377074475b9ae363682d8b0974d5e48)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Treeve Jelbert (98d11f75e377074475b9ae363682d8b0974d5e48)
  • Date: Sun, 15 Mar 2009 10:27:18 -0500

GIT changes to master z-rejected grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

z-x11/openmotif/BUILD | 6 ++----
z-x11/openmotif/DEPENDS | 19 +++++++++----------
z-x11/openmotif/DETAILS | 8 ++++----
z-x11/openmotif/HISTORY | 9 +++++++++
z-x11/openmotif/PREPARE | 3 +++
z-x11/openmotif/PRE_BUILD | 10 +++++++++-
6 files changed, 36 insertions(+), 19 deletions(-)

New commits:
commit 0388cf86c25305f26c5120d4994a561ac7368a76
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

openmotif - this spell is completely broken, as it relies on libxp,
which is now dead.
Commit this update anyway, as previous version is broken for the same
reason.
Maybe someone else can find a way to fix this!!??

diff --git a/z-x11/openmotif/BUILD b/z-x11/openmotif/BUILD
index 994d729..333989a 100755
--- a/z-x11/openmotif/BUILD
+++ b/z-x11/openmotif/BUILD
@@ -1,5 +1,3 @@
-if ! check_if_xorg_modular_libs ; then
- OPTS="--prefix=/usr/X11R6 $OPTS"
-fi &&
-make_single &&
+OPTS="--disable-motif22-compatibility --disable-static $OPTS" &&
+#make_single &&
default_build
diff --git a/z-x11/openmotif/DEPENDS b/z-x11/openmotif/DEPENDS
index 4b95ae1..f5c9b5a 100755
--- a/z-x11/openmotif/DEPENDS
+++ b/z-x11/openmotif/DEPENDS
@@ -3,16 +3,15 @@
depends expat &&
depends fontconfig &&
depends freetype2 &&
-depends X11-LIBS &&
-
-if check_if_xorg_modular_libs ; then
- depends libxp &&
-
- optional_depends libxft \
- '--enable-xft' \
- '--disable-xft' \
- 'for XFT font anti-aliasing'
-fi &&
+depends libtool &&
+depends libx11 &&
+depends libxt &&
+depends libxmu &&
+depends printproto &&
+optional_depends libxft \
+ '--enable-xft' \
+ '--disable-xft' \
+ 'for XFT font anti-aliasing' &&

optional_depends jpeg \
'--enable-jpeg' \
diff --git a/z-x11/openmotif/DETAILS b/z-x11/openmotif/DETAILS
index ee28c5a..9952012 100755
--- a/z-x11/openmotif/DETAILS
+++ b/z-x11/openmotif/DETAILS
@@ -1,9 +1,9 @@
SPELL=openmotif
- VERSION=2.3.0
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=2.3.1
+
SOURCE_HASH=sha512:c6555e39b93e669c997cf9d381384179b585ff2759502f84ef644d91e324d0a40fa0e738d329d703f71f0e5a2259b6a22e9b8bfc11ba6f9c96794feb2315f8a8
+ SOURCE=$SPELL-$VERSION-1.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.ics.com/openmotif/${VERSION//.0}/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:f560c9b150c260c3633ac02cf3e3dd6f3dfb564560c2ac2d4f5806b32e4b3ddc2ac67953fded9355bf546fe696f9d32b2f71c95e3f13f8f15182a14fdf5fd80d
+ SOURCE_URL[0]=ftp://ftp.ics.com/openmotif/${VERSION//.1}/$VERSION/$SOURCE
WEB_SITE=http://www.motifzone.net/
ENTERED=20020510
LICENSE[0]=http://www.opengroup.org/openmotif/license
diff --git a/z-x11/openmotif/HISTORY b/z-x11/openmotif/HISTORY
index 54e26a0..f67c0e7 100644
--- a/z-x11/openmotif/HISTORY
+++ b/z-x11/openmotif/HISTORY
@@ -1,3 +1,12 @@
+2009-03-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.3.1
+ * DEPENDS: remove libxp (dead), add libx11, libxmu,libxt, libxmu,
libtool
+ * PRE_BUILD: use sed instead of patch, then autoreconf
+ no-demos.patch: delete
+ remove Xprint usage, as it is dead
+ * BUILD: remove xorg_modular checks
+ * PREPARE: add, to warn that spell is broken
+
2008-02-06 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Optionally depend on libxft, jpeg, and libpng
* PRE_BUILD: Apply no-demos.patch
diff --git a/z-x11/openmotif/PREPARE b/z-x11/openmotif/PREPARE
new file mode 100755
index 0000000..66fba51
--- /dev/null
+++ b/z-x11/openmotif/PREPARE
@@ -0,0 +1,3 @@
+message ${PROBLEM_COLOR}this spell is completely broken, \
+as it relies on libxp, which is DEAD${DEFAULT_COLOR}
+return 1
diff --git a/z-x11/openmotif/PRE_BUILD b/z-x11/openmotif/PRE_BUILD
index 46e19b4..f795276 100755
--- a/z-x11/openmotif/PRE_BUILD
+++ b/z-x11/openmotif/PRE_BUILD
@@ -1,3 +1,11 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/no-demos.patch
+# don't build or install demos
+sed -i '/^demos/D' configure.ac &&
+sed -i 's/demos//;s/doc \\/doc/' Makefile.am &&
+rm -r demos &&
+# remove XPrint usage
+#sed -i '/Print/D' lib/Xm/XmAll.h lib/Xm/Xm.h &&
+#sed -i 's/-lXp //' lib/Xm/Makefile.am &&
+touch INSTALL NEWS AUTHORS COPYING &&
+autoreconf -f -i



  • [SM-Commit] GIT changes to master z-rejected grimoire by Treeve Jelbert (98d11f75e377074475b9ae363682d8b0974d5e48), Treeve Jelbert, 03/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page