Control: reopen -1 Control: tags -1 +patch I'm reopening because you didn't actually pass the configure flags in the right place. I'm attaching a patch for this.
Other Notes ----------------- This will need to go through the NEW queue. Maybe it makes sense to split libical-dev and have a libical-glib-dev package. I didn't do it here and I guess it's not a problem until someone else complains. I think that libical-3.0.4.gir (and its .typelib) is misnamed. I'd expect something maybe like ICal-3.0.gir The problem is that if we follow the Debian GObject Introspection mini policy [1], we'd have to go through new for every point release (gir1.2-libical-3.0.4, then gir1.2-libical-3.0.5, etc. ) So maybe talk to upstream about that. But there are examples in Debian where we put multiple gir stuff in the same package (which is what I did here). [1] https://salsa.debian.org/gnome-team/gobject-introspection/blob/debian/master/debian/policy.txt Thanks, Jeremy Bicha
From 039d488c9a3fae9259b6995f5c1b563098dddb9e Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Mon, 24 Sep 2018 11:50:07 -0400 Subject: [PATCH 1/3] Really enable vala and gobject introspection support Closes: #909296 --- debian/control | 22 ++++++++++++++++++++++ debian/gir1.2-icalglib-3.0.install | 1 + debian/libical-dev.install | 3 +++ debian/rules | 7 ++++--- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 debian/gir1.2-icalglib-3.0.install diff --git a/debian/control b/debian/control index a073cb5..555b67c 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,14 @@ Priority: optional Maintainer: Nicolas Mora <[email protected]> Build-Depends: cmake, debhelper (>= 11), + gobject-introspection, tzdata, libicu-dev, libgirepository1.0-dev, libdb-dev, libxml2-dev, + python3-gi <!nocheck>, + valac Standards-Version: 4.2.1 Homepage: https://github.com/libical/libical @@ -16,6 +19,7 @@ Package: libical-dev Section: libdevel Architecture: any Depends: libical3 (= ${binary:Version}), + gir1.2-icalglib-3.0 (= ${binary:Version}), ${misc:Depends}, libicu-dev, libdb-dev, @@ -41,3 +45,21 @@ Description: iCalendar library implementation in C (runtime) . This package contains the files necessary for running applications that use the libical library. + +Package: gir1.2-icalglib-3.0 +Section: introspection +Architecture: any +Multi-Arch: same +Depends: ${gir:Depends}, + ${misc:Depends} +Provides: gir1.2-libical-3.0.4 (= ${binary:Version}) +Description: GObject introspection data for libical + libical is an open source implementation of the IETF's iCalendar calendaring + and scheduling protocols (RFC 2445, 2446, and 2447). It parses iCal components + and provides a C API for manipulating the component properties, parameters, + and subcomponents. + . + This package contains introspection data for libical. + . + It can be used by packages using the GIRepository format to generate + dynamic bindings. diff --git a/debian/gir1.2-icalglib-3.0.install b/debian/gir1.2-icalglib-3.0.install new file mode 100644 index 0000000..9038727 --- /dev/null +++ b/debian/gir1.2-icalglib-3.0.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0/ diff --git a/debian/libical-dev.install b/debian/libical-dev.install index 2cec948..67c3b58 100644 --- a/debian/libical-dev.install +++ b/debian/libical-dev.install @@ -2,3 +2,6 @@ usr/include usr/lib/*/libical*.a usr/lib/*/libical*.so usr/lib/*/pkgconfig/libical.pc +usr/lib/*/pkgconfig/libical-glib.pc +usr/share/gir-1.0 +usr/share/vala diff --git a/debian/rules b/debian/rules index 80e42d9..c2da234 100755 --- a/debian/rules +++ b/debian/rules @@ -2,12 +2,13 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_CFLAGS_MAINT_APPEND=-DGOBJECT_INTROSPECTION=true -DICAL_GLIB_VAPI=true - %: - dh $@ --buildsystem=cmake --no-parallel --list-missing \ + dh $@ --buildsystem=cmake --no-parallel --list-missing --with gir \ --dbgsym-migration='libical-dbg (<< 2~)' +override_dh_auto_configure: + dh_auto_configure -- -DGOBJECT_INTROSPECTION=true -DICAL_GLIB_VAPI=true + ifneq (,$(filter $(DEB_HOST_ARCH), kfreebsd-amd64 kfreebsd-i386)) override_dh_auto_test: : # the tests hang on the buildds, don't run them -- 2.17.1
From e3528f98ac30633fa8f2810b6bb5964135e8ad7c Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Mon, 24 Sep 2018 12:30:46 -0400 Subject: [PATCH 3/3] Mark a symbol as optional that doesn't show with -O3 such as in Ubuntu's ppc64el https://launchpad.net/ubuntu/+source/libical3/3.0.4-0ubuntu2 https://launchpad.net/ubuntu/+source/libical3/3.0.4-0ubuntu3 --- debian/libical3.symbols | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libical3.symbols b/debian/libical3.symbols index edcb00a..331fa9f 100644 --- a/debian/libical3.symbols +++ b/debian/libical3.symbols @@ -2780,7 +2780,7 @@ libical_cxx.so.3 libical3 #MINVER# _ZTVN7LibICal9VTimezoneE@Base 3.0.0 _ZTVN7LibICal9XDaylightE@Base 3.0.0 _ZTVN7LibICal9XStandardE@Base 3.0.0 - _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 3.0.0 + (optional)_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag@Base 3.0.0 libicalss.so.3 libical3 #MINVER# icalbdbset_acquire_cursor@Base 3.0.0 icalbdbset_add_component@Base 3.0.0 -- 2.17.1
From 259b56be875783741e57b2920b8b8b72c2f9929d Mon Sep 17 00:00:00 2001 From: Jeremy Bicha <[email protected]> Date: Mon, 24 Sep 2018 12:29:28 -0400 Subject: [PATCH 2/3] Drop explicit buildsystem=cmake debhelper identifies this automatically --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c2da234..a4e7ce6 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ --buildsystem=cmake --no-parallel --list-missing --with gir \ + dh $@ --no-parallel --list-missing --with gir \ --dbgsym-migration='libical-dbg (<< 2~)' override_dh_auto_configure: -- 2.17.1
