Skip to Content.
Sympa Menu

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

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 (41cc4be309fdbbd4eed91d329e6537f5ca3149e2)
  • Date: Sat, 6 Oct 2012 15:13:51 -0500

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

ChangeLog | 8 ++
libs/freexl/DETAILS | 24 ++++++++
libs/freexl/HISTORY | 3 +
libs/libspatialindex/DEPENDS | 1
libs/libspatialindex/DETAILS | 25 ++++++++
libs/libspatialindex/HISTORY | 3 +
libs/libspatialite/DEPENDS | 4 +
libs/libspatialite/DETAILS | 17 +++++
libs/libspatialite/HISTORY | 3 +
libs/pyqt4/DETAILS | 6 +-
libs/pyqt4/HISTORY | 3 +
libs/sip/DETAILS | 7 +-
libs/sip/HISTORY | 3 +
science/grass/DETAILS | 4 -
science/grass/HISTORY | 4 +
science/grass/PRE_BUILD | 4 +
science/grass/iostream_cpp470 | 116
++++++++++++++++++++++++++++++++++++++++
science/qgis/DEPENDS | 10 ++-
science/qgis/DETAILS | 4 -
science/qgis/HISTORY | 5 +
science/splitter/BUILD | 3 +
science/splitter/DEPENDS | 2
science/splitter/DETAILS | 19 ++++++
science/splitter/HISTORY | 3 +
science/splitter/INSTALL | 3 +
science/splitter/splitter | 3 +
x11-toolkits/qscintilla/BUILD | 2
x11-toolkits/qscintilla/DETAILS | 6 +-
x11-toolkits/qscintilla/HISTORY | 4 +
29 files changed, 280 insertions(+), 19 deletions(-)

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

science/qgis: version 1.8.0

commit d76530f6dd76a014133f5590d2683766dce4ad26
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libspatialite: new spell, spatial SQL support for sqlite

commit 26b75bcfe65e8b7f795f576a443cf58ec6f17d9c
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/freexl: new spell, a library for reading excel files

commit 583fcda6ea566a77f67baacd7b5ab21e4d62b71e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libspatialindex: new spell, a framework for spatial indexing

commit 5ee994e1d422e7bfef437271bf47e0de31faf5d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/pyqt4: version 4.9.5

commit 045c663ead8abffc0a33807ddf1b2ea6e6d015be
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/sip: version 4.14

commit 8b8fbfc565cbcbc12ea57ad7d9c2405349230e1f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/qscintilla: version 2.6.2

commit 2162798ec29784c11f1c48ef5f62c1f3825f3701
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/grass: version 6.4.2

commit 1b8138e2027960a68e957071a1b0e666fe6f18fd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/splitter: new spell, a splitter for openstreetmap data

diff --git a/ChangeLog b/ChangeLog
index 4f5f81e..2c51387 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/libspatialindex: new spell, a spatial indexing framework
+ * libs/freexl: new spell, a library for reading excel files
+ * libs/libspatialite: new spell, spatial SQL support for sqlite
+
2012-10-05 Ladislav Hagara <hgr AT vabo.cz>
* video-libs/gstreamer-1.0, gst-plugins-base-1.0,
gst-plugins-good-1.0,
gst-plugins-bad-1.0, gst-plugins-ugly-1.0, gst-libav-1.0: new
spells,
@@ -13,6 +18,9 @@
* perl-cpan/text-asciipipe: new spell, perl module for shifting text
files through pipes

+2012-09-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * science/splitter: new spell, a splitter for openstreetmap data
+
2012-09-26 Eric Sandall <sandalle AT sourcemage.org>
* graphics/advancecomp: Added a collection of recompression utilities

diff --git a/libs/freexl/DETAILS b/libs/freexl/DETAILS
new file mode 100755
index 0000000..64de9d3
--- /dev/null
+++ b/libs/freexl/DETAILS
@@ -0,0 +1,24 @@
+ SPELL=freexl
+ VERSION=1.0.0d
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.gaia-gis.it/gaia-sins/${SOURCE}
+
SOURCE_HASH=sha512:22d76592ff6f575ccb7dde1c36e535f7439f9f99a2fbf433a6f0f9dcc8105f637c47f0415e0cf2dc4c30f6b9ce5c2f82a58defd1256472771fdddbb47ea0030a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://www.gaia-gis.it/fossil/freexl/index";
+ LICENSE[0]=MOZILLA
+ ENTERED=20121006
+ SHORT="an open source library to extract valid data from within
an Excel (.xls) spreadsheet"
+cat << EOF
+FreeXL is an open source library to extract valid data from within an Excel
+(.xls) spreadsheet.
+
+FreeXL design goals:
+
+* to be simple and lightweight * to be stable, robust and efficient * to be
+easily and universally portable * completely ignoring any GUI-related oddity
+
+Note that the final goal means that FreeXL ignores at all fonts, sizes and
+alignments, and most formats. It ignores Pivot Table, Charts, Formulas,
Visual
+Basic macros and so on. FreeXL is structurally simple and quite light-weight
+(typically 40-80K of object code, stripped).
+EOF
diff --git a/libs/freexl/HISTORY b/libs/freexl/HISTORY
new file mode 100644
index 0000000..9122d59
--- /dev/null
+++ b/libs/freexl/HISTORY
@@ -0,0 +1,3 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: spell created
+
diff --git a/libs/libspatialindex/DEPENDS b/libs/libspatialindex/DEPENDS
new file mode 100755
index 0000000..f148724
--- /dev/null
+++ b/libs/libspatialindex/DEPENDS
@@ -0,0 +1 @@
+depends -sub CXX gcc
diff --git a/libs/libspatialindex/DETAILS b/libs/libspatialindex/DETAILS
new file mode 100755
index 0000000..bbc9a86
--- /dev/null
+++ b/libs/libspatialindex/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=libspatialindex
+ VERSION=1.7.1
+ SOURCE="spatialindex-src-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://download.osgeo.org/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:18bdeabae3c2698a1a88cd3e526f730e4fd0535c2ffb7af0e5f8dd514427fefc664e3e1977f6e1455ed2d35475868afece5d6730fb6f98acc3822baa3984af6a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/spatialindex-src-${VERSION}"
+ WEB_SITE="http://libspatialindex.github.com/";
+ LICENSE[0]=GPL
+ ENTERED=20121006
+ SHORT="a framework for spatial indexing"
+cat << EOF
+The purpose of this library is to provide:
+
+1. An extensible framework that will support robust spatial indexing methods.
+2. Support for sophisticated spatial queries. Range, point location, nearest
+ neighbor and k-nearest neighbor as well as parametric queries (defined
+ by spatial constraints) should be easy to deploy and run.
+3. Easy to use interfaces for inserting, deleting and updating information.
+4. Wide variety of customization capabilities. Basic index and storage
+ characteristics like the page size, node capacity, minimum fan-out,
+ splitting algorithm, etc. should be easy to customize.
+5. Index persistence. Internal memory and external memory structures should
be
+ supported. Clustered and non-clustered indices should be easy to be
+ persisted.
+EOF
diff --git a/libs/libspatialindex/HISTORY b/libs/libspatialindex/HISTORY
new file mode 100644
index 0000000..df32ae3
--- /dev/null
+++ b/libs/libspatialindex/HISTORY
@@ -0,0 +1,3 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: spell created
+
diff --git a/libs/libspatialite/DEPENDS b/libs/libspatialite/DEPENDS
new file mode 100755
index 0000000..77f73e9
--- /dev/null
+++ b/libs/libspatialite/DEPENDS
@@ -0,0 +1,4 @@
+depends sqlite &&
+depends geos &&
+depends proj &&
+optional_depends freexl "--enable-freexl" "--disable-freexl" "support for
reading xls files"
diff --git a/libs/libspatialite/DETAILS b/libs/libspatialite/DETAILS
new file mode 100755
index 0000000..70262c8
--- /dev/null
+++ b/libs/libspatialite/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=libspatialite
+ VERSION=3.0.1
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.gaia-gis.it/gaia-sins/${SOURCE}
+
SOURCE_HASH=sha512:604e5fcb3ac17eb3c69aff5dbf8c77660aecbddc81ab1faa63b0ce069253e3d1c5b6001bd2f2fde5d2f60de9c3758d0d871b9cbcaf1a6d18ceebc0788c166d94
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://www.gaia-gis.it/fossil/libspatialite/index";
+ LICENSE[0]=MOZILLA
+ ENTERED=20121006
+ SHORT="an open source library intended to extend the SQLite core
to support fully fledged Spatial SQL capabilities"
+cat << EOF
+SpatiaLite is smoothly integrated into SQLite to provide a complete and
+powerful Spatial DBMS (mostly OGC-SFS compliant).
+
+Using SQLite + SpatiaLite you can effectively deploy an alternative open
+source Spatial DBMS roughly equivalent to PostgreSQL + PostGIS.
+EOF
diff --git a/libs/libspatialite/HISTORY b/libs/libspatialite/HISTORY
new file mode 100644
index 0000000..5cd4628
--- /dev/null
+++ b/libs/libspatialite/HISTORY
@@ -0,0 +1,3 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/libs/pyqt4/DETAILS b/libs/pyqt4/DETAILS
index 49a89d9..c9e873b 100755
--- a/libs/pyqt4/DETAILS
+++ b/libs/pyqt4/DETAILS
@@ -1,11 +1,11 @@
SPELL=pyqt4
SPELLX=PyQt-x11-gpl
- VERSION=4.9.4
-
SOURCE_HASH=sha512:719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3
+ VERSION=4.9.5
+
SOURCE_HASH=sha512:27891944f35c66476b045cc5398e32d8566bc25d95e893a17f518f85f3a8b0ccbf1b56e148d086f5563259c76cf89e63057f9c77e16876343643235a930b0856
URI=PyQt4
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
-
SOURCE_URL[0]=http://www.riverbankcomputing.co.uk/static/Downloads/$URI/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/pyqt/PyQt4/PyQt-${VERSION}/${SOURCE}
WEB_SITE=http://www.riverbankcomputing.co.uk/software/pyqt/
ENTERED=20070614
LICENSE[0]=GPL
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 7812e2c..b0df8fa 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.9.5
+
2012-07-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.9.4

diff --git a/libs/sip/DETAILS b/libs/sip/DETAILS
index 090399f..e2979b5 100755
--- a/libs/sip/DETAILS
+++ b/libs/sip/DETAILS
@@ -1,11 +1,10 @@
SPELL=sip
- VERSION=4.13.3
-
SOURCE_HASH=sha512:2e27bfbb79285e420c8989f620dca52b7bf5f0c70377c4e50def20f3440bae60c5a4cd12d03ec40f1270ddcce4f2137b3b1accd6f6646292855c8b344afd9059
+ VERSION=4.14
+
SOURCE_HASH=sha512:ac6d98f2e4f7094e5065a32e107dc7ffce28fac5fa805407c1b670192a9438235a5235dee52833fb9667e1e0a12c29b571d1fa8f315a96fa2728a8b08d08c405
URI=sip4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-
SOURCE_URL[0]=http://www.riverbankcomputing.co.uk/static/Downloads/$URI/$SOURCE
-
SOURCE_URL[1]=http://ring.u-toyama.ac.jp/archives/NetBSD/packages/distfiles/$SOURCE
+ SOURCE_URL[0]=${SOURCEFORGE_URL}/pyqt/$SPELL/$SPELL-$VERSION/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://www.riverbankcomputing.co.uk/software/$SPELL
ENTERED=20020721
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index e5ffeac..ae7fee4 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.14
+
2012-07-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.13.3

diff --git a/science/grass/DETAILS b/science/grass/DETAILS
index ea68130..74f25ca 100755
--- a/science/grass/DETAILS
+++ b/science/grass/DETAILS
@@ -1,8 +1,8 @@
SPELL=grass
- VERSION=6.4.1
+ VERSION=6.4.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.osgeo.org/${SPELL}64/source/${SOURCE}
-
SOURCE_HASH=sha512:97a2a81dd5699307ea09745da3be44be7269cdc36b42dfafb29b7fd9dec9c1d31e648f713efc9c66cdcdcd98a85276bc06a7eaeec21c8ae3c155ec867d0159bf
+
SOURCE_HASH=sha512:537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://grass.osgeo.org";
LICENSE[0]="GPL"
diff --git a/science/grass/HISTORY b/science/grass/HISTORY
index 5376df0..6bedb8f 100644
--- a/science/grass/HISTORY
+++ b/science/grass/HISTORY
@@ -1,3 +1,7 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.4.1
+ * PRE_BUILD, iostream_cpp470: add patch from ubuntu to fix compile
error
+
2011-10-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: 6.4.1
* DEPENDS: fixed various dependencies
diff --git a/science/grass/PRE_BUILD b/science/grass/PRE_BUILD
new file mode 100755
index 0000000..d4f429e
--- /dev/null
+++ b/science/grass/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p1 < $SPELL_DIRECTORY/iostream_cpp470
diff --git a/science/grass/iostream_cpp470 b/science/grass/iostream_cpp470
new file mode 100644
index 0000000..35b1b12
--- /dev/null
+++ b/science/grass/iostream_cpp470
@@ -0,0 +1,116 @@
+Index: grass/lib/iostream/mm.cc
+===================================================================
+--- grass.orig/lib/iostream/mm.cc (revision 48704)
++++ grass/lib/iostream/mm.cc (revision 51638)
+@@ -254,11 +254,11 @@
+ }
+
+
+
+ /* ************************************************************ */
+-void* operator new[] (size_t sz) {
++void* operator new[] (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout << "new: sz=" << sz << ", register "
+ << sz+SIZE_SPACE << "B ,";
+
+@@ -305,11 +305,11 @@
+ }
+
+
+
+ /* ************************************************************ */
+-void* operator new (size_t sz) {
++void* operator new (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout << "new: sz=" << sz << ", register "
+ << sz+SIZE_SPACE << "B ,";
+
+@@ -357,11 +357,11 @@
+
+
+
+
+ /* ---------------------------------------------------------------------- */
+-void operator delete (void *ptr) {
++void operator delete (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout << "delete: ptr=" << ptr << ",";
+
+@@ -397,11 +397,11 @@
+
+
+
+
+ /* ---------------------------------------------------------------------- */
+-void operator delete[] (void *ptr) {
++void operator delete[] (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout << "delete[]: ptr=" << ptr << ",";
+
+Index: grass/include/iostream/mm.h
+===================================================================
+--- grass.orig/include/iostream/mm.h (revision 32629)
++++ grass/include/iostream/mm.h (revision 51638)
+@@ -108,14 +108,14 @@
+ int space_overhead ();
+
+ void print();
+
+ friend class mm_register_init;
+- friend void * operator new(size_t);
+- friend void * operator new[](size_t);
+- friend void operator delete(void *);
+- friend void operator delete[](void *);
++ friend void * operator new(size_t) throw(std::bad_alloc);
++ friend void * operator new[](size_t) throw(std::bad_alloc);
++ friend void operator delete(void *) throw();
++ friend void operator delete[](void *) throw();
+ };
+
+
+
+
+Index: grass/include/iostream/minmaxheap.h
+===================================================================
+--- grass.orig/include/iostream/minmaxheap.h (revision 41531)
++++ grass/include/iostream/minmaxheap.h (revision 51638)
+@@ -742,11 +742,11 @@
+ HeapIndex MinMaxHeap<T>::fill(T* arr, HeapIndex n) {
+ HeapIndex i;
+ //heap must be empty
+ assert(this->size()==0);
+ for (i = 0; !full() && i<n; i++) {
+- insert(arr[i]);
++ this->insert(arr[i]);
+ }
+ if (i < n) {
+ assert(i == this->maxsize);
+ return n - i;
+ } else {
+@@ -775,17 +775,17 @@
+
+ assert(this->maxsize > 0);
+
+ if(old) {
+ HeapIndex n = this->size();
+- this->A = allocateHeap(this->maxsize); /* allocate a new array */
++ this->A = this->allocateHeap(this->maxsize); /* allocate a new array
*/
+ /* copy over the old values */
+ assert(this->maxsize > n);
+ for(HeapIndex i=0; i<=n; i++) { /* why extra value? -RW */
+ this->A[i] = old[i];
+ }
+- freeHeap(old); /* free up old storage */
++ this->freeHeap(old); /* free up old storage */
+ }
+
+ }
+
+
diff --git a/science/qgis/DEPENDS b/science/qgis/DEPENDS
index e644801..ed6249a 100755
--- a/science/qgis/DEPENDS
+++ b/science/qgis/DEPENDS
@@ -7,6 +7,8 @@ depends qwt5 && # will work with qwt6 too
depends sqlite "-DWITH_INTERNAL_SQLITE3=FALSE" &&
depends bison &&
depends cmake &&
+depends libspatialindex &&
+depends libspatialite &&
optional_depends postgresql \
"-DWITH_POSTGRESQL=TRUE" \
"-DWITH_POSTGRESQL=FALSE" \
@@ -15,6 +17,9 @@ optional_depends expat \
"" \
"" \
"GPS importer plugin" &&
+if is_depends_enabled expat; then
+ depends gpsbabel
+fi &&
optional_depends gsl \
"" \
"" \
@@ -28,8 +33,5 @@ optional_depends python \
"-DWITH_BINDINGS=FALSE" \
"Python plugins support and PyQGIS(extra query)" &&
if is_depends_enabled python ; then
- optional_depends pyqt4 \
- "" \
- "" \
- "PyQGIS support"
+ depends pyqt4
fi
diff --git a/science/qgis/DETAILS b/science/qgis/DETAILS
index b483ba0..c350c13 100755
--- a/science/qgis/DETAILS
+++ b/science/qgis/DETAILS
@@ -1,9 +1,9 @@
SPELL=qgis
- VERSION=1.7.1
+ VERSION=1.8.0
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_HASH=sha512:475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://qgis.org";
LICENSE[0]="GPL"
diff --git a/science/qgis/HISTORY b/science/qgis/HISTORY
index 9bca992..5a5dd6b 100644
--- a/science/qgis/HISTORY
+++ b/science/qgis/HISTORY
@@ -1,3 +1,8 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.0
+ * DEPENDS: added dependencies on libspatialite, libspatialindex,
gpsbabel,
+ made dependency on pyqt4 mandatory if python is enabled as
dependency
+
2011-10-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: 1.7.1
* DEPENDS: more, removed redundant sip
diff --git a/science/splitter/BUILD b/science/splitter/BUILD
new file mode 100755
index 0000000..c080dbd
--- /dev/null
+++ b/science/splitter/BUILD
@@ -0,0 +1,3 @@
+. $INSTALL_ROOT/etc/profile.d/ant.sh &&
+. $INSTALL_ROOT/etc/profile.d/java.sh &&
+ant
diff --git a/science/splitter/DEPENDS b/science/splitter/DEPENDS
new file mode 100755
index 0000000..108a8e5
--- /dev/null
+++ b/science/splitter/DEPENDS
@@ -0,0 +1,2 @@
+depends JDK &&
+depends ant
diff --git a/science/splitter/DETAILS b/science/splitter/DETAILS
new file mode 100755
index 0000000..94bdeb5
--- /dev/null
+++ b/science/splitter/DETAILS
@@ -0,0 +1,19 @@
+ SPELL=splitter
+ VERSION=r200
+ SOURCE="${SPELL}-${VERSION}-src.tar.gz"
+ SOURCE_URL[0]=http://www.mkgmap.org.uk/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:4257d2eb7a1cced4a263e38f84111f3758df6d94120f785f53069f7704102945ddba07b7e7ec8d6eb00e873e8a1005f05a10b6f9334d1f7f8cd572e3d350fce5
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.mkgmap.org.uk/page/tile-splitter";
+ LICENSE[0]=GPL
+ ENTERED=20120929
+ SHORT="a splitter for openstreetmap data"
+cat << EOF
+The format used for Garmin maps has, in effect, a maximum size, meaning that
+you have to split an .osm file that contains large well mapped regions into
+a number of smaller tiles. This program does that. There are two stages of
+processing required. The first stage is to calculate what area each tile
+should cover, based on the distribution of nodes. The second stage writes
+out the nodes, ways and relations from the original .osm file into separate
+smaller .osm files, one for each area that was calculated in stage one.
+EOF
diff --git a/science/splitter/HISTORY b/science/splitter/HISTORY
new file mode 100644
index 0000000..3f8f7f8
--- /dev/null
+++ b/science/splitter/HISTORY
@@ -0,0 +1,3 @@
+2012-09-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, splitter: spell created
+
diff --git a/science/splitter/INSTALL b/science/splitter/INSTALL
new file mode 100755
index 0000000..c08e23b
--- /dev/null
+++ b/science/splitter/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/splitter
&&
+install -m644 ${SOURCE_DIRECTORY}/dist/splitter.jar
${INSTALL_ROOT}/usr/share/splitter/ &&
+install -m755 ${SCRIPT_DIRECTORY}/splitter ${INSTALL_ROOT}/usr/bin/
diff --git a/science/splitter/splitter b/science/splitter/splitter
new file mode 100644
index 0000000..e73316e
--- /dev/null
+++ b/science/splitter/splitter
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+java -jar /usr/share/splitter/splitter.jar "$@"
diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 285f3ab..92534bd 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -3,7 +3,7 @@ QTDIR=/usr &&
local QTSCINT &&
if is_depends_enabled $SPELL qt4 ; then
PATH=$QTDIR/bin/qt4:$PATH
- QTSCINT=Qt4
+ QTSCINT=Qt4Qt5
else
QTSCINT=Qt3
fi &&
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index efe1d56..448c7b9 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,10 +1,10 @@
SPELL=qscintilla
- VERSION=2.6
-
SOURCE_HASH=sha512:81eda15dfa36eedd874c3523795bf2861f840937f72c8df4d8ac67faf0a8e5f7e431d991f450cd0af2850e5bbffe1dc96afe43674b463e54596b20cc016bb652
+ VERSION=2.6.2
+
SOURCE_HASH=sha512:5d92c70182817f34141c4166a41807a3ef506c38cc2cd3c83d140eeca329e4aa6f1fa379bb9422da95d65a3385eefc27b0948b342af89c93eeca49f233a63a81
SOURCE=QScintilla-gpl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION

WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
-
SOURCE_URL[0]=http://www.riverbankcomputing.com/static/Downloads/QScintilla2/$SOURCE
+
SOURCE_URL[0]=$SOURCEFORGE_URL/pyqt/QScintilla2/QScintilla-${VERSION}/${SOURCE}
LICENSE[0]=GPL
ENTERED=20060206
KEYWORDS="qt editors x11 libs"
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index f8efb4c..fd97e26 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,7 @@
+2012-10-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.2
+ * BUILD: fixed QTSCINT variable
+
2011-12-11 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 2.6




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (41cc4be309fdbbd4eed91d329e6537f5ca3149e2), Florian Franzmann, 10/06/2012

Archive powered by MHonArc 2.6.24.

Top of Page