From b86c0d357f2abc6910428a10cdbdbf3d0a3e5d1f Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Sun, 12 Oct 2014 23:00:52 -0400 Subject: [PATCH 1/4] Update toxencryptsave api change. Signed-off-by: Loui Chang --- src/toxic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/toxic.c b/src/toxic.c index 3f6a418..57299e1 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -648,7 +648,7 @@ static void load_data(Tox *m, char *path) exit_toxic_err("failed in load_data", FATALERR_FILEOP); } - bool is_encrypted = tox_is_data_encrypted((uint8_t *) buf); + bool is_encrypted = tox_is_save_encrypted((uint8_t *) buf); /* attempt to encrypt an already encrypted data file */ if (arg_opts.encrypt_data && is_encrypted) From 9c7ac9043a817d615283f1df1447a912d8f0cef1 Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Tue, 26 Aug 2014 21:54:30 -0400 Subject: [PATCH 2/4] prompt: Add version line to startup message. Signed-off-by: Loui Chang --- src/prompt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prompt.c b/src/prompt.c index 1f336b7..993a064 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -427,7 +427,7 @@ static void print_welcome_msg(ToxWindow *self) line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_ _/ _ \\ \\/ /_ _/ ___|"); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || | | \\ / | | | "); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " | || |_| / \\ | | |___ "); - line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_| \\___/_/\\_\\___\\____|"); + line_info_add(self, NULL, NULL, NULL, SYS_MSG, 1, BLUE, " |_| \\___/_/\\_\\___\\____| v." TOXICVER); line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, ""); const char *msg = "Welcome to Toxic, a free, open source Tox-based instant messenging client."; From 0a132b0eb539fa284c5f1fdcbe871067aad74ef8 Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Sun, 12 Oct 2014 23:21:48 -0400 Subject: [PATCH 3/4] doc: Unlink docs from the rest of the build process. Since generated man pages are also included, we can't guarantee proper timestamps. This should fix issues that trigger doc building when it isn't needed. Signed-off-by: Loui Chang --- README.md | 2 +- build/Makefile | 2 +- cfg/targets/install.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 07f396e..699e7ae 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Toxic is a [Tox](https://tox.im)-based instant messenging client which formerly ##### Documentation * [Asciidoc](http://asciidoc.org/index.html) (only required for regenerating manpages) - * Run `make doc` after editing the asciidoc files to regenerate the manpages. + * Run `make doc` in the build directory after editing the asciidoc files to regenerate the manpages. * **NOTE FOR DEVELOPERS**: asciidoc files and generated manpages will need to be commited together. ### Compiling diff --git a/build/Makefile b/build/Makefile index 672f711..df197c3 100644 --- a/build/Makefile +++ b/build/Makefile @@ -46,7 +46,7 @@ endif -include $(CFG_DIR)/checks/check_features.mk # Targets -all: toxic doc +all: toxic toxic: $(OBJ) @echo " LD $@" diff --git a/cfg/targets/install.mk b/cfg/targets/install.mk index c011cb0..715b6f9 100644 --- a/cfg/targets/install.mk +++ b/cfg/targets/install.mk @@ -1,5 +1,5 @@ # Install target -install: toxic doc +install: toxic mkdir -p $(abspath $(DESTDIR)/$(BINDIR)) mkdir -p $(abspath $(DESTDIR)/$(DATADIR)) mkdir -p $(abspath $(DESTDIR)/$(DATADIR))/sounds From fd4161832b1789c2c555fe1bf84803797b0cc514 Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Sun, 12 Oct 2014 23:35:48 -0400 Subject: [PATCH 4/4] travis.yml: Remove asciidoc Signed-off-by: Loui Chang --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 080bd95..210bdb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ compiler: before_script: # Installing yasm (needed for compiling vpx) and openal - - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev asciidoc + - sudo apt-get -yq install yasm libopenal-dev libconfig-dev libalut-dev libnotify-dev # Installing libsodium, needed for toxcore - git clone https://github.com/jedisct1/libsodium.git libsodium - cd libsodium