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
1diff --git a/debian/changelog b/debian/changelog
2index 9af106d..d201316 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,16 @@
6+chmlib (2:0.40a-8ubuntu1) noble; urgency=medium
7+
8+ * debian/patches/implicit-declarations.patch: Add missing includes and
9+ fix large file support. (LP: #2062947).
10+
11+ -- Zixing Liu <zixing.liu@canonical.com> Fri, 19 Apr 2024 20:28:40 -0600
12+
13+chmlib (2:0.40a-8build1) noble; urgency=high
14+
15+ * No change rebuild for frame pointers (and time_t).
16+
17+ -- Julian Andres Klode <juliank@ubuntu.com> Thu, 18 Apr 2024 19:51:34 +0200
18+
19 chmlib (2:0.40a-8) unstable; urgency=low
20
21 [ Debian Janitor ]
22diff --git a/debian/control b/debian/control
23index 8db0d72..de43978 100644
24--- a/debian/control
25+++ b/debian/control
26@@ -1,7 +1,8 @@
27 Source: chmlib
28 Section: libs
29 Priority: optional
30-Maintainer: Kartik Mistry <kartik@debian.org>
31+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
32+XSBC-Original-Maintainer: Kartik Mistry <kartik@debian.org>
33 Build-Depends: debhelper-compat (= 13), libtool
34 Standards-Version: 4.6.0
35 Homepage: https://github.com/jedwing/CHMLib
36diff --git a/debian/patches/implicit-declarations.patch b/debian/patches/implicit-declarations.patch
37new file mode 100644
38index 0000000..2db0b1e
39--- /dev/null
40+++ b/debian/patches/implicit-declarations.patch
41@@ -0,0 +1,39 @@
42+Description: Add missing includes and fix large file support
43+Author: Zixing Liu <zixing.liu@canonical.com>
44+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066327
45+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2062947
46+Forwarded: no
47+Last-Update: 2024-04-19
48+---
49+Index: chmlib/src/chm_http.c
50+===================================================================
51+--- chmlib.orig/src/chm_http.c
52++++ chmlib/src/chm_http.c
53+@@ -34,6 +34,7 @@
54+ #include <stdio.h>
55+ #include <stdlib.h>
56+ #include <string.h>
57++#include <unistd.h>
58+ #if __sun || __sgi
59+ #include <strings.h>
60+ #define strrchr rindex
61+@@ -43,6 +44,7 @@
62+ #include <sys/socket.h>
63+ #include <sys/types.h>
64+ #include <netinet/in.h>
65++#include <arpa/inet.h>
66+
67+ /* threading includes */
68+ #include <pthread.h>
69+Index: chmlib/src/chm_lib.c
70+===================================================================
71+--- chmlib.orig/src/chm_lib.c
72++++ chmlib/src/chm_lib.c
73+@@ -48,6 +48,7 @@
74+ * *
75+ ***************************************************************************/
76+
77++#define _LARGEFILE64_SOURCE 1
78+ #include "chm_lib.h"
79+
80+ #ifdef CHM_MT
81diff --git a/debian/patches/series b/debian/patches/series
82new file mode 100644
83index 0000000..6040581
84--- /dev/null
85+++ b/debian/patches/series
86@@ -0,0 +1 @@
87+implicit-declarations.patch

Subscribers

People subscribed via source and target branches

to all changes: