Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d9028341acc5a5e62b289458be561a9d4eb362e6)

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 grimoire by Treeve Jelbert (d9028341acc5a5e62b289458be561a9d4eb362e6)
  • Date: Tue, 27 Oct 2015 15:11:13 +0000

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

science-libs/molequeue/DETAILS | 5 ++---
science-libs/molequeue/HISTORY | 3 +++
science/gdal/DEPENDS | 4 ++--
science/gdal/DETAILS | 6 +++---
science/gdal/HISTORY | 4 ++++
x11/merkaartor/BUILD | 6 +++++-
x11/merkaartor/CONFIGURE | 1 +
x11/merkaartor/DEPENDS | 7 ++++++-
x11/merkaartor/HISTORY | 6 ++++++
x11/merkaartor/PRE_BUILD | 9 ++++++++-
10 files changed, 40 insertions(+), 11 deletions(-)

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

merkaartor - qt5 support

commit b9d3628d0073577079b4a9ce4f8dc65573a52c8a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gdal: => 2.0.1

commit 81267c67a44de113db3c07b39caf6b8eb9395473
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

molequeue: => 0.8.0

diff --git a/science-libs/molequeue/DETAILS b/science-libs/molequeue/DETAILS
index 0b02f0b..dbfb291 100755
--- a/science-libs/molequeue/DETAILS
+++ b/science-libs/molequeue/DETAILS
@@ -1,12 +1,11 @@
SPELL=molequeue
VERSION=0.8.0

SOURCE_HASH=sha512:b9539d2ad2c67188ad254f186c1d67c122a15a32047801c632a1613a4f9c887f38baf2da1bb80cb123391948c2a44604fb1082e475ca6de1e683fbe51266ac84
- SOURCE=$VERSION.tar.gz
-# SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=http://www.openchemistry.org
# SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
- SOURCE_URL[0]=https://github.com/OpenChemistry/molequeue/archive/$SOURCE
+
SOURCE_URL[0]=https://github.com/OpenChemistry/molequeue/archive/$VERSION.tar.gz
LICENSE[0]=BSD
ENTERED=20130713
KEYWORDS="chemistry"
diff --git a/science-libs/molequeue/HISTORY b/science-libs/molequeue/HISTORY
index b4ee153..16d3094 100644
--- a/science-libs/molequeue/HISTORY
+++ b/science-libs/molequeue/HISTORY
@@ -1,3 +1,6 @@
+2015-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: properly name tarball
+
2015-09-29 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.0 (git)
* DEPENDS, BUILD: now uses qt5
diff --git a/science/gdal/DEPENDS b/science/gdal/DEPENDS
index a28a30a..1d0ba5f 100755
--- a/science/gdal/DEPENDS
+++ b/science/gdal/DEPENDS
@@ -41,11 +41,11 @@ optional_depends php \
"--with-php" \
"--without-php" \
"Enable php bindings" &&
-optional_depends ruby \
+optional_depends RUBY \
"--with-ruby" \
"--without-ruby" \
"Enable Ruby bindings" &&
-optional_depends python \
+optional_depends PYTHON \
"--with-python" \
"--without-python" \
"Enable python bindings" &&
diff --git a/science/gdal/DETAILS b/science/gdal/DETAILS
index cc4fb26..f276d10 100755
--- a/science/gdal/DETAILS
+++ b/science/gdal/DETAILS
@@ -1,8 +1,8 @@
SPELL=gdal
- VERSION=2.0.0
- SOURCE="$SPELL-$VERSION.tar.gz"
+ VERSION=2.0.1
+
SOURCE_HASH=sha512:46cd0263a8eb628510c4abb69346e392fffb836636c0a9738edbd4a904bb26d30110429577374712672f690096a7210d761e35d16c4ba4dcb31a10183d911245
+ SOURCE="$SPELL-$VERSION.tar.xz"
SOURCE_URL[0]=http://download.osgeo.org/$SPELL/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:74ae9d01a69652c92a16bc91f71b4c8416697d5f7aa137d385f58b7dc63c165c26330464c98891ac66b09475de24fbbff61f506ad1c9ecf64ffe08f1429fbad5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://www.gdal.org/";
LICENSE[0]="MIT/X"
diff --git a/science/gdal/HISTORY b/science/gdal/HISTORY
index 3c0faef..53dd766 100644
--- a/science/gdal/HISTORY
+++ b/science/gdal/HISTORY
@@ -1,3 +1,7 @@
+2015-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.0.1
+ * DEPENDS: ruby => RUBY, python => PYTHON
+
2015-06-24 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 2.0.0
diff --git a/x11/merkaartor/BUILD b/x11/merkaartor/BUILD
index eec3de4..ac6c30b 100755
--- a/x11/merkaartor/BUILD
+++ b/x11/merkaartor/BUILD
@@ -1 +1,5 @@
-qt4_build
+if [[ $MEERKARTOR_QT == qt5 ]];then
+ qt5_build
+else
+ qt4_build
+fi
diff --git a/x11/merkaartor/CONFIGURE b/x11/merkaartor/CONFIGURE
new file mode 100755
index 0000000..488126f
--- /dev/null
+++ b/x11/merkaartor/CONFIGURE
@@ -0,0 +1 @@
+config_query_list MEERKARTOR_QT 'which Qt version' qt5 qt4
diff --git a/x11/merkaartor/DEPENDS b/x11/merkaartor/DEPENDS
index 79cab95..d7c7910 100755
--- a/x11/merkaartor/DEPENDS
+++ b/x11/merkaartor/DEPENDS
@@ -1,5 +1,10 @@
depends -sub CXX gcc &&
-depends -sub WEBKIT qt4 &&
+if [[ $MEERKARTOR_QT == qt5 ]];then
+ depends qtwebkit &&
+ depends qtbase
+else
+ depends -sub WEBKIT qt4
+fi &&
depends boost &&
depends gdal &&
depends proj &&
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
index 4cf0c32..ad0c90e 100644
--- a/x11/merkaartor/HISTORY
+++ b/x11/merkaartor/HISTORY
@@ -1,3 +1,9 @@
+2015-10-27 Treeve Jelbert <treeve AT sourcemage.org>
+ qt5 support (u[stream default)
+ * CONFIGURE: added
+ * DEPENDS BUILD PRE_BUILD: adjusted
+ * PRE_BUILD: qt5.5 fix
+
2015-07-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.18.2
* 0002-FIX-Assert-width-0-with-wireframe-with-style.patch,
diff --git a/x11/merkaartor/PRE_BUILD b/x11/merkaartor/PRE_BUILD
index 06db156..3041118 100755
--- a/x11/merkaartor/PRE_BUILD
+++ b/x11/merkaartor/PRE_BUILD
@@ -1,3 +1,10 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SPELL_DIRECTORY}/0001-fix-path-to-include-file.patch
+if [[ $MEERKARTOR_QT == qt5 ]];then
+# qt5.5 fix
+ sed -i 's/FALSE/false/;/#include <QFileDialog>/a \
+#include <QDrag>
+' src/Docks/GeoImageDock.cpp
+else
+ patch -p1 < ${SPELL_DIRECTORY}/0001-fix-path-to-include-file.patch
+fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d9028341acc5a5e62b289458be561a9d4eb362e6), Treeve Jelbert, 10/27/2015

Archive powered by MHonArc 2.6.24.

Top of Page