From 66bc95ece0cb9907f3c27c4b1ea60342b9665d49 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Fri, 13 Apr 2018 14:51:48 +0300 Subject: [PATCH] Bump version to v0.3.1 --- CMakeLists.txt | 2 +- README.md | 7 ++++-- appveyor.yml | 12 ++++----- dist/Gentoo/Manifest | 1 - dist/Gentoo/nheko-9999.ebuild | 47 ----------------------------------- package.nix | 2 +- resources/nheko.appdata.xml | 2 +- resources/styles/nheko.qss | 2 +- 8 files changed, 15 insertions(+), 60 deletions(-) delete mode 100644 dist/Gentoo/Manifest delete mode 100644 dist/Gentoo/nheko-9999.ebuild diff --git a/CMakeLists.txt b/CMakeLists.txt index 69daf7e3..9ecfe2bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ include(QtCommon) project(nheko LANGUAGES C CXX) set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "3") -set(CPACK_PACKAGE_VERSION_PATCH "0") +set(CPACK_PACKAGE_VERSION_PATCH "1") set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}) set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) diff --git a/README.md b/README.md index 375e893e..48f44f3a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ nheko [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/mujx/nheko/branch/master) [![Latest Release](https://img.shields.io/github/release/mujx/nheko.svg)](https://github.com/mujx/nheko/releases) [![Chat on Matrix](https://img.shields.io/badge/chat-on%20matrix-blue.svg)](https://matrix.to/#/#nheko:matrix.org) -[![AUR: nheko-git](https://img.shields.io/badge/AUR-nheko--git-blue.svg)](https://aur.archlinux.org/packages/nheko-git) [![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko) The motivation behind the project is to provide a native desktop app for [Matrix] that @@ -36,6 +35,10 @@ for Linux ([AppImage](https://appimage.org/), rpm, deb), Mac and Windows. #### Arch Linux ```bash pacaur -S nheko-git + +# or + +pacaur -S nheko ``` #### Fedora @@ -170,7 +173,7 @@ encouraged to open feature request issues. Here is a screen shot to get a feel for the UI, but things will probably change. -![nheko](https://dl.dropboxusercontent.com/s/a493o47obvez6v1/nheko.png) +![nheko](https://dl.dropboxusercontent.com/s/zrl26u3pmqloyjz/nheko-v0.3.1.png) ### Third party diff --git a/appveyor.yml b/appveyor.yml index 850137db..c34d9510 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ --- -version: 0.3.0-{build} +version: 0.3.1-{build} environment: global: @@ -22,8 +22,8 @@ build_script: # VERSION format: branch-master/branch-1.2 # INSTVERSION format: x.y.z # WINVERSION format: 9999.0.0.123/1.2.0.234 - - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.3.0 - - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.3.0 + - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.3.1 + - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.3.1 - if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0 - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER% # VERSION format: v1.2.3/v1.3.4 @@ -78,9 +78,9 @@ after_build: - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\com.mujx.nheko.cleanup\meta - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\com.mujx.nheko.cleanup\meta # Amend version and date - - sed -i "s/__VERSION__/0.3.0/" installer\config\config.xml - - sed -i "s/__VERSION__/0.3.0/" installer\packages\com.mujx.nheko\meta\package.xml - - sed -i "s/__VERSION__/0.3.0/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml + - sed -i "s/__VERSION__/0.3.1/" installer\config\config.xml + - sed -i "s/__VERSION__/0.3.1/" installer\packages\com.mujx.nheko\meta\package.xml + - sed -i "s/__VERSION__/0.3.1/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml # Copy nheko data diff --git a/dist/Gentoo/Manifest b/dist/Gentoo/Manifest deleted file mode 100644 index 2dbc9baa..00000000 --- a/dist/Gentoo/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD nheko-9999.ebuild 881 SHA256 50f8d8e9aa142e3df5ac50e428474a348e17436ae870ef85832aa0f333d81ac3 SHA512 13d55a80b6447f4ca3d5367eac06d64d07446bd19699e55eb96f8de047a81ea60b5cb7eb78fc143393ec3b1f1741a8f2d17b506353c2f36d1a169884535f4968 WHIRLPOOL 33d3ad79b4fdaa9ff318494c7920e4b3ea3cade63214a6087d550efdf3a87cd8e2839dc36bfaf557b89b59ac65aea57347ae785754c9d58a0cbb5be589bf08ac diff --git a/dist/Gentoo/nheko-9999.ebuild b/dist/Gentoo/nheko-9999.ebuild deleted file mode 100644 index e0635853..00000000 --- a/dist/Gentoo/nheko-9999.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Desktop client for the Matrix protocol" -HOMEPAGE="https://github.com/mujx/nheko" - -inherit git-r3 eutils cmake-utils - -if [[ ${PV} == "9999" ]]; then - SRC_URI="" - EGIT_REPO_URI="git://github.com/mujx/nheko.git" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -RDEPEND=">=dev-qt/qtgui-5.7.1 - >=dev-qt/qtnetwork-5.7.1 - >=dev-qt/linguist-tools-5.7.1 - media-libs/fontconfig - dev-db/lmdb" -DEPEND="${RDEPEND} - dev-util/ninja" - -src_configure() { - cmake-utils_src_configure -} - -src_compile() { - emake DESTDIR="${D}" -} - -src_install() { - local icon_size - for icon_size in 16 32 48 64 128 256 512; do - newicon -s "${icon_size}" \ - "${S}/resources/nheko-${icon_size}.png" \ - nheko.png - done - - domenu ${S}/resources/nheko.desktop - - dobin ${S}/build/nheko -} diff --git a/package.nix b/package.nix index dce4e4b3..8e132dc3 100644 --- a/package.nix +++ b/package.nix @@ -1,6 +1,6 @@ { stdenv, qtbase, qttranslations, qtmultimedia, lmdb, cmake }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.3.1"; name = "nheko-${version}"; src = builtins.filterSource (path: type: diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml index 17e1bfcf..4790894e 100644 --- a/resources/nheko.appdata.xml +++ b/resources/nheko.appdata.xml @@ -14,7 +14,7 @@ - https://dl.dropboxusercontent.com/s/a493o47obvez6v1/nheko.png + https://dl.dropboxusercontent.com/s/zrl26u3pmqloyjz/nheko-v0.3.1.png https://github.com/mujx/nheko diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss index b028c7d6..c7d57252 100644 --- a/resources/styles/nheko.qss +++ b/resources/styles/nheko.qss @@ -38,7 +38,7 @@ CommunitiesList > * { } FlatButton { - qproperty-foregroundColor: #8c8c8c; + qproperty-foregroundColor: #14272d; } FileItem {