Skip to content

Commit eb931f5

Browse files
committed
Merge branch 'release-0.5.0'
2 parents 688ee75 + 69debf5 commit eb931f5

File tree

120 files changed

+5490
-2470
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+5490
-2470
lines changed

.github/banner/venom.svg

Lines changed: 1 addition & 0 deletions
Loading

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN \
1111
libopus-dev \
1212
libsodium-dev \
1313
libsoup2.4-dev \
14-
libsqlite3-dev \
14+
libsqlcipher-dev \
1515
libvpx-dev \
1616
libgee-0.8-dev \
1717
libgspell-1-dev \

README.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1-
Venom
1+
![Venom](.github/banner/venom.svg)
22
=====
33

4-
[![Build Status](https://travis-ci.org/naxuroqa/Venom.png?branch=develop)](https://travis-ci.org/naxuroqa/Venom) [![tip for next commit](http://tip4commit.com/projects/634.svg)](http://tip4commit.com/projects/634) [![codecov](https://codecov.io/gh/naxuroqa/Venom/branch/develop/graph/badge.svg)](https://codecov.io/gh/naxuroqa/Venom)
4+
[![Build Status](https://travis-ci.org/naxuroqa/Venom.png?branch=develop)](https://travis-ci.org/naxuroqa/Venom)
5+
![GitHub](https://img.shields.io/github/license/naxuroqa/venom.svg)
6+
![GitHub release](https://img.shields.io/github/release/naxuroqa/venom.svg)
7+
![GitHub last commit](https://img.shields.io/github/last-commit/naxuroqa/venom.svg)
8+
[![tip for next commit](http://tip4commit.com/projects/634.svg)](http://tip4commit.com/projects/634)
9+
[![codecov](https://codecov.io/gh/naxuroqa/Venom/branch/develop/graph/badge.svg)](https://codecov.io/gh/naxuroqa/Venom)
10+
511

612
###### a modern [Tox](https://github.com/TokTok/c-toxcore) client for the GNU/Linux desktop
713

814
Features
915
--------
1016

17+
* Encrypted profiles
1118
* Secure, private messaging
1219
* Read receipts
1320
* Contact aliases
@@ -19,6 +26,7 @@ Features
1926
* Socks5 Proxy support
2027
* Spell checking
2128
* Sound notifications
29+
* [Faux offline messaging](https://wiki.tox.chat/users/offline_messaging)
2230

2331
Roadmap
2432
-------
@@ -41,7 +49,7 @@ Dependencies
4149
* `libgee >= 0.20`
4250
* `libsoup-2.4`
4351
* `gspell >= 1.8`
44-
* `sqlite3`
52+
* `sqlcipher`
4553
* `toxcore >= 0.2`
4654

4755
Build-Dependencies

com.github.naxuroqa.venom.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,31 @@ finish-args:
1515
- --talk-name=org.freedesktop.Notifications
1616
- --filesystem=xdg-data/pixmaps/faces:ro
1717
- --filesystem=xdg-download
18+
cleanup-commands:
19+
- rm -rf /app/bin/{DHT_bootstrap,gspell-app1,enchant*}
20+
- rm -rf /app/include
21+
- rm -rf /app/lib/{*.a,*.la,girepository-1.0,pkgconfig}
22+
- rm -rf /app/lib/enchant-2/{*.a,*.la}
23+
- rm -rf /app/share/{vala,man,gir-1.0}
1824
build-options:
19-
cflags: -O3
25+
cflags: -O3 -DSQLITE_HAS_CODEC
2026
cxxflags: -O3
2127
modules:
22-
- name: libgee
23-
build-options:
24-
env:
25-
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR: /app/share/gir-1.0
26-
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR: /app/lib/girepository-1.0
28+
- name: sqlcipher
29+
rm-configure: true
30+
config-opts:
31+
- --enable-tempstore=yes
32+
- --disable-tcl
2733
sources:
2834
- type: git
29-
url: https://gitlab.gnome.org/GNOME/libgee
30-
tag: 0.20.1
31-
commit: 57e4c8a08d61ab77bbec310a3a1621e6bf3111cb
35+
url: https://github.com/sqlcipher/sqlcipher
36+
tag: v3.4.2
37+
commit: c6f709fca81c910ba133aaf6330c28e01ccfe5f8
38+
disable-fsckobjects: true
39+
- type: script
40+
dest-filename: autogen.sh
41+
commands:
42+
- AUTOMAKE="automake --foreign" autoreconf -vfi
3243
- name: libsodium
3344
sources:
3445
- type: git
@@ -45,6 +56,16 @@ modules:
4556
url: https://github.com/toktok/c-toxcore
4657
tag: v0.2.8
4758
commit: 3f35a84968f100e1e6d3c9df467fd3c82a9ebb13
59+
- name: libgee
60+
build-options:
61+
env:
62+
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR: /app/share/gir-1.0
63+
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR: /app/lib/girepository-1.0
64+
sources:
65+
- type: git
66+
url: https://gitlab.gnome.org/GNOME/libgee
67+
tag: 0.20.1
68+
commit: 57e4c8a08d61ab77bbec310a3a1621e6bf3111cb
4869
- name: enchant
4970
sources:
5071
- type: archive

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('venom', ['vala', 'c'],
22
license: 'GPL3+',
3-
version: '0.4.2'
3+
version: '0.5.0'
44
)
55

66
i18n = import('i18n')

po/LINGUAS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ fr
44
it
55
pl
66
pt
7-
pt_br
7+
pt_BR
88
ru
99
zh_CN

po/POTFILES

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ src/undo/UndoCommand.vala
33
src/undo/UndoStack.vala
44
src/undo/TextBufferUndoBinding.vala
55
src/undo/SimpleUndoStack.vala
6-
src/core/Interfaces.vala
76
src/core/NotificationListener.vala
87
src/core/UserInfo.vala
98
src/core/TimeStamp.vala
109
src/core/FileTransfer.vala
1110
src/core/R.vala
1211
src/core/Logger.vala
1312
src/core/Message.vala
13+
src/core/GlobalSettings.vala
1414
src/core/Contact.vala
1515
src/core/FileIO.vala
1616
src/core/WidgetFactory.vala
1717
src/core/Tools.vala
18+
src/core/Profile.vala
1819
src/core/WindowState.vala
1920
src/core/Application.vala
2021
src/core/Identicon.vala
@@ -29,28 +30,32 @@ src/viewmodel/MessageViewModel.vala
2930
src/viewmodel/FileTransferEntryViewModel.vala
3031
src/viewmodel/CreateGroupchatViewModel.vala
3132
src/viewmodel/ConferenceInfoViewModel.vala
32-
src/tox/ToxSessionIO.vala
33-
src/tox/DhtNodeDatabase.vala
33+
src/tox/ToxMessage.vala
3434
src/tox/ToxAdapterFriendListener.vala
35-
src/tox/ContactDatabase.vala
35+
src/tox/JsonWebDhtNodeUpdater.vala
3636
src/tox/ToxAdapterFiletransferListener.vala
37+
src/tox/SqliteNospamRepository.vala
3738
src/tox/Conference.vala
3839
src/tox/FriendRequest.vala
3940
src/tox/ToxSessionThread.vala
41+
src/tox/SqliteDhtNodeRepository.vala
42+
src/tox/SqliteFriendRequestRepository.vala
4043
src/tox/ToxContact.vala
4144
src/tox/ToxSession.vala
42-
src/tox/JsonWebDhtNodeDatabase.vala
4345
src/tox/DhtNode.vala
44-
src/tox/SqliteDhtNodeDatabase.vala
46+
src/tox/SqliteContactRepository.vala
4547
src/tox/ToxAdapterSelfListener.vala
4648
src/tox/ToxAdapterConferenceListener.vala
47-
src/tox/MessageDatabase.vala
49+
src/tox/SqliteMessageRepository.vala
4850
src/tox/ConferenceMessage.vala
51+
src/tox/StaticDhtNodeUpdater.vala
4952
src/plugin/Plugin.vala
5053
src/plugin/Pluginregistrar.vala
5154
src/view/MessageWidget.vala
5255
src/view/ConferenceInfoWidget.vala
5356
src/view/ApplicationWindow.vala
57+
src/view/LoginWidget.vala
58+
src/view/InAppNotification.vala
5459
src/view/ConferenceWindow.vala
5560
src/view/NodeWidget.vala
5661
src/view/AboutDialog.vala
@@ -68,11 +73,13 @@ src/view/AddContactWidget.vala
6873
src/view/ConversationWindow.vala
6974
src/view/PeerEntry.vala
7075
src/view/FileTransferEntry.vala
76+
src/view/NospamEntry.vala
7177
src/view/ConferenceInviteEntry.vala
7278
src/view/UserInfoWidget.vala
7379
src/view/FriendInfoWidget.vala
7480
src/view/ContextStyleBinding.vala
7581
src/ui/file_transfer_widget.ui
82+
src/ui/login_widget.ui
7683
src/ui/contact_list_entry_compact.ui
7784
src/ui/application_window.ui
7885
src/ui/file_transfer_entry.ui
@@ -95,6 +102,7 @@ src/ui/user_info_widget.ui
95102
src/ui/contact_list_entry.ui
96103
src/ui/file_transfer_entry_inline.ui
97104
src/ui/settings_widget.ui
105+
src/ui/nospam_entry.ui
98106
src/ui/friend_info_widget.ui
99107
src/ui/error_widget.ui
100108
src/db/DatabaseInterfaces.vala

0 commit comments

Comments
 (0)