Ubuntu
chmlib package

Merge ~liushuyu-011/ubuntu/+source/chmlib:ubuntu/devel into ubuntu/+source/chmlib:ubuntu/devel

  1. Git
  2. lp:~liushuyu-011/ubuntu/+source/chmlib
  3. ubuntu/devel
  4. Merge into ubuntu/devel
Proposed by Zixing Liu
Status: Needs review
Proposed branch: ~liushuyu-011/ubuntu/+source/chmlib:ubuntu/devel
Merge into: ubuntu/+source/chmlib:ubuntu/devel
Diff against target: 87 lines (+55/-1)
4 files modified
debian/changelog (+13/-0)
debian/control (+2/-1)
debian/patches/implicit-declarations.patch (+39/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+464769@code.launchpad.net

Description of the change

This MP fixes FTBFS on armhf due to missing includes and prototypes

To post a comment you must log in.
Revision history for this message
Zixing Liu (liushuyu-011) wrote :

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15984101/+listing-archive-extra

Reply

Unmerged commits

a4cf8a4... by Zixing Liu

changelog for the armhf patch

a869f1d... by Zixing Liu

d/p/implicit-declarations.patch: add a patch to fix FTBFS on armhf

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 9af106d..d201316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
1chmlib (2:0.40a-8ubuntu1) noble; urgency=medium
2
3 * debian/patches/implicit-declarations.patch: Add missing includes and
4 fix large file support. (LP: #2062947).
5
6 -- Zixing Liu <zixing.liu@canonical.com> Fri, 19 Apr 2024 20:28:40 -0600
7
8chmlib (2:0.40a-8build1) noble; urgency=high
9
10 * No change rebuild for frame pointers (and time_t).
11
12 -- Julian Andres Klode <juliank@ubuntu.com> Thu, 18 Apr 2024 19:51:34 +0200
13
1chmlib (2:0.40a-8) unstable; urgency=low14chmlib (2:0.40a-8) unstable; urgency=low
215
3 [ Debian Janitor ]16 [ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 8db0d72..de43978 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: chmlib1Source: chmlib
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: Kartik Mistry <kartik@debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Kartik Mistry <kartik@debian.org>
5Build-Depends: debhelper-compat (= 13), libtool6Build-Depends: debhelper-compat (= 13), libtool
6Standards-Version: 4.6.07Standards-Version: 4.6.0
7Homepage: https://github.com/jedwing/CHMLib8Homepage: https://github.com/jedwing/CHMLib
diff --git a/debian/patches/implicit-declarations.patch b/debian/patches/implicit-declarations.patch
8new file mode 1006449new file mode 100644
index 0000000..2db0b1e
--- /dev/null
+++ b/debian/patches/implicit-declarations.patch
@@ -0,0 +1,39 @@
1Description: Add missing includes and fix large file support
2Author: Zixing Liu <zixing.liu@canonical.com>
3Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066327
4Bug-Ubuntu: https://bugs.launchpad.net/bugs/2062947
5Forwarded: no
6Last-Update: 2024-04-19
7---
8Index: chmlib/src/chm_http.c
9===================================================================
10--- chmlib.orig/src/chm_http.c
11+++ chmlib/src/chm_http.c
12@@ -34,6 +34,7 @@
13 #include <stdio.h>
14 #include <stdlib.h>
15 #include <string.h>
16+#include <unistd.h>
17 #if __sun || __sgi
18 #include <strings.h>
19 #define strrchr rindex
20@@ -43,6 +44,7 @@
21 #include <sys/socket.h>
22 #include <sys/types.h>
23 #include <netinet/in.h>
24+#include <arpa/inet.h>
25
26 /* threading includes */
27 #include <pthread.h>
28Index: chmlib/src/chm_lib.c
29===================================================================
30--- chmlib.orig/src/chm_lib.c
31+++ chmlib/src/chm_lib.c
32@@ -48,6 +48,7 @@
33 * *
34 ***************************************************************************/
35
36+#define _LARGEFILE64_SOURCE 1
37 #include "chm_lib.h"
38
39 #ifdef CHM_MT
diff --git a/debian/patches/series b/debian/patches/series
0new file mode 10064440new file mode 100644
index 0000000..6040581
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
1implicit-declarations.patch

Subscribers

People subscribed via source and target branches

to all changes: