Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3851cc63d32c16f1ee670ed5a2c5cb647384e8c8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3851cc63d32c16f1ee670ed5a2c5cb647384e8c8)
  • Date: Sat, 23 Mar 2013 06:12:55 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

science/gpsbabel/BUILD | 2 +-
science/gpsbabel/DEPENDS | 1 -
science/gpsbabel/HISTORY | 5 +++++
3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 3851cc63d32c16f1ee670ed5a2c5cb647384e8c8
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

fix build error due to qt4 missin from $PATH and incompatible system zlib

diff --git a/science/gpsbabel/BUILD b/science/gpsbabel/BUILD
index 42f8438..bcb71ef 100755
--- a/science/gpsbabel/BUILD
+++ b/science/gpsbabel/BUILD
@@ -1,4 +1,4 @@
-default_build &&
+PATH=${INSTALL_ROOT}/usr/bin/qt4:$PATH default_build &&
if is_depends_enabled $SPELL qt4; then
pushd gui &&
${TRACK_ROOT}/usr/bin/qt4/lrelease *.ts &&
diff --git a/science/gpsbabel/DEPENDS b/science/gpsbabel/DEPENDS
index 6292cde..075f968 100755
--- a/science/gpsbabel/DEPENDS
+++ b/science/gpsbabel/DEPENDS
@@ -1,5 +1,4 @@
depends libusb-compat &&
depends expat &&
-depends zlib "--with-zlib=system" &&
optional_depends qt4 "" "" "for GUI support" &&
optional_depends perl "" "" "to install documentation"
diff --git a/science/gpsbabel/HISTORY b/science/gpsbabel/HISTORY
index 8049dab..978ea8d 100644
--- a/science/gpsbabel/HISTORY
+++ b/science/gpsbabel/HISTORY
@@ -1,3 +1,8 @@
+2013-03-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: remove dependency on system zlib as it is incompatible
+ with gpsbabel
+ * BUILD: add /usr/bin/qt4 to PATH to prevent error during linking
+
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.4.4




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (3851cc63d32c16f1ee670ed5a2c5cb647384e8c8), Florian Franzmann, 03/23/2013

Archive powered by MHonArc 2.6.24.

Top of Page