This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor.
commit 9dae0349db03180efc8ce9535b3bf8215c3b3fa3 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Sep 18 01:23:57 2015 +0200 Drop patches applied upstream. --- debian/changelog | 1 + debian/patches/0002-linker_fixes.patch | 26 ------------ debian/patches/arm_qreal_build_fix | 71 --------------------------------- debian/patches/gcc-4.7-ftbfs-fix | 57 -------------------------- debian/patches/libgps20_build-fix.patch | 65 ------------------------------ debian/patches/series | 4 -- 6 files changed, 1 insertion(+), 223 deletions(-) diff --git a/debian/changelog b/debian/changelog index 304d463..30022fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium - Update Homepage URL to www.merkaartor.be. * Switch to source format 3.0 (quilt). * Use minimal dh rules. + * Drop patches applied upstream. -- Bas Couwenberg <sebas...@debian.org> Fri, 18 Sep 2015 01:17:53 +0200 diff --git a/debian/patches/0002-linker_fixes.patch b/debian/patches/0002-linker_fixes.patch deleted file mode 100644 index 59abdc3..0000000 --- a/debian/patches/0002-linker_fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Bernd Zeimetz <b...@debian.org> -Date: Tue, 5 Jul 2011 22:16:57 +0200 -Subject: linker_fixes - ---- - src/src.pro | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - ---- a/src/src.pro -+++ b/src/src.pro -@@ -165,6 +165,15 @@ win32 { - } - } - -+ -+unix { -+ CONFIG += link_pkgconfig -+ PKGCONFIG += sqlite3 -+} -+win32 { -+ LIBS += -lsqlite3 -+} -+ - DEFINES += SHARE_DIR=$${SHARE_DIR} - INSTALLS += target - diff --git a/debian/patches/arm_qreal_build_fix b/debian/patches/arm_qreal_build_fix deleted file mode 100644 index 539dbfd..0000000 --- a/debian/patches/arm_qreal_build_fix +++ /dev/null @@ -1,71 +0,0 @@ -806029c2d1ac26e92c5d683360452e71986e9187 ---- a/src/Features/Node.cpp -+++ b/src/Features/Node.cpp -@@ -697,13 +697,13 @@ void PhotoNode::drawTouchup(QPainter& th - QRect box(me - QPoint(5, 3), QSize(10, 6)); - thePainter.drawRect(box); - if (theView->renderOptions().options.testFlag(RendererOptions::PhotosVisible) && theView->pixelPerM() > M_PREFS->getRegionalZoom()) { -- qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+ qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - QPoint phPt; - - if (photoLocationBR) { - phPt = me + QPoint(10*rt, 10*rt); - } else { -- qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+ qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - qreal phRt = 1. * Photo->width() / Photo->height(); - phPt = me - QPoint(10*rt, 10*rt) - QPoint(M_PREFS->getMaxGeoPicWidth()*rt, M_PREFS->getMaxGeoPicWidth()*rt/phRt); - } -@@ -723,7 +723,7 @@ void PhotoNode::drawHover(QPainter& theP - if (TEST_RFLAGS(RendererOptions::PhotosVisible) && theView->pixelPerM() > M_PREFS->getRegionalZoom()) { - QPoint me(theView->toView(this)); - -- qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+ qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - qreal phRt = 1. * Photo->width() / Photo->height(); - QPoint phPt; - if (photoLocationBR) { -@@ -742,7 +742,7 @@ qreal PhotoNode::pixelDistance(const QPo - QPoint me = theView->toView(const_cast<PhotoNode*>(this)); - #ifdef GEOIMAGE - if (TEST_RFLAGS(RendererOptions::PhotosVisible) && theView->pixelPerM() > M_PREFS->getRegionalZoom()) { -- qreal rt = qBound(0.2, theView->pixelPerM(), 1.0); -+ qreal rt = qBound(0.2, (double)theView->pixelPerM(), 1.0); - qreal phRt = 1. * Photo->width() / Photo->height(); - QPoint phPt; - if (photoLocationBR) { ---- a/src/common/Projection.cpp -+++ b/src/common/Projection.cpp -@@ -151,17 +151,17 @@ void Projection::projTransform(ProjProje - ProjProjection dstdefn, - long point_count, int point_offset, qreal *x, qreal *y, qreal *z ) - { -- pj_transform(srcdefn, dstdefn, point_count, point_offset, x, y, z); -+ pj_transform(srcdefn, dstdefn, point_count, point_offset, (double *)x, (double *)y, (double *)z); - } - - void Projection::projTransformFromWGS84(long point_count, int point_offset, qreal *x, qreal *y, qreal *z ) const - { -- pj_transform (theWGS84Proj, theProj, point_count, point_offset, x, y, z); -+ pj_transform (theWGS84Proj, theProj, point_count, point_offset, (double *)x, (double *)y, (double *)z); - } - - void Projection::projTransformToWGS84(long point_count, int point_offset, qreal *x, qreal *y, qreal *z ) const - { -- pj_transform(theProj, theWGS84Proj, point_count, point_offset, x, y, z); -+ pj_transform(theProj, theWGS84Proj, point_count, point_offset, (double *)x, (double *)y, (double *)z); - } - - QPointF Projection::projProject(const QPointF & Map) const ---- a/plugins/background/MSpatialiteBackground/PrimitiveFeature.h -+++ b/plugins/background/MSpatialiteBackground/PrimitiveFeature.h -@@ -41,7 +41,7 @@ public: - virtual IFeature* getParent(int) { return NULL; } - virtual const IFeature* getParent(int) const { return NULL; } - -- virtual bool hasPainter(double) const { return false; } -+ virtual bool hasPainter(qreal) const { return false; } - - /** Give the id of the feature. - * If the feature has no id, a random id is generated diff --git a/debian/patches/gcc-4.7-ftbfs-fix b/debian/patches/gcc-4.7-ftbfs-fix deleted file mode 100644 index 0c45c34..0000000 --- a/debian/patches/gcc-4.7-ftbfs-fix +++ /dev/null @@ -1,57 +0,0 @@ ---- a/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp -+++ b/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp -@@ -60,6 +60,9 @@ static PProcessIdToSessionId pProcessIdT - #include <time.h> - #endif - -+#include <unistd.h> -+#include <sys/types.h> -+ - namespace QtLP_Private { - #include "qtlockedfile.cpp" - #if defined(Q_OS_WIN) -@@ -69,6 +72,7 @@ namespace QtLP_Private { - #endif - } - -+ - const char* QtLocalPeer::ack = "ack"; - - QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId) -@@ -101,7 +105,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent - socketName += QLatin1Char('-') + QString::number(sessionId, 16); - } - #else -- socketName += QLatin1Char('-') + QString::number(::getuid(), 16); -+ socketName += QLatin1Char('-') + QString::number(getuid(), 16); - #endif - - server = new QLocalServer(this); ---- a/src/Features/Feature.h -+++ b/src/Features/Feature.h -@@ -1,6 +1,13 @@ - #ifndef MERKATOR_MAPFEATURE_H_ - #define MERKATOR_MAPFEATURE_H_ - -+class Feature; -+namespace boost -+{ -+ void intrusive_ptr_add_ref(Feature * p); -+ void intrusive_ptr_release(Feature * p); -+} -+ - #include "IFeature.h" - #include "Coord.h" - #include "MapView.h" -@@ -80,11 +87,6 @@ private: - int theLayer; - }; - --namespace boost --{ --void intrusive_ptr_add_ref(Feature * p); --void intrusive_ptr_release(Feature * p); --} - - /// Used to store objects of the map - class Feature : public IFeature diff --git a/debian/patches/libgps20_build-fix.patch b/debian/patches/libgps20_build-fix.patch deleted file mode 100644 index 84a9dc7..0000000 --- a/debian/patches/libgps20_build-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp -index 80be027..d6ef50f 100644 ---- a/src/GPS/qgpsdevice.cpp -+++ b/src/GPS/qgpsdevice.cpp -@@ -958,27 +958,33 @@ void QGPSDDevice::run() - connect(this,SIGNAL(doStopDevice()),&Forward,SLOT(onStop())); - // exec(); - QEventLoop l; -- -+#if GPSD_API_MAJOR_VERSION < 5 - Server = new gpsmm(); - errno = 0; - gpsdata = Server->open(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data()); - if (!gpsdata) { --#ifndef Q_OS_WIN32 -+ #ifndef Q_OS_WIN32 - QString msg( (errno<0) ? gps_errstr(errno) : strerror(errno) ); --#else -+ #else - QString msg( (errno<0) ? "" : strerror(errno) ); --#endif -+ #endif - qDebug() << tr("Unable to connect to %1:%2").arg(M_PREFS->getGpsdHost()).arg(QString::number(M_PREFS->getGpsdPort())) - << ": " << msg; - return; - } -- -+#else -+ Server = new gpsmm(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data()); -+#endif - onLinkReady(); - l.processEvents(); - - forever { - #if GPSD_API_MAJOR_VERSION > 3 -+#if GPSD_API_MAJOR_VERSION < 5 - if (Server->waiting()) -+#else -+ if (Server->waiting(0)) -+#endif - #endif - onDataAvailable(); - l.processEvents(); -@@ -994,16 +1000,12 @@ void QGPSDDevice::onDataAvailable() - if (!gpsdata) - return; - #else -- if ( Server->waiting() ) -+ gpsdata = Server->read(); -+ if (!gpsdata) - { -- errno = 0; -- gpsdata = Server->read(); -- if ( gpsdata == 0 ) -- { -- QString msg( (errno==0) ? "socket to gpsd was closed" : strerror(errno) ); -- qDebug() << "gpsmm::read() failed: " << msg; -- return; -- } -+ QString msg( (errno==0) ? "socket to gpsd was closed" : strerror(errno) ); -+ qDebug() << "gpsmm::read() failed: " << msg; -+ return; - } - #endif - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 1d88707..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -gcc-4.7-ftbfs-fix -0002-linker_fixes.patch -libgps20_build-fix.patch -arm_qreal_build_fix -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel