From 81799f615d2955571a3704fa507310d3f02fdebb Mon Sep 17 00:00:00 2001 From: naxuroqa Date: Wed, 24 Oct 2018 09:09:50 +0200 Subject: [PATCH 1/3] VENOM-412: Change application id * Change application id to "com.github.naxuroqa.venom" * Adapt flatpak manifest * Redraw venom-symbolic.svg * Minify svgs --- Dockerfile | 8 +++---- ...venom.yml => com.github.naxuroqa.venom.yml | 22 ++++++++----------- ...n => com.github.naxuroqa.venom.desktop.in} | 2 +- ...n => com.github.naxuroqa.venom.service.in} | 2 +- .../symbolic/chat.tox.venom-symbolic.svg | 11 ---------- .../com.github.naxuroqa.venom-symbolic.svg | 1 + data/meson.build | 10 ++++----- src/core/Application.vala | 2 +- src/core/R.vala | 4 ++-- src/icons/icons.gresource.xml | 2 +- src/icons/scalable/apps/venom-symbolic.svg | 12 +--------- src/icons/scalable/status/busy-symbolic.svg | 12 +--------- .../scalable/status/conference-symbolic.svg | 5 +---- src/icons/scalable/status/friend-symbolic.svg | 6 +---- src/icons/scalable/status/idle-symbolic.svg | 13 +---------- .../scalable/status/offline-symbolic.svg | 12 +--------- src/icons/scalable/status/online-symbolic.svg | 12 +--------- src/ui/venom.gresource.xml | 4 ++-- src/view/AddContactWidget.vala | 2 +- src/view/ApplicationWindow.vala | 4 ++-- src/view/ConferenceInfoWidget.vala | 2 +- src/view/ConferenceInviteEntry.vala | 2 +- src/view/ConferenceWindow.vala | 2 +- src/view/ContactListEntry.vala | 2 +- src/view/ContactListEntryCompact.vala | 2 +- src/view/ContactListWidget.vala | 4 ++-- src/view/ConversationWindow.vala | 2 +- src/view/CreateGroupchatWidget.vala | 2 +- src/view/ErrorWidget.vala | 2 +- src/view/FileTransferEntry.vala | 2 +- src/view/FileTransferEntryInline.vala | 2 +- src/view/FileTransferWidget.vala | 2 +- src/view/FriendInfoWidget.vala | 2 +- src/view/FriendRequestWidget.vala | 2 +- src/view/MessageWidget.vala | 2 +- src/view/NodeWidget.vala | 2 +- src/view/PeerEntry.vala | 4 ++-- src/view/SettingsWidget.vala | 2 +- src/view/UserInfoWidget.vala | 2 +- src/view/WelcomeWidget.vala | 2 +- 40 files changed, 59 insertions(+), 131 deletions(-) rename chat.tox.venom.yml => com.github.naxuroqa.venom.yml (81%) rename data/{chat.tox.venom.desktop.in => com.github.naxuroqa.venom.desktop.in} (90%) rename data/{chat.tox.venom.service.in => com.github.naxuroqa.venom.service.in} (65%) delete mode 100644 data/icons/symbolic/chat.tox.venom-symbolic.svg create mode 100644 data/icons/symbolic/com.github.naxuroqa.venom-symbolic.svg diff --git a/Dockerfile b/Dockerfile index 3be4119..18d4357 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:sid +FROM ubuntu:latest RUN \ apt-get update && \ @@ -22,9 +22,9 @@ RUN \ RUN rm -rf /var/lib/apt/lists/* -RUN wget "https://github.com/TokTok/c-toxcore/archive/v0.2.2.tar.gz" && \ - tar -xzf v0.2.2.tar.gz && \ - cd c-toxcore-0.2.2 && \ +RUN wget "https://github.com/TokTok/c-toxcore/archive/v0.2.8.tar.gz" && \ + tar -xzf v0.2.8.tar.gz && \ + cd c-toxcore-0.2.8 && \ cmake -DCMAKE_INSTALL_PREFIX=/usr && \ make && \ make install && \ diff --git a/chat.tox.venom.yml b/com.github.naxuroqa.venom.yml similarity index 81% rename from chat.tox.venom.yml rename to com.github.naxuroqa.venom.yml index 4e0ba34..1bc0f46 100644 --- a/chat.tox.venom.yml +++ b/com.github.naxuroqa.venom.yml @@ -1,10 +1,9 @@ -app-id: chat.tox.venom +app-id: com.github.naxuroqa.venom runtime: org.gnome.Platform runtime-version: '3.28' sdk: org.gnome.Sdk command: venom -tags: [nightly] -desktop-file-name-prefix: (Nightly) +copy-icon: true finish-args: - --share=network - --socket=x11 @@ -17,10 +16,8 @@ finish-args: - --filesystem=xdg-data/pixmaps/faces:ro - --filesystem=xdg-download build-options: - cflags: -O2 -g - cxxflags: -O2 -g - env: - V: '1' + cflags: -O3 + cxxflags: -O3 modules: - name: libgee build-options: @@ -46,8 +43,8 @@ modules: sources: - type: git url: https://github.com/toktok/c-toxcore - tag: v0.2.2 - commit: 2824daf74a6d2bd60ebaf387a30f1b7719b6b67c + tag: v0.2.8 + commit: 3f35a84968f100e1e6d3c9df467fd3c82a9ebb13 - name: enchant sources: - type: archive @@ -56,14 +53,13 @@ modules: - name: gspell sources: - type: archive - url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.0.tar.xz - sha256: 1b7fc2c5b84ede43bc52d513f0601238af92b572a42b19363da6d067fb529345 + url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz + sha256: 819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5 - name: venom builddir: true buildsystem: meson config-opts: - - --buildtype=debugoptimized + - --buildtype=release sources: - type: git url: https://github.com/naxuroqa/Venom - branch: develop diff --git a/data/chat.tox.venom.desktop.in b/data/com.github.naxuroqa.venom.desktop.in similarity index 90% rename from data/chat.tox.venom.desktop.in rename to data/com.github.naxuroqa.venom.desktop.in index 3de1506..25b7e37 100644 --- a/data/chat.tox.venom.desktop.in +++ b/data/com.github.naxuroqa.venom.desktop.in @@ -3,7 +3,7 @@ Name=Venom Comment=A modern Tox client for the Linux desktop Keywords=tox;instant messaging;video chat; Exec=venom -Icon=chat.tox.venom-symbolic +Icon=com.github.naxuroqa.venom-symbolic Terminal=false Type=Application Categories=InstantMessaging;Network; diff --git a/data/chat.tox.venom.service.in b/data/com.github.naxuroqa.venom.service.in similarity index 65% rename from data/chat.tox.venom.service.in rename to data/com.github.naxuroqa.venom.service.in index cb144ca..7abb2e1 100644 --- a/data/chat.tox.venom.service.in +++ b/data/com.github.naxuroqa.venom.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=chat.tox.venom +Name=com.github.naxuroqa.venom Exec=@bindir@/venom --gapplication-service diff --git a/data/icons/symbolic/chat.tox.venom-symbolic.svg b/data/icons/symbolic/chat.tox.venom-symbolic.svg deleted file mode 100644 index 46b6996..0000000 --- a/data/icons/symbolic/chat.tox.venom-symbolic.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/data/icons/symbolic/com.github.naxuroqa.venom-symbolic.svg b/data/icons/symbolic/com.github.naxuroqa.venom-symbolic.svg new file mode 100644 index 0000000..f8a85e6 --- /dev/null +++ b/data/icons/symbolic/com.github.naxuroqa.venom-symbolic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/data/meson.build b/data/meson.build index 1fea8fd..d1641ee 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,6 @@ i18n.merge_file( - input: 'chat.tox.venom.desktop.in', - output: 'chat.tox.venom.desktop', + input: 'com.github.naxuroqa.venom.desktop.in', + output: 'com.github.naxuroqa.venom.desktop', type: 'desktop', po_dir: '../po', install: true, @@ -10,14 +10,14 @@ i18n.merge_file( service_conf = configuration_data() service_conf.set('bindir', join_paths(get_option('prefix'), get_option('bindir'))) configure_file( - input: 'chat.tox.venom.service.in', - output: 'chat.tox.venom.service', + input: 'com.github.naxuroqa.venom.service.in', + output: 'com.github.naxuroqa.venom.service', configuration: service_conf, install: true, install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services') ) install_data( - 'icons/symbolic/chat.tox.venom-symbolic.svg', + 'icons/symbolic/com.github.naxuroqa.venom-symbolic.svg', install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps'), ) diff --git a/src/core/Application.vala b/src/core/Application.vala index 1c21803..362eb11 100644 --- a/src/core/Application.vala +++ b/src/core/Application.vala @@ -123,7 +123,7 @@ namespace Venom { var builder = new Gtk.Builder(); try { - builder.add_from_resource("/chat/tox/venom/ui/app_menu.ui"); + builder.add_from_resource("/com/github/naxuroqa/venom/ui/app_menu.ui"); } catch (Error e) { logger.f("Loading app menu failed: " + e.message); assert_not_reached(); diff --git a/src/core/R.vala b/src/core/R.vala index c917db4..d9ac2d2 100644 --- a/src/core/R.vala +++ b/src/core/R.vala @@ -80,9 +80,9 @@ namespace Venom { public string db_filename() { return GLib.Path.build_filename(user_config_dir, "tox", profile_name + ".db"); } public string tox_data_filename() { return GLib.Path.build_filename(user_config_dir, "tox", profile_name + ".data"); } public string accels_filename() { return GLib.Path.build_filename(user_config_dir, "tox", profile_name + ".accels"); } - public string icons_prefix() { return "/chat/tox/venom/icons/scalable/status/"; } + public string icons_prefix() { return "/com/github/naxuroqa/venom/icons/scalable/status/"; } public string icons_suffix() { return ".svg"; } - public string app_id() { return "chat.tox.venom"; } + public string app_id() { return "com.github.naxuroqa.venom"; } public string tox_about() { return "https://tox.chat/about.html"; } public string tox_get_involved() { return "https://wiki.tox.chat/users/contributing"; } } diff --git a/src/icons/icons.gresource.xml b/src/icons/icons.gresource.xml index 38abb64..7432ae3 100644 --- a/src/icons/icons.gresource.xml +++ b/src/icons/icons.gresource.xml @@ -1,6 +1,6 @@ - + scalable/apps/venom-symbolic.svg scalable/status/busy-symbolic.svg scalable/status/idle-symbolic.svg diff --git a/src/icons/scalable/apps/venom-symbolic.svg b/src/icons/scalable/apps/venom-symbolic.svg index 46b6996..f8a85e6 100644 --- a/src/icons/scalable/apps/venom-symbolic.svg +++ b/src/icons/scalable/apps/venom-symbolic.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/src/icons/scalable/status/busy-symbolic.svg b/src/icons/scalable/status/busy-symbolic.svg index 6b46618..f1730b5 100644 --- a/src/icons/scalable/status/busy-symbolic.svg +++ b/src/icons/scalable/status/busy-symbolic.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/src/icons/scalable/status/conference-symbolic.svg b/src/icons/scalable/status/conference-symbolic.svg index decf3b1..d0ea215 100644 --- a/src/icons/scalable/status/conference-symbolic.svg +++ b/src/icons/scalable/status/conference-symbolic.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/src/icons/scalable/status/friend-symbolic.svg b/src/icons/scalable/status/friend-symbolic.svg index 3dfa6f5..57de0cf 100644 --- a/src/icons/scalable/status/friend-symbolic.svg +++ b/src/icons/scalable/status/friend-symbolic.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/src/icons/scalable/status/idle-symbolic.svg b/src/icons/scalable/status/idle-symbolic.svg index b241d8f..e631bb5 100644 --- a/src/icons/scalable/status/idle-symbolic.svg +++ b/src/icons/scalable/status/idle-symbolic.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/src/icons/scalable/status/offline-symbolic.svg b/src/icons/scalable/status/offline-symbolic.svg index f1f00ea..38bd39a 100644 --- a/src/icons/scalable/status/offline-symbolic.svg +++ b/src/icons/scalable/status/offline-symbolic.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/src/icons/scalable/status/online-symbolic.svg b/src/icons/scalable/status/online-symbolic.svg index 69838cc..8f96d76 100644 --- a/src/icons/scalable/status/online-symbolic.svg +++ b/src/icons/scalable/status/online-symbolic.svg @@ -1,11 +1 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/src/ui/venom.gresource.xml b/src/ui/venom.gresource.xml index 9fd0113..54069ff 100644 --- a/src/ui/venom.gresource.xml +++ b/src/ui/venom.gresource.xml @@ -18,7 +18,7 @@ along with Venom. If not, see . --> - + add_contact_widget.ui app_menu.ui application_window.ui @@ -45,7 +45,7 @@ along with Venom. If not, see . user_status_menu.ui welcome_widget.ui - + custom.css diff --git a/src/view/AddContactWidget.vala b/src/view/AddContactWidget.vala index 087443d..0ce6681 100644 --- a/src/view/AddContactWidget.vala +++ b/src/view/AddContactWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/add_contact_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/add_contact_widget.ui")] public class AddContactWidget : Gtk.Box { [GtkChild] private Gtk.Entry contact_id; [GtkChild] private Gtk.TextView contact_message; diff --git a/src/view/ApplicationWindow.vala b/src/view/ApplicationWindow.vala index 5b77045..8cee339 100644 --- a/src/view/ApplicationWindow.vala +++ b/src/view/ApplicationWindow.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/application_window.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/application_window.ui")] public class ApplicationWindow : Gtk.ApplicationWindow, ContactListWidgetCallback { private const GLib.ActionEntry win_entries[] = @@ -205,7 +205,7 @@ namespace Venom { private void init_widgets() { var screen = Gdk.Screen.get_default(); var css_provider = new Gtk.CssProvider(); - css_provider.load_from_resource("/chat/tox/venom/css/custom.css"); + css_provider.load_from_resource("/com/github/naxuroqa/venom/css/custom.css"); Gtk.StyleContext.add_provider_for_screen(screen, css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); var gtk_settings = Gtk.Settings.get_default(); diff --git a/src/view/ConferenceInfoWidget.vala b/src/view/ConferenceInfoWidget.vala index 7bfd532..10e79ce 100644 --- a/src/view/ConferenceInfoWidget.vala +++ b/src/view/ConferenceInfoWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/conference_info_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/conference_info_widget.ui")] public class ConferenceInfoWidget : Gtk.Box { [GtkChild] private Gtk.Entry title; [GtkChild] private Gtk.ListBox peers; diff --git a/src/view/ConferenceInviteEntry.vala b/src/view/ConferenceInviteEntry.vala index f19aa26..a583b84 100644 --- a/src/view/ConferenceInviteEntry.vala +++ b/src/view/ConferenceInviteEntry.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/conference_invite_entry.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/conference_invite_entry.ui")] public class ConferenceInviteEntry : Gtk.ListBoxRow { private ILogger logger; private ConferenceInvite invite; diff --git a/src/view/ConferenceWindow.vala b/src/view/ConferenceWindow.vala index bb5ec0d..3983e5d 100644 --- a/src/view/ConferenceWindow.vala +++ b/src/view/ConferenceWindow.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/conference_window.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/conference_window.ui")] public class ConferenceWindow : Gtk.Box { [GtkChild] private Gtk.Image user_image; [GtkChild] private Gtk.TextView text_view; diff --git a/src/view/ContactListEntry.vala b/src/view/ContactListEntry.vala index ef6b645..c3fd044 100644 --- a/src/view/ContactListEntry.vala +++ b/src/view/ContactListEntry.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/contact_list_entry.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/contact_list_entry.ui")] public class ContactListEntry : Gtk.ListBoxRow { [GtkChild] private Gtk.Label contact_name; [GtkChild] private Gtk.Label contact_status; diff --git a/src/view/ContactListEntryCompact.vala b/src/view/ContactListEntryCompact.vala index 66901f4..96cd64e 100644 --- a/src/view/ContactListEntryCompact.vala +++ b/src/view/ContactListEntryCompact.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/contact_list_entry_compact.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/contact_list_entry_compact.ui")] public class ContactListEntryCompact : Gtk.ListBoxRow { [GtkChild] private Gtk.Label contact_name; [GtkChild] private Gtk.Label contact_status; diff --git a/src/view/ContactListWidget.vala b/src/view/ContactListWidget.vala index 855a1fe..eb1913d 100644 --- a/src/view/ContactListWidget.vala +++ b/src/view/ContactListWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/contact_list_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/contact_list_widget.ui")] public class ContactListWidget : Gtk.Box { private ILogger logger; private ContactListViewModel view_model; @@ -48,7 +48,7 @@ namespace Venom { app_window.user_info_box.pack_start(top_bar_box, true, true); - var builder = new Gtk.Builder.from_resource("/chat/tox/venom/ui/user_status_menu.ui"); + var builder = new Gtk.Builder.from_resource("/com/github/naxuroqa/venom/ui/user_status_menu.ui"); var menu_model = builder.get_object("menu") as GLib.MenuModel; user_status_menu.set_menu_model(menu_model); diff --git a/src/view/ConversationWindow.vala b/src/view/ConversationWindow.vala index 0bc935e..28c50ee 100644 --- a/src/view/ConversationWindow.vala +++ b/src/view/ConversationWindow.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/conversation_window.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/conversation_window.ui")] public class ConversationWindow : Gtk.Box { [GtkChild] private Gtk.Image user_image; [GtkChild] private Gtk.TextView text_view; diff --git a/src/view/CreateGroupchatWidget.vala b/src/view/CreateGroupchatWidget.vala index a94cb55..2a391e6 100644 --- a/src/view/CreateGroupchatWidget.vala +++ b/src/view/CreateGroupchatWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/create_groupchat_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/create_groupchat_widget.ui")] public class CreateGroupchatWidget : Gtk.Box { [GtkChild] private Gtk.Entry title; [GtkChild] private Gtk.Button create; diff --git a/src/view/ErrorWidget.vala b/src/view/ErrorWidget.vala index 977708c..39c18fb 100644 --- a/src/view/ErrorWidget.vala +++ b/src/view/ErrorWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/error_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/error_widget.ui")] public class ErrorWidget : Gtk.Box { [GtkChild] private Gtk.Stack stack; [GtkChild] private Gtk.Label message; diff --git a/src/view/FileTransferEntry.vala b/src/view/FileTransferEntry.vala index c62bd04..e7a5c11 100644 --- a/src/view/FileTransferEntry.vala +++ b/src/view/FileTransferEntry.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/file_transfer_entry.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/file_transfer_entry.ui")] public class FileTransferEntry : Gtk.ListBoxRow { [GtkChild] private Gtk.Label description; [GtkChild] private Gtk.ProgressBar progress; diff --git a/src/view/FileTransferEntryInline.vala b/src/view/FileTransferEntryInline.vala index 6c89b6c..8f64519 100644 --- a/src/view/FileTransferEntryInline.vala +++ b/src/view/FileTransferEntryInline.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/file_transfer_entry_inline.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/file_transfer_entry_inline.ui")] public class FileTransferEntryInline : Gtk.ListBoxRow { [GtkChild] private Gtk.Label description; [GtkChild] private Gtk.ProgressBar progress; diff --git a/src/view/FileTransferWidget.vala b/src/view/FileTransferWidget.vala index c901ac3..9e8caa9 100644 --- a/src/view/FileTransferWidget.vala +++ b/src/view/FileTransferWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/file_transfer_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/file_transfer_widget.ui")] public class FileTransferWidget : Gtk.Box { private ILogger logger; private ObservableList transfers; diff --git a/src/view/FriendInfoWidget.vala b/src/view/FriendInfoWidget.vala index 0d17777..2534f04 100644 --- a/src/view/FriendInfoWidget.vala +++ b/src/view/FriendInfoWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/friend_info_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/friend_info_widget.ui")] public class FriendInfoWidget : Gtk.Box { [GtkChild] private Gtk.Label username; [GtkChild] private Gtk.Label statusmessage; diff --git a/src/view/FriendRequestWidget.vala b/src/view/FriendRequestWidget.vala index f0113b8..b392e85 100644 --- a/src/view/FriendRequestWidget.vala +++ b/src/view/FriendRequestWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/friend_request_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/friend_request_widget.ui")] public class FriendRequestWidget : Gtk.ListBoxRow { private ILogger logger; private FriendRequest friend_request; diff --git a/src/view/MessageWidget.vala b/src/view/MessageWidget.vala index 4dc246b..86a5a28 100644 --- a/src/view/MessageWidget.vala +++ b/src/view/MessageWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/message_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/message_widget.ui")] public class MessageWidget : Gtk.ListBoxRow { [GtkChild] private Gtk.Label sender; [GtkChild] private Gtk.Image sender_image; diff --git a/src/view/NodeWidget.vala b/src/view/NodeWidget.vala index ed4423c..5fd61fb 100644 --- a/src/view/NodeWidget.vala +++ b/src/view/NodeWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/node_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/node_widget.ui")] public class NodeWidget : Gtk.ListBoxRow { [GtkChild] private Gtk.Label host; diff --git a/src/view/PeerEntry.vala b/src/view/PeerEntry.vala index b61bbe2..05ca43b 100644 --- a/src/view/PeerEntry.vala +++ b/src/view/PeerEntry.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/peer_entry.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/peer_entry.ui")] public class PeerEntry : Gtk.ListBoxRow { [GtkChild] private Gtk.Image peer_image; [GtkChild] private Gtk.Label peer_name; @@ -46,7 +46,7 @@ namespace Venom { logger.d("PeerEntry destroyed."); } } - [GtkTemplate(ui = "/chat/tox/venom/ui/peer_entry_compact.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/peer_entry_compact.ui")] public class PeerEntryCompact : Gtk.ListBoxRow { [GtkChild] private Gtk.Image peer_image; [GtkChild] private Gtk.Label peer_name; diff --git a/src/view/SettingsWidget.vala b/src/view/SettingsWidget.vala index a7ef296..f1e1129 100644 --- a/src/view/SettingsWidget.vala +++ b/src/view/SettingsWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/settings_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/settings_widget.ui")] public class SettingsWidget : Gtk.Box { private ISettingsDatabase settingsDatabase; private IDhtNodeDatabase nodeDatabase; diff --git a/src/view/UserInfoWidget.vala b/src/view/UserInfoWidget.vala index 6a475bd..9e973ef 100644 --- a/src/view/UserInfoWidget.vala +++ b/src/view/UserInfoWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/user_info_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/user_info_widget.ui")] public class UserInfoWidget : Gtk.Box { [GtkChild] private Gtk.Entry entry_username; [GtkChild] private Gtk.Entry entry_statusmessage; diff --git a/src/view/WelcomeWidget.vala b/src/view/WelcomeWidget.vala index c2f40e3..3c1eecf 100644 --- a/src/view/WelcomeWidget.vala +++ b/src/view/WelcomeWidget.vala @@ -20,7 +20,7 @@ */ namespace Venom { - [GtkTemplate(ui = "/chat/tox/venom/ui/welcome_widget.ui")] + [GtkTemplate(ui = "/com/github/naxuroqa/venom/ui/welcome_widget.ui")] public class WelcomeWidget : Gtk.Box { private ILogger logger; private GLib.Rand rand = new GLib.Rand(); From ec7a0a3ffa9c9913853c78fd95ca1069e28c96d6 Mon Sep 17 00:00:00 2001 From: naxuroqa Date: Wed, 24 Oct 2018 12:07:07 +0200 Subject: [PATCH 2/3] VENOM-412: Add script to create flatpak bundle --- com.github.naxuroqa.venom.yml | 7 ++++--- data/meson.build | 4 ++-- scripts/flatpak-bundle.sh | 8 ++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100755 scripts/flatpak-bundle.sh diff --git a/com.github.naxuroqa.venom.yml b/com.github.naxuroqa.venom.yml index 1bc0f46..7275606 100644 --- a/com.github.naxuroqa.venom.yml +++ b/com.github.naxuroqa.venom.yml @@ -52,9 +52,10 @@ modules: sha256: 086f37cdecd42eacd0e1dc291f5410d9ca2c5ed2cd9cd9367729e3d2d18a8550 - name: gspell sources: - - type: archive - url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.1.tar.xz - sha256: 819a1d23c7603000e73f5e738bdd284342e0cd345fb0c7650999c31ec741bbe5 + - type: git + url: https://gitlab.gnome.org/GNOME/gspell + tag: 1.8.1 + commit: ba03499234037861e01ce1e83075e8a32b9790f3 - name: venom builddir: true buildsystem: meson diff --git a/data/meson.build b/data/meson.build index d1641ee..daeacbd 100644 --- a/data/meson.build +++ b/data/meson.build @@ -19,5 +19,5 @@ configure_file( install_data( 'icons/symbolic/com.github.naxuroqa.venom-symbolic.svg', - install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps'), -) + install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps') +) \ No newline at end of file diff --git a/scripts/flatpak-bundle.sh b/scripts/flatpak-bundle.sh new file mode 100755 index 0000000..fbc79ea --- /dev/null +++ b/scripts/flatpak-bundle.sh @@ -0,0 +1,8 @@ +#! /bin/sh +set -e + +flatpak-builder --stop-at=venom --repo=repo app com.github.naxuroqa.venom.yml +flatpak build app meson --prefix=/app _build +flatpak build app ninja -C _build install +flatpak-builder --finish-only --repo=repo app com.github.naxuroqa.venom.yml +flatpak build-bundle repo com.github.naxuroqa.venom.x86_64.flatpak --runtime-repo=https://dl.flathub.org/repo/flathub.flatpakrepo com.github.naxuroqa.venom From acb1783cad9e34cf61d893ef788e17a133020452 Mon Sep 17 00:00:00 2001 From: naxuroqa Date: Wed, 24 Oct 2018 14:59:07 +0200 Subject: [PATCH 3/3] Release-0.4.1: Raise version number --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 00e593d..5f6f94b 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('venom', ['vala', 'c'], license: 'GPL3+', - version: '0.4.0' + version: '0.4.1' ) i18n = import('i18n')