This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gosmore.
commit c3296527422be8b2fcb9ed0bb93ff50902ba58e3
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat May 7 13:06:38 2016 +0200
Drop curl_types.h patch, fixed upstream. Refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/curl_types.h | 13 -----------
debian/patches/linker_flags.diff | 41 +++++++++++++++-------------------
debian/patches/no-strict-overflow.diff | 6 ++---
debian/patches/series | 1 -
5 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8885209..b23bf29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ gosmore (0.0.0.svn30327-1) UNRELEASED; urgency=medium
- Update copyright years for Nic Roets
- Update Files section for ConvertUTF files moved to jni directory
- Use standalone license paragraphs
+ * Drop curl_types.h patch, fixed upstream. Refresh remaining patches.
-- Bas Couwenberg <sebas...@debian.org> Sat, 07 May 2016 11:54:49 +0200
diff --git a/debian/patches/curl_types.h b/debian/patches/curl_types.h
deleted file mode 100644
index 2625ae8..0000000
--- a/debian/patches/curl_types.h
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Fix FTBFS with current curl
-Author: Francesco Paolo Lovergine <fran...@debian.org>
-
---- gosmore.orig/gosmore.cpp
-+++ gosmore/gosmore.cpp
-@@ -124,7 +124,6 @@
- #include <gdk/gdkx.h>
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- #ifdef USE_GEOCLUE // Not used and never worked
diff --git a/debian/patches/linker_flags.diff b/debian/patches/linker_flags.diff
index b8b53b8..02c3a85 100644
--- a/debian/patches/linker_flags.diff
+++ b/debian/patches/linker_flags.diff
@@ -4,9 +4,9 @@ Description: Reorder linker invocations
Author: Sebastian Carneiro <scarne...@fibertel.com.ar>
Bug-Debian: https://bugs.debian.org/631251
---- gosmore.orig/Makefile.in
-+++ gosmore/Makefile.in
-@@ -34,8 +34,8 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -34,8 +34,8 @@ EXTRA=`pkg-config --cflags --libs gtk+-2
# I found that it's more reliable and more portable to use aplay, but
# gnome sound can still be activated with this:
# `pkg-config --cflags --libs libgnomeui-2.0 && echo -DUSE_GNOMESOUND`
@@ -16,39 +16,34 @@ Bug-Debian: https://bugs.debian.org/631251
+XMLLIBS= `pkg-config --libs libxml-2.0 || echo -lxml2 -lm`
ARCH=arm-mingw32ce-
else
- # To compile with mingw, install MSYS and mingw, and then download
-@@ -58,11 +58,11 @@
- # it. THE CODE IS NOT FINISHED. Linux version looks promising.
- gosmore: gosmore.cpp libgosm.cpp libgosm.h bboxes.c
- g++ -DCHILDREN=16 ${CFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
-- gosmore.cpp libgosm.cpp -o gosmore ${EXTRA}
-+ gosmore.cpp libgosm.cpp -o gosmore ${EXTRA} ${XMLLIBS}
- gosmore16: gosmore.cpp libgosm.cpp libgosm.h
- g++ -DGOSMZ=16 ${CFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
-- gosmore.cpp libgosm.cpp -o gosmore16 ${EXTRA}
-+ gosmore.cpp libgosm.cpp -o gosmore16 ${EXTRA} ${XMLLIBS}
+@@ -55,7 +55,7 @@ gosmore: jni/gosmore.cpp jni/libgosm.cpp
+ jni/openglespolygon.h jni/openglespolygon.cpp
+ g++ ${CFLAGS} ${WARNFLAGS} \
+ jni/gosmore.cpp jni/libgosm.cpp jni/openglespolygon.h \
+- jni/openglespolygon.cpp -o gosmore ${EXTRA} ${XMLFLAGS}
++ jni/openglespolygon.cpp -o gosmore ${EXTRA} ${XMLFLAGS}
${XMLLIBS}
- $(ARCH)gosmore.exe: gosmore.cpp libgosm.cpp gosmore.rsc resource.h \
- libgosm.h ceglue.h ceglue.c bboxes.c
-@@ -83,17 +83,17 @@
- wget -O - ${WIKIPAGE}/Translations |./extract >translations.c
+ $(ARCH)gosmore.exe: jni/gosmore.cpp jni/libgosm.cpp gosmore.rsc
jni/resource.h \
+ jni/libgosm.h jni/ceglue.h jni/ceglue.c bboxes.c
+@@ -76,17 +76,17 @@ translations.c: extract
+ wget -O - ${WIKIPAGE}/Translations |./extract
>jni/translations.c
extract: extract.c
- ${CC} ${CFLAGS} ${XMLFLAGS} extract.c -o extract
+ ${CC} ${CFLAGS} ${XMLFLAGS} extract.c -o extract ${XMLLIBS}
- bboxes.c: density.c density.txt
-- gcc -lm density.c -o density
+ jni/bboxes.c: density.c density.txt
+- gcc density.c -lm -o density
+ gcc density.c -o density -lm
./density <density.txt >density.sh
# wget http://www.openstreetmap.org/api/0.6/changeset/1707270/download -O \
# countries.osm
- osmunda: osmunda.cpp libgosm.cpp libgosm.h
+ osmunda: osmunda.cpp jni/libgosm.cpp jni/libgosm.h
g++ ${CFLAGS} ${WARNFLAGS} ${XMLFLAGS} \
-- osmunda.cpp libgosm.cpp -o osmunda
-+ osmunda.cpp libgosm.cpp -o osmunda ${XMLLIBS}
+- osmunda.cpp jni/libgosm.cpp -o osmunda
++ osmunda.cpp jni/libgosm.cpp -o osmunda ${XMLLIBS}
voices:
echo '(voice_rab_diphone)' >/tmp/voice_rab_diphone
echo 'At the junction, turn left.' | festival_client \
diff --git a/debian/patches/no-strict-overflow.diff
b/debian/patches/no-strict-overflow.diff
index d8604ec..be04bfa 100644
--- a/debian/patches/no-strict-overflow.diff
+++ b/debian/patches/no-strict-overflow.diff
@@ -5,9 +5,9 @@ Bug: https://trac.openstreetmap.org/ticket/4450
Bug-Debian: https://bugs.debian.org/652084
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gosmore/+bug/937088
---- gosmore.orig/Makefile.in
-+++ gosmore/Makefile.in
-@@ -9,7 +9,7 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -9,7 +9,7 @@ prefix = @prefix@
bindir = $(prefix)/bin
datarootdir = $(prefix)/share
diff --git a/debian/patches/series b/debian/patches/series
index 11bceda..f3c1e95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-curl_types.h
no-strict-overflow.diff
linker_flags.diff
hardening.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gosmore.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
