Source: webcit
Version: 9.01-dfsg-1
Severity: normal
Tags: patch
Dear Maintainer,
Initial plans has been started for transitioning to libical 2.0.0
(currently stuck in NEW).
Your package fails to build from source with the new version.
Please see attached patches which are on top of the webcit
git packaging repo. (Please replace the bug report number in the
first commit message with whatever number this bug report gets
and replace the forth/last patch with a fresh "gbp dch --auto"
run.)
(See also #797074 if you're interested in current transition planning.)
Regards,
Andreas Henriksson
>From f6c395f53a8760823a8665f53fcb09948b1882e3 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:09:26 +0200
Subject: [PATCH 1/4] Add debian/patches/icalerror_errors_are_fatal.patch
- fixes building against libical 2.0.0
Git-Dch: Full
Closes: #-1
---
debian/patches/icalerror_errors_are_fatal.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 23 insertions(+)
create mode 100644 debian/patches/icalerror_errors_are_fatal.patch
create mode 100644 debian/patches/series
diff --git a/debian/patches/icalerror_errors_are_fatal.patch b/debian/patches/icalerror_errors_are_fatal.patch
new file mode 100644
index 0000000..c0b2163
--- /dev/null
+++ b/debian/patches/icalerror_errors_are_fatal.patch
@@ -0,0 +1,22 @@
+From: Andreas Henriksson <andr...@fatal.se>
+Subject: Fix building against libical 2.0.0
+
+Use new helper function since the global variable was removed.
+
+See https://github.com/libical/libical/commit/6e5534a979b3ab4d28e5a32f5
+
+Note that this unconditionally uses the new function as the macro
+ICAL_CHECK_VERSION was not added in 2.0.0 yet. Maybe it can be
+utilized in the future....
+
+--- a/webserver.c
++++ b/webserver.c
+@@ -274,7 +274,7 @@
+ }
+
+ /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */
+- icalerror_errors_are_fatal = 0;
++ icalerror_set_errors_are_fatal(0);
+
+ /* Use our own prefix on tzid's generated from system tzdata */
+ icaltimezone_set_tzid_prefix("/citadel.org/");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..baceaf6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+icalerror_errors_are_fatal.patch
--
2.8.0.rc3
>From 8527cade9a93771fdef3b8b9ca109088ece0b377 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:10:16 +0200
Subject: [PATCH 2/4] Bump libical-dev build-dependency to >= 2.0.0
- see previously added patch header
Git-Dch: Full
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 9f0b9f7..e5985e3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: extra
Maintainer: Debian Citadel Team <pkg-citadel-de...@lists.alioth.debian.org>
Uploaders: Wilfried Goesgens <w.goesg...@outgesourced.org>, Michael Meskes <mes...@debian.org>, Alexander Wirt <formo...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf, libical-dev (>=0.43), gettext, locales,
+Build-Depends: debhelper (>= 7.0.50~), po-debconf, libical-dev (>= 2.0.0), gettext, locales,
libcitadel-dev (>= 9.01), autotools-dev, libssl-dev, libexpat1-dev, libmarkdown2-dev
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-citadel/webcit.git
--
2.8.0.rc3
>From 1c41c0ee57a0e6489a32bd2c62ae785d8fd68141 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:20:20 +0200
Subject: [PATCH 3/4] Build-depend on and use quilt sequencer to apply
debian/patches
---
debian/control | 2 +-
debian/rules | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index e5985e3..1f1fa69 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
Priority: extra
Maintainer: Debian Citadel Team <pkg-citadel-de...@lists.alioth.debian.org>
Uploaders: Wilfried Goesgens <w.goesg...@outgesourced.org>, Michael Meskes <mes...@debian.org>, Alexander Wirt <formo...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf, libical-dev (>= 2.0.0), gettext, locales,
+Build-Depends: debhelper (>= 7.0.50~), po-debconf, quilt, libical-dev (>= 2.0.0), gettext, locales,
libcitadel-dev (>= 9.01), autotools-dev, libssl-dev, libexpat1-dev, libmarkdown2-dev
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-citadel/webcit.git
diff --git a/debian/rules b/debian/rules
index fe18965..998a28e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ ifneq (,$(findstring urldebug,$(DEB_BUILD_OPTIONS)))
endif
%:
- dh ${@} --with autotools-dev
+ dh ${@} --with autotools-dev,quilt
override_dh_auto_configure:
dh_testdir
--
2.8.0.rc3
>From 4ba2213d0a67c4bba4f32efe491c192399384a9a Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andr...@fatal.se>
Date: Mon, 25 Apr 2016 15:15:43 +0200
Subject: [PATCH 4/4] Update debian/changelog
---
debian/changelog | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 430ca11..820c4f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+webcit (9.01-dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add debian/patches/icalerror_errors_are_fatal.patch
+ - fixes building against libical 2.0.0
+ Closes: #-1
+ * Bump libical-dev build-dependency to >= 2.0.0
+ - see previously added patch header
+ * Build-depend on and use quilt sequencer to apply debian/patches
+
+ -- Andreas Henriksson <andr...@fatal.se> Mon, 25 Apr 2016 15:15:22 +0200
+
webcit (9.01-dfsg-1) unstable; urgency=medium
* Update config.sub/guess during build.
--
2.8.0.rc3
