mirror of
https://github.com/terrapkg/packages.git
synced 2026-06-26 05:20:39 +00:00
fix: elementary-sideload elementary-terminal switchboard-plug-onlineaccounts (#357)
This commit is contained in:
madomado
@@ -48,7 +48,7 @@ desktop-file-validate \
|
||||
%{buildroot}/%{_datadir}/applications/%{appname}.desktop
|
||||
|
||||
appstream-util validate-relax --nonet \
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
|
||||
|
||||
%files -f %{appname}.lang
|
||||
@@ -60,7 +60,7 @@ appstream-util validate-relax --nonet \
|
||||
%{_datadir}/applications/%{appname}.desktop
|
||||
%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
|
||||
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
|
||||
%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
%{_datadir}/metainfo/%{appname}.metainfo.xml
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 435b841..321d7fb 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -32,18 +32,6 @@ i18n.merge_file (
|
||||
po_dir: join_paths(meson.source_root (), 'po', 'extra')
|
||||
)
|
||||
|
||||
-test (
|
||||
- 'Validate desktop file',
|
||||
- find_program('desktop-file-validate'),
|
||||
- args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop')
|
||||
-)
|
||||
-
|
||||
-test (
|
||||
- 'Validate open here desktop file',
|
||||
- find_program('desktop-file-validate'),
|
||||
- args: join_paths(meson.current_build_dir (), 'open-pantheon-terminal-here.desktop')
|
||||
-)
|
||||
-
|
||||
install_data(
|
||||
'pantheon_terminal_process_completion_notifications.fish',
|
||||
install_dir: join_paths(get_option('datadir'), 'fish', 'vendor_conf.d')
|
||||
@@ -10,9 +10,6 @@ License: LGPL-3.0
|
||||
URL: https://github.com/elementary/%{srcname}
|
||||
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
|
||||
|
||||
# drop upstream tests that only validate .desktop and appdata files
|
||||
Patch0: 00-drop-upstream-tests.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libappstream-glib
|
||||
|
||||
-94
@@ -1,94 +0,0 @@
|
||||
From b60f0458a23a2f76ad14d399f145e150e1ab82d3 Mon Sep 17 00:00:00 2001
|
||||
From: Bobby Rong <rjl931189261@126.com>
|
||||
Date: Sat, 23 Jul 2022 10:45:28 +0800
|
||||
Subject: [PATCH] build: support evolution-data-server 3.45
|
||||
|
||||
---
|
||||
meson.build | 3 +++
|
||||
src/Dialogs/CaldavDialog.vala | 23 +++++++++++++++++++++++
|
||||
2 files changed, 26 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 61fa00b5..72387657 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -44,6 +44,9 @@ switchboard_dep = dependency('switchboard-2.0')
|
||||
if edataserverui_dep.version().version_compare('>=3.39.2')
|
||||
add_project_arguments('--define=HAS_EDS_3_40', language: 'vala')
|
||||
endif
|
||||
+if edataserverui_dep.version().version_compare('>=3.45.1')
|
||||
+ add_project_arguments('--define=HAS_EDS_3_46', language: 'vala')
|
||||
+endif
|
||||
|
||||
gresource = gnome.compile_resources(
|
||||
'gresource',
|
||||
diff --git a/src/Dialogs/CaldavDialog.vala b/src/Dialogs/CaldavDialog.vala
|
||||
index b658b266..c6c934b2 100644
|
||||
--- a/src/Dialogs/CaldavDialog.vala
|
||||
+++ b/src/Dialogs/CaldavDialog.vala
|
||||
@@ -397,7 +397,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window {
|
||||
col.backend_name = "caldav";
|
||||
|
||||
unowned var webdav = (E.SourceWebdav)source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
|
||||
+#if HAS_EDS_3_46
|
||||
+ webdav.uri = GLib.Uri.parse (url_entry.text, GLib.UriFlags.NONE);
|
||||
+#else
|
||||
webdav.soup_uri = new Soup.URI (url_entry.text);
|
||||
+#endif
|
||||
webdav.calendar_auto_schedule = true;
|
||||
|
||||
unowned var auth = (E.SourceAuthentication)source.get_extension (E.SOURCE_EXTENSION_AUTHENTICATION);
|
||||
@@ -473,7 +477,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window {
|
||||
string? webdav_host = null;
|
||||
if (source.has_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND)) {
|
||||
unowned var webdav_extension = (E.SourceWebdav) source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
|
||||
+#if HAS_EDS_3_46
|
||||
+ webdav_host = webdav_extension.uri.get_host ();
|
||||
+#else
|
||||
webdav_host = webdav_extension.soup_uri.host;
|
||||
+#endif
|
||||
}
|
||||
|
||||
foreach (unowned E.WebDAVDiscoveredSource? disc_source in discovered_sources) {
|
||||
@@ -486,7 +494,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window {
|
||||
};
|
||||
|
||||
unowned var webdav = (E.SourceWebdav) e_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
|
||||
+#if HAS_EDS_3_46
|
||||
+ webdav.uri = GLib.Uri.parse (disc_source.href, GLib.UriFlags.NONE);
|
||||
+#else
|
||||
webdav.soup_uri = new Soup.URI (disc_source.href);
|
||||
+#endif
|
||||
webdav.color = disc_source.color;
|
||||
|
||||
switch (only_supports) {
|
||||
@@ -550,10 +562,17 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window {
|
||||
|
||||
if (collection_source.has_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND)) {
|
||||
unowned var webdav_extension = (E.SourceWebdav) collection_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
|
||||
+#if HAS_EDS_3_46
|
||||
+ url_entry.text = webdav_extension.uri.to_string ();
|
||||
+
|
||||
+ if (webdav_extension.uri.get_user () != null && webdav_extension.uri.get_user () != "") {
|
||||
+ url_entry.text = url_entry.text.replace (webdav_extension.uri.get_user () + "@", "");
|
||||
+#else
|
||||
url_entry.text = webdav_extension.soup_uri.to_string (false);
|
||||
|
||||
if (webdav_extension.soup_uri.user != null && webdav_extension.soup_uri.user != "") {
|
||||
url_entry.text = url_entry.text.replace (webdav_extension.soup_uri.user + "@", "");
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -589,7 +608,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window {
|
||||
authentication_extension.user = username_entry.text;
|
||||
|
||||
unowned var webdav_extension = (E.SourceWebdav) collection_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
|
||||
+#if HAS_EDS_3_46
|
||||
+ webdav_extension.uri = GLib.Uri.parse (url_entry.text, GLib.UriFlags.NONE);
|
||||
+#else
|
||||
webdav_extension.soup_uri = new Soup.URI (url_entry.text);
|
||||
+#endif
|
||||
webdav_extension.calendar_auto_schedule = true;
|
||||
|
||||
unowned var offline_extension = (E.SourceOffline) collection_source.get_extension (E.SOURCE_EXTENSION_OFFLINE);
|
||||
+2
-4
@@ -18,8 +18,6 @@ BuildRequires: libappstream-glib
|
||||
BuildRequires: meson
|
||||
BuildRequires: vala
|
||||
|
||||
Patch0: b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch
|
||||
|
||||
BuildRequires: pkgconfig(camel-1.2)
|
||||
BuildRequires: pkgconfig(glib-2.0)
|
||||
BuildRequires: pkgconfig(gobject-2.0)
|
||||
@@ -71,8 +69,8 @@ appstream-util validate-relax --nonet \
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 17 2022 windowsboy111 <wboy111@outlook.com> - 6.5.1-1
|
||||
- new version
|
||||
* Thu Nov 17 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.5.1-1
|
||||
- New version
|
||||
|
||||
* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
|
||||
- Repackaged for Terra
|
||||
|
||||
Reference in New Issue
Block a user