sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d61791ed2e4fdc1e83682fa26e5b34916b7e6221)
- 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 (d61791ed2e4fdc1e83682fa26e5b34916b7e6221)
- Date: Mon, 17 Feb 2020 13:11:59 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
qt5-qmake/merkaartor/DEPENDS | 8 +++
qt5-qmake/merkaartor/DETAILS | 15 ++++++
qt5-qmake/merkaartor/HISTORY | 93
+++++++++++++++++++++++++++++++++++++++++++
x11/merkaartor/BUILD | 5 --
x11/merkaartor/CONFIGURE | 1
x11/merkaartor/DEPENDS | 14 ------
x11/merkaartor/DETAILS | 15 ------
x11/merkaartor/HISTORY | 88 ----------------------------------------
x11/merkaartor/PRE_BUILD | 8 ---
9 files changed, 116 insertions(+), 131 deletions(-)
New commits:
commit d61791ed2e4fdc1e83682fa26e5b34916b7e6221
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
merkaartor :=> 0.18.4
diff --git a/qt5-qmake/merkaartor/DEPENDS b/qt5-qmake/merkaartor/DEPENDS
new file mode 100755
index 0000000..be9c66d
--- /dev/null
+++ b/qt5-qmake/merkaartor/DEPENDS
@@ -0,0 +1,8 @@
+source $GRIMOIRE/QT5_DEPENDS &&
+depends boost &&
+depends gdal &&
+depends proj &&
+depends desktop-file-utils &&
+optional_depends exiv2 "GEOIMAGE=1" "" "for geotagged image support" &&
+optional_depends gpsd "GPSDLIB=1" "" "for GPS support" &&
+optional_depends libproxy "USE_LIBPROXY=1" "" "for automatic proxy
configuration"
diff --git a/qt5-qmake/merkaartor/DETAILS b/qt5-qmake/merkaartor/DETAILS
new file mode 100755
index 0000000..9443875
--- /dev/null
+++ b/qt5-qmake/merkaartor/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=merkaartor
+ VERSION=0.18.4
+
SOURCE_HASH=sha512:16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=https://github.com/openstreetmap/merkaartor/archive/${VERSION}.tar.gz
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="https://www.merkaartor.be";
+ LICENSE[0]=GPL
+ ENTERED=20090613
+ SHORT="Merkaartor is an openstreetmap mapping program"
+cat << EOF
+Merkaartor is an openstreetmap mapping program. Merkaartor focuses on
+providing a visually pleasing but performant editing environment for free
+geographical data.
+EOF
diff --git a/qt5-qmake/merkaartor/HISTORY b/qt5-qmake/merkaartor/HISTORY
new file mode 100644
index 0000000..707abd1
--- /dev/null
+++ b/qt5-qmake/merkaartor/HISTORY
@@ -0,0 +1,93 @@
+2020-02-17 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.18.4
+ * PRE_BUILD BUILD CONFIGURE: deleted
+ * DEPENDS: qt5 only
+
+2018-03-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: WEBKIT_QT => qtwebkit
+
+2017-01-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.18.3
+ * PRE_BUILD, 0001-fix-path-to-include-file.patch: Patch removed, no
+ longer needed
+
+2017-01-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: qtwebkit => WEBKIT_QT
+
+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,
+ 0003-FIX-secondary-road-simple-color.patch,
+ 0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch,
+ 0005-FIX-openSUSE-build.patch,
+ 0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch,
+ 0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch,
+ 0008-FIX-GDAL-crash.patch: removed
+ * 0001-fix-path-to-include-file.patch, PRE_BUILD: fix compile error
+ due to wrong paths to includes
+
+2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depends -sub CXX gcc (half-automated)
+
+2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0002-FIX-Assert-width-0-with-wireframe-with-style.patch,
+ 0003-FIX-secondary-road-simple-color.patch,
+ 0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch,
+ 0005-FIX-openSUSE-build.patch,
+ 0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch,
+ 0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch,
+ 0008-FIX-GDAL-crash.patch: add several bug fixes from upstream
+
+2013-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: added dependencies on boost, gdal, proj,
desktop-file-utils,
+ added sub-dependency on WEBKIT for qt4, added optional dependencies
+ on exiv2, gpsd, libproxy
+
+2013-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.18.1
+
+2011-02-11 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.17.2
+
+2011-02-08 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.17.1
+
+2010-12-26 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.17.0
+
+2010-08-26 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.16.3
+
+2010-08-15 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.16.2 (SOURCE_URL changes with new
version)
+
+2010-08-02 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: fixed WEB_SITE & SOURCE_URL (ugly but only working atm)
+
+2010-06-13 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.16.1
+
+2010-06-07 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.16.0
+
+2010-03-01 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.15.1
+
+2010-02-28 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: updated spell to 0.15
+
+2009-08-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: updated hash, due to upstream tarball change
+ fixes bug #15354
+
+2009-08-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.14
+
+2009-06-19 Bor Kraljic <pyrobor AT ver.si>
+ * BUILD, DEPENDS, DETAILS: spell created, www.openstreetmap.org
mapping program
diff --git a/x11/merkaartor/BUILD b/x11/merkaartor/BUILD
deleted file mode 100755
index ac6c30b..0000000
--- a/x11/merkaartor/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-if [[ $MEERKARTOR_QT == qt5 ]];then
- qt5_build
-else
- qt4_build
-fi
diff --git a/x11/merkaartor/CONFIGURE b/x11/merkaartor/CONFIGURE
deleted file mode 100755
index 488126f..0000000
--- a/x11/merkaartor/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list MEERKARTOR_QT 'which Qt version' qt5 qt4
diff --git a/x11/merkaartor/DEPENDS b/x11/merkaartor/DEPENDS
deleted file mode 100755
index d7c7910..0000000
--- a/x11/merkaartor/DEPENDS
+++ /dev/null
@@ -1,14 +0,0 @@
-depends -sub CXX gcc &&
-if [[ $MEERKARTOR_QT == qt5 ]];then
- depends qtwebkit &&
- depends qtbase
-else
- depends -sub WEBKIT qt4
-fi &&
-depends boost &&
-depends gdal &&
-depends proj &&
-depends desktop-file-utils &&
-optional_depends exiv2 "GEOIMAGE=1" "" "for geotagged image support" &&
-optional_depends gpsd "GPSDLIB=1" "" "for GPS support" &&
-optional_depends libproxy "USE_LIBPROXY=1" "" "for automatic proxy
configuration"
diff --git a/x11/merkaartor/DETAILS b/x11/merkaartor/DETAILS
deleted file mode 100755
index e8a3ffa..0000000
--- a/x11/merkaartor/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=merkaartor
- VERSION=0.18.3
-
SOURCE_HASH=sha512:b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]=https://github.com/openstreetmap/merkaartor/archive/${VERSION}.tar.gz
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://www.merkaartor.be";
- LICENSE[0]=GPL
- ENTERED=20090613
- SHORT="Merkaartor is an openstreetmap mapping program"
-cat << EOF
-Merkaartor is an openstreetmap mapping program. Merkaartor focuses on
-providing a visually pleasing but performant editing environment for free
-geographical data.
-EOF
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
deleted file mode 100644
index 548b401..0000000
--- a/x11/merkaartor/HISTORY
+++ /dev/null
@@ -1,88 +0,0 @@
-2018-03-23 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: WEBKIT_QT => qtwebkit
-
-2017-01-15 Ismael Luceno <ismael AT sourcemage.org>
- * DETAILS: updated spell to 0.18.3
- * PRE_BUILD, 0001-fix-path-to-include-file.patch: Patch removed, no
- longer needed
-
-2017-01-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS: qtwebkit => WEBKIT_QT
-
-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,
- 0003-FIX-secondary-road-simple-color.patch,
- 0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch,
- 0005-FIX-openSUSE-build.patch,
- 0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch,
- 0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch,
- 0008-FIX-GDAL-crash.patch: removed
- * 0001-fix-path-to-include-file.patch, PRE_BUILD: fix compile error
- due to wrong paths to includes
-
-2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
- * DEPENDS: depends -sub CXX gcc (half-automated)
-
-2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * PRE_BUILD, 0002-FIX-Assert-width-0-with-wireframe-with-style.patch,
- 0003-FIX-secondary-road-simple-color.patch,
- 0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch,
- 0005-FIX-openSUSE-build.patch,
- 0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch,
- 0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch,
- 0008-FIX-GDAL-crash.patch: add several bug fixes from upstream
-
-2013-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: added dependencies on boost, gdal, proj,
desktop-file-utils,
- added sub-dependency on WEBKIT for qt4, added optional dependencies
- on exiv2, gpsd, libproxy
-
-2013-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: version 0.18.1
-
-2011-02-11 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.17.2
-
-2011-02-08 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.17.1
-
-2010-12-26 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.17.0
-
-2010-08-26 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.16.3
-
-2010-08-15 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.16.2 (SOURCE_URL changes with new
version)
-
-2010-08-02 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: fixed WEB_SITE & SOURCE_URL (ugly but only working atm)
-
-2010-06-13 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.16.1
-
-2010-06-07 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.16.0
-
-2010-03-01 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.15.1
-
-2010-02-28 Bor Kraljič <pyrobor AT ver.si>
- * DETAILS: updated spell to 0.15
-
-2009-08-18 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: updated hash, due to upstream tarball change
- fixes bug #15354
-
-2009-08-13 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0.14
-
-2009-06-19 Bor Kraljic <pyrobor AT ver.si>
- * BUILD, DEPENDS, DETAILS: spell created, www.openstreetmap.org
mapping program
diff --git a/x11/merkaartor/PRE_BUILD b/x11/merkaartor/PRE_BUILD
deleted file mode 100755
index eabb435..0000000
--- a/x11/merkaartor/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-if [[ $MEERKARTOR_QT == qt5 ]];then
-# qt5.5 fix
- sed -i 's/FALSE/false/;/#include <QFileDialog>/a \
-#include <QDrag>
-' src/Docks/GeoImageDock.cpp
-fi
- [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (d61791ed2e4fdc1e83682fa26e5b34916b7e6221), Treeve Jelbert, 02/17/2020
Archive powered by MHonArc 2.6.24.