Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gis grimoire by Jaka Kranjc (20fe90803ba3d0388e298386c8fd1d0be0255042)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gis grimoire by Jaka Kranjc (20fe90803ba3d0388e298386c8fd1d0be0255042)
  • Date: Fri, 7 Oct 2011 16:39:42 -0500

GIT changes to devel-gis grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

science/grass/HISTORY | 1 +
science/grass/INSTALL | 6 ++++++
science/grass/PRE_SUB_DEPENDS | 4 ++++
science/grass/SUB_DEPENDS | 5 +++++
science/qgis/DEPENDS | 14 ++++++++------
science/qgis/DETAILS | 16 ++++++----------
science/qgis/HISTORY | 4 ++++
7 files changed, 34 insertions(+), 16 deletions(-)

New commits:
commit 20fe90803ba3d0388e298386c8fd1d0be0255042
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

qgis: 1.7.1

commit 87c533847fe7feb53a534719efb3dc9d28289271
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

grass: added sqlite subdep support

commit 8fd9b054076b883becf550311b0f54c2d69fc2c0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

grass: forgot to add a file

diff --git a/science/grass/HISTORY b/science/grass/HISTORY
index 8739cf1..5376df0 100644
--- a/science/grass/HISTORY
+++ b/science/grass/HISTORY
@@ -2,6 +2,7 @@
* DETAILS: 6.4.1
* DEPENDS: fixed various dependencies
* INSTALL: added
+ * {PRE_,}SUB_DEPENDS: added

2009-11-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS, DETAILS: spell created
diff --git a/science/grass/INSTALL b/science/grass/INSTALL
new file mode 100755
index 0000000..6c27679
--- /dev/null
+++ b/science/grass/INSTALL
@@ -0,0 +1,6 @@
+local ir=$INSTALL_ROOT/usr &&
+# stupid pos; it would need much more work to be happy in fhs
+#make INST_DIR="$ir"/share/grass BINDIR="$ir"/bin PREFIX="$ir" install
+#make INST_DIR="$ir" install
+make install &&
+( cd "$ir"/lib/ && ln -sfv "$ir"/grass-*/lib/*.so . )
diff --git a/science/grass/PRE_SUB_DEPENDS b/science/grass/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..5f8339c
--- /dev/null
+++ b/science/grass/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+SQLITE) is_depends_enabled $SPELL sqlite && return 0;;
+esac
+return 1
diff --git a/science/grass/SUB_DEPENDS b/science/grass/SUB_DEPENDS
new file mode 100755
index 0000000..9de0f15
--- /dev/null
+++ b/science/grass/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+SQLITE) echo "sqlite support requested, forcing it." &&
+ depends sqlite '--enable-cxx' ;;
+ *) echo "unknown sub-depends!"; return 1;;
+esac
diff --git a/science/qgis/DEPENDS b/science/qgis/DEPENDS
index e28c075..0e44b25 100755
--- a/science/qgis/DEPENDS
+++ b/science/qgis/DEPENDS
@@ -3,6 +3,7 @@ depends flex &&
depends proj4 &&
depends geos &&
depends gdal &&
+depends qwt5 && # will work with qwt6 too
depends sqlite "-DWITH_INTERNAL_SQLITE3=FALSE" &&
depends bison &&
depends cmake &&
@@ -14,6 +15,10 @@ optional_depends expat \
"" \
"" \
"GPS importer plugin" &&
+optional_depends gsl \
+ "" \
+ "" \
+ "for georeferencer" &&
optional_depends -sub SQLITE grass \
"-DWITH_GRASS=TRUE" \
"-DWITH_GRASS=FALSE" \
@@ -21,13 +26,10 @@ optional_depends -sub SQLITE grass \
optional_depends python \
"-DWITH_BINDINGS=TRUE" \
"-DWITH_BINDINGS=FALSE" \
- "Python bindings support and PyQGIS(extra query)" &&
+ "Python plugins support and PyQGIS(extra query)" &&
if is_depends_enabled python ; then
-optional_depends pyqt4 \
+ optional_depends pyqt4 \
"" \
"" \
- "PyQGIS support" &&
-if is_depends_enabled pyqt4 ; then
-depends sip
-fi
+ "PyQGIS support"
fi
diff --git a/science/qgis/DETAILS b/science/qgis/DETAILS
index ef9a2cd..b483ba0 100755
--- a/science/qgis/DETAILS
+++ b/science/qgis/DETAILS
@@ -1,18 +1,14 @@
SPELL=qgis
- VERSION=1.0.2
- SOURCE="${SPELL}_${VERSION}.tar.gz"
- SOURCE_URL[0]=http://download.osgeo.org/${SPELL}/src/${SOURCE}
-
SOURCE_HASH=sha512:f70372a5001091887d63d5659b497aec9f2d7775f8557f0b19f9fdc6e05757307698246870ff5c4867ebce974ccaf75ab2247394603bbbfb7226684d520175cf
+ VERSION=1.7.1
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://qgis.org/downloads/$SOURCE
+ SOURCE_URL[1]=http://download.osgeo.org/${SPELL}/src/${SOURCE}
+
SOURCE_HASH=sha512:1e37cd3ce00aff7aca2795dbb39d3e9585df79703c4688dcb442dfeb8d8a3f71d7cf5a2556d749657c12789976c2fbb9eba426d92ece20ab8a565fea22bea0fe
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://qgis.org";
LICENSE[0]="GPL"
ENTERED=20091102
- KEYWORDS="Scientific/Engineering, Visualization, Geographical
-Development, Major bugfixes
-Development
-Development, Major bugfixes
-Development, Major feature enhancements
-Development, Major feature enhancements"
+ KEYWORDS="gis"
SHORT="A desktop geographic information system application."
cat << EOF
Quantum GIS (QGIS) is a cross-platform Geographic Information System
diff --git a/science/qgis/HISTORY b/science/qgis/HISTORY
index be0caf5..9bca992 100644
--- a/science/qgis/HISTORY
+++ b/science/qgis/HISTORY
@@ -1,3 +1,7 @@
+2011-10-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: 1.7.1
+ * DEPENDS: more, removed redundant sip
+
2009-11-02 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DEPENDS, DETAILS: spell created




  • [SM-Commit] GIT changes to devel-gis grimoire by Jaka Kranjc (20fe90803ba3d0388e298386c8fd1d0be0255042), Jaka Kranjc, 10/07/2011

Archive powered by MHonArc 2.6.24.

Top of Page