Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d82b1c4af05f984e032d16456d0ba798a9c98464)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d82b1c4af05f984e032d16456d0ba798a9c98464)
  • Date: Fri, 14 Jun 2013 07:20:01 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

graphics/djview4/BUILD | 2 ++
graphics/djview4/HISTORY | 3 +++
graphics/graphicsmagick/DEPENDS | 4 ++--
graphics/graphicsmagick/HISTORY | 4 ++++
4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit d82b1c4af05f984e032d16456d0ba798a9c98464
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

graphicsmagic: fix DEPENDS to make it build again

commit a10ab4cad6ff631d4ffd9a708397c708859b77e8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

djview4: fix build for still-present old Qt

diff --git a/graphics/djview4/BUILD b/graphics/djview4/BUILD
index b20c061..eb328c1 100755
--- a/graphics/djview4/BUILD
+++ b/graphics/djview4/BUILD
@@ -1,3 +1,5 @@
export QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
export PATH="$QTDIR/bin/qt4:$PATH" &&
+# configure script still finds /usr/bin/qmake, wants this extra setting
+export QMAKE="$QTDIR/bin/qt4/qmake" &&
default_build
diff --git a/graphics/djview4/HISTORY b/graphics/djview4/HISTORY
index a60caa0..9ad1434 100644
--- a/graphics/djview4/HISTORY
+++ b/graphics/djview4/HISTORY
@@ -1,3 +1,6 @@
+2013-06-14 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix it for still present old qmake
+
2013-05-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.9
* PRE_BUILD, qt4.8.patch: deleted
diff --git a/graphics/graphicsmagick/DEPENDS b/graphics/graphicsmagick/DEPENDS
index 47971ab..3549bfd 100755
--- a/graphics/graphicsmagick/DEPENDS
+++ b/graphics/graphicsmagick/DEPENDS
@@ -1,5 +1,5 @@
depends freetype2 &&
-depends libtool "--disable-ltdl-install" &&
+depends libtool &&

optional_depends bzip2 \
"--with-bzlib" \
@@ -26,7 +26,7 @@ optional_depends libpng \
"--without-png" \
"for PNG support" &&
# X11 support
-optional_depends xorg-server '--with-x' '--without-x''to support X
display' &&
+optional_depends xorg-server '--with-x' '--without-x' 'to support X
display' &&
if is_depends_enabled $SPELL xorg-server;then
depends libx11 &&
depends libxrender &&
diff --git a/graphics/graphicsmagick/HISTORY b/graphics/graphicsmagick/HISTORY
index 2e89bbf..48db7d8 100644
--- a/graphics/graphicsmagick/HISTORY
+++ b/graphics/graphicsmagick/HISTORY
@@ -1,3 +1,7 @@
+2013-06-14 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: fix X11 dependency (missing space), remove
+ --disable-ltdl-install, which is not recognized
+
2013-04-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.3.18




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d82b1c4af05f984e032d16456d0ba798a9c98464), Thomas Orgis, 06/14/2013

Archive powered by MHonArc 2.6.24.

Top of Page