[evolution/gnome-3-32] [Flatpak] Cover changes in 'gdbus wait' timeout argument units
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-32] [Flatpak] Cover changes in 'gdbus wait' timeout argument units
- Date: Thu, 11 Apr 2019 15:03:46 +0000 (UTC)
commit 8403fd4ea8d71ca24bd6ca709c8805bf9849fc93
Author: Milan Crha <mcrha redhat com>
Date: Thu Apr 11 17:02:51 2019 +0200
[Flatpak] Cover changes in 'gdbus wait' timeout argument units
Related to https://gitlab.gnome.org/GNOME/glib/issues/1737
flatpak/org.gnome.Evolution-master.json | 19 ++++++++++++-------
flatpak/org.gnome.Evolution-stable.json | 19 ++++++++++++-------
2 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index fd191903d5..45d8bf802e 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -264,22 +264,22 @@
" export GIO_USE_NETWORK_MONITOR=base",
" gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
"",
- " gdbus wait --session --timeout=300 @SOURCES_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-source-registry &",
- " gdbus wait --session --timeout=1000
@SOURCES_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
" fi",
"",
- " gdbus wait --session --timeout=300
@ADDRESSBOOK_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-addressbook-factory -r
&",
- " gdbus wait --session --timeout=1000
@ADDRESSBOOK_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
" fi",
"",
- " gdbus wait --session --timeout=300
@CALENDAR_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-calendar-factory -r &",
- " gdbus wait --session --timeout=1000
@CALENDAR_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
" fi",
"",
" /app/bin/evolution.bin \"$@\"",
@@ -290,9 +290,14 @@
{
"type": "script",
"commands": [
+ "# see https://gitlab.gnome.org/GNOME/glib/issues/1737";,
+ "# previous versions used milliseconds instead of seconds as
the timeout argument",
+ "(`pkg-config --atleast-version 2.60.1 gio-2.0` ||
`pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000",
+ "",
"sed -e \"s|\\@SOURCES_SERVICE\\@|$(pkg-config
--variable=sourcesdbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config
--variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\""
+ " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
+ " -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
],
"dest-filename": "flatpak-evolution-fix-service-names.sh"
}
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index 614ae693a9..ecdebc546c 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -263,22 +263,22 @@
" export GIO_USE_NETWORK_MONITOR=base",
" gsettings reset org.gnome.evolution-data-server
network-monitor-gio-name",
"",
- " gdbus wait --session --timeout=300 @SOURCES_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-source-registry &",
- " gdbus wait --session --timeout=1000
@SOURCES_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@SOURCES_SERVICE@",
" fi",
"",
- " gdbus wait --session --timeout=300
@ADDRESSBOOK_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-addressbook-factory -r
&",
- " gdbus wait --session --timeout=1000
@ADDRESSBOOK_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@ADDRESSBOOK_SERVICE@",
" fi",
"",
- " gdbus wait --session --timeout=300
@CALENDAR_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
" if [ \"${PIPESTATUS[0]}\" != \"0\" ]; then",
" /app/libexec/evolution-calendar-factory -r &",
- " gdbus wait --session --timeout=1000
@CALENDAR_SERVICE@",
+ " gdbus wait --session --timeout=1@TIMEOUTMULT@
@CALENDAR_SERVICE@",
" fi",
"",
" /app/bin/evolution.bin \"$@\"",
@@ -289,9 +289,14 @@
{
"type": "script",
"commands": [
+ "# see https://gitlab.gnome.org/GNOME/glib/issues/1737";,
+ "# previous versions used milliseconds instead of seconds as
the timeout argument",
+ "(`pkg-config --atleast-version 2.60.1 gio-2.0` ||
`pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000",
+ "",
"sed -e \"s|\\@SOURCES_SERVICE\\@|$(pkg-config
--variable=sourcesdbusservicename evolution-data-server-1.2)|\" \\",
" -e \"s|\\@ADDRESSBOOK_SERVICE\\@|$(pkg-config
--variable=addressbookdbusservicename evolution-data-server-1.2)|\" \\",
- " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\""
+ " -e \"s|\\@CALENDAR_SERVICE\\@|$(pkg-config
--variable=calendardbusservicename evolution-data-server-1.2)|\" \\",
+ " -e \"s|\\@TIMEOUTMULT\\@|${TIMEOUTMULT}|\""
],
"dest-filename": "flatpak-evolution-fix-service-names.sh"
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
