GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 4548a6f9 authored by Milan Crha's avatar Milan Crha

[Flatpak] Cover changes in 'gdbus wait' timeout argument units

Related to GNOME/glib#1737
parent 9b0d2916
......@@ -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"
}
......
......@@ -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"
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment