Merge remote-tracking branch 'release-0.4.1'

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 && \

chat.tox.venom.yml → 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,24 +43,24 @@ 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
         url: https://github.com/AbiWord/enchant/releases/download/v2.1.3/enchant-2.1.3.tar.gz
         sha256: 086f37cdecd42eacd0e1dc291f5410d9ca2c5ed2cd9cd9367729e3d2d18a8550
   - name: gspell
     sources:
-      - type: archive
-        url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.0.tar.xz
-        sha256: 1b7fc2c5b84ede43bc52d513f0601238af92b572a42b19363da6d067fb529345
+      - type: git
+        url: https://gitlab.gnome.org/GNOME/gspell
+        tag: 1.8.1
+        commit: ba03499234037861e01ce1e83075e8a32b9790f3
   - name: venom
     builddir: true
     buildsystem: meson
     config-opts:
-      - --buildtype=debugoptimized
+      - --buildtype=release
     sources:
       - type: git
         url: https://github.com/naxuroqa/Venom
-        branch: develop

data/chat.tox.venom.desktop.in → 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;

data/chat.tox.venom.service.in → 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

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',
-			install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps'),
-)
+			'icons/symbolic/com.github.naxuroqa.venom-symbolic.svg',
+			install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps')
+)

meson.build

@@ -1,6 +1,6 @@
 project('venom', ['vala', 'c'],
 			license: 'GPL3+',
-			version: '0.4.0'
+			version: '0.4.1'
 )
 
 i18n = import('i18n')

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

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();

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"; }
     }

src/icons/icons.gresource.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/chat/tox/venom/icons">
+  <gresource prefix="/com/github/naxuroqa/venom/icons">
     <file compressed="true">scalable/apps/venom-symbolic.svg</file>
     <file compressed="true">scalable/status/busy-symbolic.svg</file>
     <file compressed="true">scalable/status/idle-symbolic.svg</file>

src/ui/venom.gresource.xml

@@ -18,7 +18,7 @@ along with Venom.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
 <gresources>
-  <gresource prefix="/chat/tox/venom/ui">
+  <gresource prefix="/com/github/naxuroqa/venom/ui">
     <file compressed="true" preprocess="xml-stripblanks">add_contact_widget.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">app_menu.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">application_window.ui</file>
@@ -45,7 +45,7 @@ along with Venom.  If not, see <http://www.gnu.org/licenses/>.
     <file compressed="true" preprocess="xml-stripblanks">user_status_menu.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">welcome_widget.ui</file>
   </gresource>
-  <gresource prefix="/chat/tox/venom/css">
+  <gresource prefix="/com/github/naxuroqa/venom/css">
     <file compressed="true">custom.css</file>
   </gresource>
 </gresources>

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;

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();

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;

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;

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;

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;

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;