[med-svn] [Git][med-team/maqview][master] 5 commits: gcc-14.patch: new: fix a socket length type.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Tue Aug 6 09:00:12 BST 2024
Étienne Mollier pushed to branch master at Debian Med / maqview
Commits:
f7c9df97 by Étienne Mollier at 2024-08-06T09:53:18+02:00
gcc-14.patch: new: fix a socket length type.
Closes: #1075254
- - - - -
0e1427e4 by Étienne Mollier at 2024-08-06T09:53:48+02:00
d/maqview.lintian-overrides: refresh overrides.
- - - - -
5b954b6e by Étienne Mollier at 2024-08-06T09:56:08+02:00
typo.patch: fix a typo caught by lintian (Toogle → Toggle).
- - - - -
dcf4e5e0 by Étienne Mollier at 2024-08-06T09:56:40+02:00
d/control: declare compliance to standards version 4.7.0.
- - - - -
5d092009 by Étienne Mollier at 2024-08-06T09:58:56+02:00
Ready to upload to unstable.
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/maqview.lintian-overrides
- + debian/patches/gcc-14.patch
- debian/patches/series
- + debian/patches/typo.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+maqview (0.2.5-12) unstable; urgency=medium
+
+ * Team upload.
+ * gcc-14.patch: new: fix a socket length type. (Closes: #1075254)
+ * d/maqview.lintian-overrides: refresh overrides.
+ * typo.patch: fix a typo caught by lintian (Toogle → Toggle).
+ * d/control: declare compliance to standards version 4.7.0.
+
+ -- Étienne Mollier <emollier at debian.org> Tue, 06 Aug 2024 09:57:02 +0200
+
maqview (0.2.5-11) unstable; urgency=medium
* Upstream download vanished
=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Priority: optional
Build-Depends: debhelper-compat (= 13),
freeglut3-dev,
libxi-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/maqview
Vcs-Git: https://salsa.debian.org/med-team/maqview.git
Homepage: https://maq.sourceforge.net/maqview.shtml
=====================================
debian/maqview.lintian-overrides
=====================================
@@ -2,7 +2,7 @@
# the API has changed in the Debian packaged version and thus we
# can not simply use the Debian packaged version
# upstream is contacted about this problem
-maqview: embedded-library usr/bin/maqindex: zlib
-maqview: embedded-library usr/bin/maqindex_socks: zlib
-maqview: embedded-library usr/bin/maqview: zlib
-maqview: embedded-library usr/bin/zrio: zlib
+maqview: embedded-library zlib [usr/bin/maqindex]
+maqview: embedded-library zlib [usr/bin/maqindex_socks]
+maqview: embedded-library zlib [usr/bin/maqview]
+maqview: embedded-library zlib [usr/bin/zrio]
=====================================
debian/patches/gcc-14.patch
=====================================
@@ -0,0 +1,29 @@
+Description: fix socket length type.
+ This fixes the following build failure with gcc 14:
+ .
+ socket_view.c:291:103: error: passing argument 3 of ‘accept’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 291 | sock = accept(server->socket, (struct sockaddr *)&clientname, &size);
+ | ^~~~~
+ | |
+ | size_t * {aka long unsigned int *}
+ In file included from socket_view.h:8,
+ from socket_view.c:1:
+ /usr/include/x86_64-linux-gnu/sys/socket.h:307:42: note: expected ‘socklen_t * restrict’ {aka ‘unsigned int * restrict’} but argument is of type ‘size_t *’ {aka ‘long unsigned int *’}
+
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075254
+Forwarded: no
+Last-Update: 2024-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- maqview.orig/socket_view.c
++++ maqview/socket_view.c
+@@ -267,7 +267,7 @@
+
+ int runViewServer(ViewServer *server){
+ int i, sock, state;
+- size_t size;
++ socklen_t size;
+ fd_set active_fd_set, read_fd_set;
+ struct timeval timeout;
+ struct sockaddr_in clientname;
=====================================
debian/patches/series
=====================================
@@ -4,3 +4,5 @@ use-dpkg-buildflags.patch
fix-hurd-build.patch
spelling.patch
mayhem.patch
+gcc-14.patch
+typo.patch
=====================================
debian/patches/typo.patch
=====================================
@@ -0,0 +1,32 @@
+Description: fix a typo Toogle → Toggle caught by lintian.
+Author: Étienne Mollier <emollier at debian.org>
+Forwarded: no
+Last-Update: 2024-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- maqview.orig/MainFrame.c
++++ maqview/MainFrame.c
+@@ -44,8 +44,8 @@
+ <Ctrl> <Arrow> : Move by 1000 bases\n\
+ <Ctrl> + : Add a new view\n\
+ <Ctrl> - : Remove the current view\n\
+-<Enter> : Toogle on/off automatic rolling on\n\
+-^b : Toogle on/off automatic rolling back\n\
++<Enter> : Toggle on/off automatic rolling on\n\
++^b : Toggle on/off automatic rolling back\n\
+ + : Zoom in\n\
+ - : Zoom out\n\
+ 0 : Zoom to the default scale\n\
+--- maqview.orig/README
++++ maqview/README
+@@ -108,8 +108,8 @@
+ <esc> : exit
+ hold [SHIFT] : Speed move 100 times
+ hold [CTRL] : Speed move 1000 times
+-<enter> : Toogle on/off automatic rolling on
+-^b : Toogle on/off automatic rolling back
++<enter> : Toggle on/off automatic rolling on
++^b : Toggle on/off automatic rolling back
+ Enter an integer then press <enter> key to goto the position
+ Enter an integer then press other key than <enter> can speed the integer times
+ Mouse:
View it on GitLab: https://salsa.debian.org/med-team/maqview/-/compare/848fff8dfcc8131b924a6263f1f97e659b808313...5d0920093e13149c0c277a854994d9aafbc3651f
--
View it on GitLab: https://salsa.debian.org/med-team/maqview/-/compare/848fff8dfcc8131b924a6263f1f97e659b808313...5d0920093e13149c0c277a854994d9aafbc3651f
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/debian-med-commit/attachments/20240806/7a662af8/attachment-0001.htm>
More information about the debian-med-commit
mailing list