Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (fd31785aee26cc58b18c6d9b2bbe52eaf389d4ef)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (fd31785aee26cc58b18c6d9b2bbe52eaf389d4ef)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (fd31785aee26cc58b18c6d9b2bbe52eaf389d4ef)
  • Date: Mon, 16 Jan 2017 15:03:56 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

mobile/gpsd/BUILD | 3 -
mobile/gpsd/DEPENDS | 22 ++++++--
mobile/gpsd/DETAILS | 11 +---
mobile/gpsd/HISTORY | 5 +
mobile/gpsd/INSTALL | 1
x11/merkaartor/0001-fix-path-to-include-file.patch | 53
---------------------
x11/merkaartor/DETAILS | 4 -
x11/merkaartor/HISTORY | 5 +
x11/merkaartor/PRE_BUILD | 2
9 files changed, 35 insertions(+), 71 deletions(-)

New commits:
commit fd31785aee26cc58b18c6d9b2bbe52eaf389d4ef
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

merkaartor 0.18.3

commit b7020b4439ca80472827ca7bef0ecbe81dd7cd17
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

gpsd 3.16

diff --git a/mobile/gpsd/BUILD b/mobile/gpsd/BUILD
index cdcac94..1272c8d 100755
--- a/mobile/gpsd/BUILD
+++ b/mobile/gpsd/BUILD
@@ -1,2 +1 @@
-OPTS="$OPTS --disable-libQgpsmm" &&
-default_build
+scons -j$MAKE_NJOBS prefix="$INSTALL_ROOT"/usr $OPTS
diff --git a/mobile/gpsd/DEPENDS b/mobile/gpsd/DEPENDS
index cac4c02..e89978d 100755
--- a/mobile/gpsd/DEPENDS
+++ b/mobile/gpsd/DEPENDS
@@ -1,7 +1,17 @@
-optional_depends dbus \
- '--enable-dbus' '--disable-dbus' \
- "Enable dbus support" &&
+depends scons &&
+
+optional_depends ncurses \
+ ncurses={True,False} \
+ 'ncurses UI' &&
+
+optional_depends QT \
+ qt={True,False} \
+ 'QT UI' &&

-optional_depends xorg-server \
- '--with-x' '--without-x' \
- "Enable X11 support"
+optional_depends systemd \
+ systemd={True,False} \
+ 'systemd socket activation' &&
+
+optional_depends dbus \
+ dbus_export={True,False} \
+ "Enable dbus support"
diff --git a/mobile/gpsd/DETAILS b/mobile/gpsd/DETAILS
index 8c4d053..62d5205 100755
--- a/mobile/gpsd/DETAILS
+++ b/mobile/gpsd/DETAILS
@@ -1,11 +1,10 @@
SPELL=gpsd
- VERSION=2.95
-
SOURCE_HASH=sha512:f48dd0a2942e39de0b1d38a8979e123edbd39de05e2786419433826dfbf9de579fcb9b2c179385bc84313817a4266fd76560253b4e67e2daf419618699abbf98
- SOURCE=$SPELL-${VERSION}.tar.gz
+ VERSION=3.16
+
SOURCE_HASH=sha512:a8ad85a1f17d3ea550a4b99c262e47a834ed8fd16b00e10574f7cf5f34b6c506142aa77a870a61f8827c0d0c88fe7f65f6e916089d64e84c5667d4a2ca89c543
+ SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://download.berlios.de/gpsd/$SOURCE
-
- WEB_SITE=http://gpsd.berlios.de/
+
SOURCE_URL[0]=http://download-mirror.savannah.gnu.org/releases/$SPELL/$SOURCE
+ WEB_SITE=http://catb.org/gpsd/
ENTERED=20040217
LICENSE=GPL
KEYWORDS="mobile"
diff --git a/mobile/gpsd/HISTORY b/mobile/gpsd/HISTORY
index b26ddbc..86f6fb3 100644
--- a/mobile/gpsd/HISTORY
+++ b/mobile/gpsd/HISTORY
@@ -1,3 +1,8 @@
+2017-01-15 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0], WEB_SITE,
+ updated spell to 3.16
+ * BUILD, DEPENDS, INSTALL: 3.16 uses scons
+
2011-07-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: disabled qt bindings to fix build

diff --git a/mobile/gpsd/INSTALL b/mobile/gpsd/INSTALL
new file mode 100755
index 0000000..9f0c0eb
--- /dev/null
+++ b/mobile/gpsd/INSTALL
@@ -0,0 +1 @@
+scons install
diff --git a/x11/merkaartor/0001-fix-path-to-include-file.patch
b/x11/merkaartor/0001-fix-path-to-include-file.patch
deleted file mode 100644
index 2a12289..0000000
--- a/x11/merkaartor/0001-fix-path-to-include-file.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3c55ed3e490802d4d5e957c1e934435c3d84a425 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Sun, 19 Jul 2015 17:15:16 +0200
-Subject: [PATCH] fix path to include file
-
----
- src/Docks/GeoImageDock.cpp | 12 ++++++------
- src/Docks/GeoImageDock.h | 4 ++--
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
-index c05d09f..6afbfa8 100644
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -12,13 +12,13 @@
- #include <zbar/QZBarImage.h>
- #endif
-
--#include <QtWidgets/QInputDialog>
--#include <QtWidgets/QMessageBox>
--#include <QtWidgets/QProgressDialog>
-+#include <QtGui/QInputDialog>
-+#include <QtGui/QMessageBox>
-+#include <QtGui/QProgressDialog>
- #include <QtGui/QClipboard>
--#include <QtWidgets/QRadioButton>
--#include <QtWidgets/QTimeEdit>
--#include <QtWidgets/QDialogButtonBox>
-+#include <QtGui/QRadioButton>
-+#include <QtGui/QTimeEdit>
-+#include <QtGui/QDialogButtonBox>
- #include <QFileDialog>
-
- #include <QNetworkAccessManager>
-diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
-index ab7bbf6..a2606b0 100644
---- a/src/Docks/GeoImageDock.h
-+++ b/src/Docks/GeoImageDock.h
-@@ -4,9 +4,9 @@
- #include "Document.h"
-
- #include <QtGui/QPainter>
--#include <QtWidgets/QDockWidget>
-+#include <QtGui/QDockWidget>
- #include <QtGui/QMouseEvent>
--#include <QtWidgets/QShortcut>
-+#include <QtGui/QShortcut>
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
-
---
-2.4.1
-
diff --git a/x11/merkaartor/DETAILS b/x11/merkaartor/DETAILS
index 6b2149c..e8a3ffa 100755
--- a/x11/merkaartor/DETAILS
+++ b/x11/merkaartor/DETAILS
@@ -1,6 +1,6 @@
SPELL=merkaartor
- VERSION=0.18.2
-
SOURCE_HASH=sha512:577dd88e522eb3f9c21d3588358137dc9419a4d3961299a2162f7edb07e2b95a46d87022b57f0ea190bf9d76a2b1d2aada61c03e952e29c432e250e4686d594d
+ 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}"
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
index c89d502..6731933 100644
--- a/x11/merkaartor/HISTORY
+++ b/x11/merkaartor/HISTORY
@@ -1,3 +1,8 @@
+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

diff --git a/x11/merkaartor/PRE_BUILD b/x11/merkaartor/PRE_BUILD
index 3041118..eabb435 100755
--- a/x11/merkaartor/PRE_BUILD
+++ b/x11/merkaartor/PRE_BUILD
@@ -5,6 +5,4 @@ if [[ $MEERKARTOR_QT == qt5 ]];then
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 Ismael Luceno (fd31785aee26cc58b18c6d9b2bbe52eaf389d4ef), Ismael Luceno, 01/16/2017

Archive powered by MHonArc 2.6.24.

Top of Page