[Git][debian-gis-team/snaphu][master] 5 commits: New 0003-gcc-15-compat.patch

[Antonio Valentino (@antonio.valentino)]

Antonio Valentino pushed to branch master at Debian GIS Project / snaphu


Commits:
dd5776a7 by Antonio Valentino at 2025-09-08T06:26:57+00:00
New 0003-gcc-15-compat.patch

- - - - -
8249154d by Antonio Valentino at 2025-09-08T06:27:25+00:00
New 0004-Ensure-that-install-dirs-exist.patch

- - - - -
93aa1e44 by Antonio Valentino at 2025-09-08T06:27:27+00:00
Drop d/dirs

- - - - -
6e665e77 by Antonio Valentino at 2025-09-08T06:27:27+00:00
Update dates in d/copyright

- - - - -
09940f68 by Antonio Valentino at 2025-09-08T06:29:10+00:00
Set distribution to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/copyright
- − debian/dirs
- + debian/patches/0003-gcc-15-compat.patch
- + debian/patches/0004-Ensure-that-install-dirs-exist.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,16 @@
-snaphu (2.0.7-2) UNRELEASED; urgency=medium
+snaphu (2.0.7-2) unstable; urgency=medium
 
-  * Team upload.
+  [ Bas Couwenberg ]
   * Bump Standards-Version to 4.7.2, no changes.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sun, 28 Jul 2024 20:03:36 +0200
+  [ Antonio Valentino ]
+  * debian/patches:
+    - New 0003-gcc-15-compat.patch (Closes: #1114389).
+    - New 0004-Ensure-that-install-dirs-exist.patch.
+  * Drop the no longer necessary d/dirs file.
+  * Update dates in d/copyright.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Mon, 08 Sep 2025 06:28:57 +0000
 
 snaphu (2.0.7-1) unstable; urgency=medium
 


=====================================
debian/copyright
=====================================
@@ -67,7 +67,7 @@ License: igsys
  http://www.igsystems.com/cs2
 
 Files: debian/*
-Copyright: 2010-2024, Antonio Valentino <antonio.valentino at tiscali.it>
+Copyright: 2010-2025, Antonio Valentino <antonio.valentino at tiscali.it>
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by


=====================================
debian/dirs deleted
=====================================
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1


=====================================
debian/patches/0003-gcc-15-compat.patch
=====================================
@@ -0,0 +1,33 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 8 Sep 2025 05:51:19 +0000
+Subject: gcc-15-compat
+
+---
+ src/snaphu_tile.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/snaphu_tile.c b/src/snaphu_tile.c
+index 3830a1d..8b25bda 100644
+--- a/src/snaphu_tile.c
++++ b/src/snaphu_tile.c
+@@ -389,15 +389,16 @@ int GrowRegions(void **costs, short **flows, long nrow, long ncol,
+   bucketT bkts[1];
+   void **growregionscosts;
+   tileparamT temptileparams[1];
+-  void (*tempcalccostfnptr)();      
+-  long (*tempevalcostfnptr)();      
++  void (*tempcalccostfnptr)(void **, long, long, long, long, long,
++                            paramT *, long *, long *);
++  long (*tempevalcostfnptr)(void **, short **, long, long, long, paramT *);
++
+ 
+-  
+   /* initialize stack structures to zero for good measure */
+   memset(regionfile,0,MAXSTRLEN);
+   memset(bkts,0,sizeof(bucketT));
+   memset(temptileparams,0,sizeof(tileparamT));
+-  
++
+   /* set up */
+   fprintf(sp1,"Growing reliable regions\n");
+   minsize=params->minregionsize;


=====================================
debian/patches/0004-Ensure-that-install-dirs-exist.patch
=====================================
@@ -0,0 +1,23 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Mon, 8 Sep 2025 06:12:44 +0000
+Subject: Ensure that install dirs exist
+
+---
+ src/Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index e0cb450..946070e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -46,7 +46,9 @@ gdebug:		snaphu.c snaphu_tile.c snaphu_solver.c snaphu_io.c snaphu_util.c snaphu
+ 		$(CC) $(DEBUGFLAGS) snaphu.c snaphu_tile.c snaphu_solver.c snaphu_io.c snaphu_util.c snaphu_cost.c snaphu_cs2.c -o $(SNAPHU) $(LIBS)
+ 
+ install:	$(SNAPHU)
+-		cp $(SNAPHU) $(INSTALLDIR);
++		mkdir -p $(INSTALLDIR)
++		cp $(SNAPHU) $(INSTALLDIR)
++		mkdir -p $(MANDIR)/man1/
+ 		cp $(SNAPHUMAN) $(MANDIR)/man1/
+ 
+ clean:


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
 0001-hardening.patch
 0002-Spelling.patch
+0003-gcc-15-compat.patch
+0004-Ensure-that-install-dirs-exist.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/snaphu/-/compare/f1009913feb9cf5298521931bdc65218f45205fb...09940f68ecf634b1fdbef2ec2588907f87ba6527

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/snaphu/-/compare/f1009913feb9cf5298521931bdc65218f45205fb...09940f68ecf634b1fdbef2ec2588907f87ba6527
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250908/3e4bb6a5/attachment-0001.htm>