GNU bug report logs -
#30733
[PATCH staging 0/3] Updating evolution-data-server
Previous Next
Reported by: Marius Bakke <mbakke <at> fastmail.com>
Date: Tue, 6 Mar 2018 16:32:01 UTC
Severity: normal
Tags: patch
Done: Marius Bakke <mbakke <at> fastmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30733 in the body.
You can then email your comments to 30733 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#30733; Package
guix-patches.
(Tue, 06 Mar 2018 16:32:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Marius Bakke <mbakke <at> fastmail.com>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Tue, 06 Mar 2018 16:32:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
Here is a hopefully last round of fixes for the staging branch. I'm
not sure if updating evolution-data-server requires other GNOME
updates, but all the dependent packages build at least.
Marius Bakke (3):
gnu: evolution-data-server: Update to 3.26.6.
gnu: gnome-calendar: Update to 3.26.3.
gnu: gnome-todo: Fix compatibility with libical >= 3.0.
gnu/local.mk | 1 +
gnu/packages/gnome.scm | 42 +++++++++++++++-------
.../patches/gnome-todo-libical-compat.patch | 17 +++++++++
3 files changed, 47 insertions(+), 13 deletions(-)
create mode 100644 gnu/packages/patches/gnome-todo-libical-compat.patch
--
2.16.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#30733; Package
guix-patches.
(Tue, 06 Mar 2018 16:35:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 30733 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/gnome.scm (evolution-data-server): Update to 3.26.6.
[arguments]: Set RUNPATH in #:configure-flags to match new libdir structure.
Add phase 'dont-override-rpath' to make the build system respect it.
---
gnu/packages/gnome.scm | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c876dbb6a..de9b439ec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4875,7 +4875,7 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
(define-public evolution-data-server
(package
(name "evolution-data-server")
- (version "3.24.3")
+ (version "3.26.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4883,27 +4883,42 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1jj1q81bl3r0c8rnsfqi83igqlprzdcjim1fvygbyfy7b8gigqqk"))))
+ "1v0hwlrlm23bz5dmamdavm771f4gs64fyq82argrc0nwgn2a2fp4"))))
(build-system cmake-build-system)
(arguments
'(;; XXX FIXME: 11/85 tests are failing.
#:tests? #f
#:configure-flags
- (list "-DENABLE_UOA=OFF" ;disable Ubuntu Online Accounts support
- "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support
- "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication
- "-DENABLE_VALA_BINDINGS=ON"
- ;; FIXME: Building against ICU 60 requires C++11 or higher. Remove
- ;; this when our default compiler is >= GCC6.
- "-DCMAKE_CXX_FLAGS=-std=gnu++11"
- "-DENABLE_INTROSPECTION=ON") ;required for Vala bindings
+ (let* ((lib (string-append (assoc-ref %outputs "out")
+ "/lib"))
+ (runpaths (map (lambda (s) (string-append
+ lib "/evolution-data-server/" s))
+ '("addressbook-backends" "calendar-backends"
+ "camel-providers" "credential-modules"
+ "registry-modules"))))
+ (list "-DENABLE_UOA=OFF" ;disable Ubuntu Online Accounts support
+ "-DENABLE_GOOGLE=OFF" ;disable Google Contacts support
+ "-DENABLE_GOOGLE_AUTH=OFF" ;disable Google authentication
+ "-DENABLE_VALA_BINDINGS=ON"
+ ;; FIXME: Building against ICU 60 requires C++11 or higher. Remove
+ ;; this when our default compiler is >= GCC6.
+ "-DCMAKE_CXX_FLAGS=-std=gnu++11"
+ (string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
+ (string-append lib "/evolution-data-server;")
+ (string-join runpaths ";"))
+ "-DENABLE_INTROSPECTION=ON")) ;required for Vala bindings
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-paths
(lambda _
(substitute* "tests/test-server-utils/e-test-server-utils.c"
(("/bin/rm") (which "rm")))
- #t)))))
+ #t))
+ (add-before 'configure 'dont-override-rpath
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("SET\\(CMAKE_INSTALL_RPATH .*") ""))
+ #t)))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection)
--
2.16.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#30733; Package
guix-patches.
(Tue, 06 Mar 2018 16:35:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 30733 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/gnome.scm (gnome-calendar): Update to 3.26.3.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index de9b439ec..22cafe377 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6165,7 +6165,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.")
(define-public gnome-calendar
(package
(name "gnome-calendar")
- (version "3.26.2")
+ (version "3.26.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -6173,7 +6173,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.")
name "-" version ".tar.xz"))
(sha256
(base32
- "03n51mvlc0vabr1rx9577z927icl3mrxrrv8zckfjav6p4vwg8hr"))))
+ "1clnfvvsaqw9vpxrs6qrxzmgpaw9x2nkjik2x2vwvm07pdvhddxn"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
--
2.16.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#30733; Package
guix-patches.
(Tue, 06 Mar 2018 16:35:02 GMT)
Full text and
rfc822 format available.
Message #14 received at 30733 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/patches/gnome-todo-libical-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gnome.scm (gnome-todo)[source](patches): Use it.
---
gnu/local.mk | 1 +
gnu/packages/gnome.scm | 1 +
gnu/packages/patches/gnome-todo-libical-compat.patch | 17 +++++++++++++++++
3 files changed, 19 insertions(+)
create mode 100644 gnu/packages/patches/gnome-todo-libical-compat.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index c3f28da6d..1dc69226d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -719,6 +719,7 @@ dist_patch_DATA = \
%D%/packages/patches/glog-gcc-5-demangling.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
+ %D%/packages/patches/gnome-todo-libical-compat.patch \
%D%/packages/patches/gnome-tweak-tool-search-paths.patch \
%D%/packages/patches/gnucash-price-quotes-perl.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 22cafe377..329e17d66 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6205,6 +6205,7 @@ desktop. It supports multiple calendars, month, week and year view.")
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
+ (patches (search-patches "gnome-todo-libical-compat.patch"))
(sha256
(base32
"106xx1w18pxjmj5k0k2qjzi6b3c3kaz7b5kyrpknykibnr401ff9"))))
diff --git a/gnu/packages/patches/gnome-todo-libical-compat.patch b/gnu/packages/patches/gnome-todo-libical-compat.patch
new file mode 100644
index 000000000..34f2e254b
--- /dev/null
+++ b/gnu/packages/patches/gnome-todo-libical-compat.patch
@@ -0,0 +1,17 @@
+Fix compatibility with libical 3.0.
+
+Patch copied from Arch Linux:
+https://git.archlinux.org/svntogit/packages.git/tree/trunk/gnome-todo-3.26.2-libical-3.0.patch?h=packages/gnome-todo
+
+diff -up gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 gnome-todo-3.26.2/src/gtd-task.c
+--- gnome-todo-3.26.2/src/gtd-task.c.libical-3.0 2017-11-08 14:53:53.484294926 +0100
++++ gnome-todo-3.26.2/src/gtd-task.c 2017-11-08 14:53:57.208294874 +0100
+@@ -778,7 +778,7 @@ gtd_task_set_complete (GtdTask *task,
+ dt->minute = g_date_time_get_minute (now);
+ dt->second = g_date_time_get_seconds (now);
+ dt->is_date = 0;
+- dt->is_utc = 1;
++ dt->zone = icaltimezone_get_utc_timezone ();
+
+ /* convert timezone
+ *
--
2.16.2
Information forwarded
to
guix-patches <at> gnu.org:
bug#30733; Package
guix-patches.
(Wed, 07 Mar 2018 12:58:02 GMT)
Full text and
rfc822 format available.
Message #17 received at 30733 <at> debbugs.gnu.org (full text, mbox):
Hi!
Marius Bakke <mbakke <at> fastmail.com> skribis:
> * gnu/packages/gnome.scm (evolution-data-server): Update to 3.26.6.
> [arguments]: Set RUNPATH in #:configure-flags to match new libdir structure.
> Add phase 'dont-override-rpath' to make the build system respect it.
LGTM!
> + (let* ((lib (string-append (assoc-ref %outputs "out")
> + "/lib"))
> + (runpaths (map (lambda (s) (string-append
> + lib "/evolution-data-server/" s))
> + '("addressbook-backends" "calendar-backends"
> + "camel-providers" "credential-modules"
> + "registry-modules"))))
[...]
> + (string-append "-DCMAKE_INSTALL_RPATH=" lib ";"
> + (string-append lib "/evolution-data-server;")
> + (string-join runpaths ";"))
[...]
> + (add-before 'configure 'dont-override-rpath
> + (lambda _
> + (substitute* "CMakeLists.txt"
> + (("SET\\(CMAKE_INSTALL_RPATH .*") ""))
Is this because cmake fails to determine the right RUNPATH? Perhaps add
a short comment about this.
Thanks!
Ludo’.
Information forwarded
to
guix-patches <at> gnu.org:
bug#30733; Package
guix-patches.
(Wed, 07 Mar 2018 12:58:02 GMT)
Full text and
rfc822 format available.
Message #20 received at 30733 <at> debbugs.gnu.org (full text, mbox):
Marius Bakke <mbakke <at> fastmail.com> skribis:
> * gnu/packages/gnome.scm (gnome-calendar): Update to 3.26.3.
OK!
Information forwarded
to
guix-patches <at> gnu.org:
bug#30733; Package
guix-patches.
(Wed, 07 Mar 2018 12:59:02 GMT)
Full text and
rfc822 format available.
Message #23 received at 30733 <at> debbugs.gnu.org (full text, mbox):
Marius Bakke <mbakke <at> fastmail.com> skribis:
> * gnu/packages/patches/gnome-todo-libical-compat.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> * gnu/packages/gnome.scm (gnome-todo)[source](patches): Use it.
LGTM, thanks!
Ludo'.
Reply sent
to
Marius Bakke <mbakke <at> fastmail.com>:
You have taken responsibility.
(Wed, 07 Mar 2018 14:13:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
Marius Bakke <mbakke <at> fastmail.com>:
bug acknowledged by developer.
(Wed, 07 Mar 2018 14:13:03 GMT)
Full text and
rfc822 format available.
Message #28 received at 30733-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Ludovic Courtès <ludo <at> gnu.org> writes:
>> + (add-before 'configure 'dont-override-rpath
>> + (lambda _
>> + (substitute* "CMakeLists.txt"
>> + (("SET\\(CMAKE_INSTALL_RPATH .*") ""))
>
> Is this because cmake fails to determine the right RUNPATH? Perhaps add
> a short comment about this.
The #:configure-flags "hack" is needed because cmake fails to determine
the correct RUNPATH. The CMakeLists.txt substitution is needed because
it overrides the one set in #:configure-flags.
I added a comment and pushed in ac033c7ba1e14da42a67f493802be5a59dc66a57.
Thanks for reviewing!
[signature.asc (application/pgp-signature, inline)]
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Thu, 05 Apr 2018 11:24:04 GMT)
Full text and
rfc822 format available.
This bug report was last modified 6 years and 20 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.