From ddd8e9f683c47cb5968e9557b1a634d1d43df558 Mon Sep 17 00:00:00 2001 From: Casey Langen Date: Sun, 16 Jun 2019 18:55:41 -0700 Subject: [PATCH] Version bump. --- CHANGELOG.txt | 9 +++++++++ CMakeLists.txt | 2 +- musikcube.spec | 2 +- src/musikcube/app/version.h | 4 ++-- src/musikcube/musikcube.rc | Bin 4880 -> 4880 bytes 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 896f03e7d..42776effb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,12 @@ +0.65.1 + +musikcube: +* manually patched `websocketpp` to fix boost 1.70 compatibility. this allows + us to compile on macOS again. for more information, see here: + https://github.com/zaphoyd/websocketpp/pull/814 + +-------------------------------------------------------------------------------- + 0.65.0 musikcube: diff --git a/CMakeLists.txt b/CMakeLists.txt index f8bb240e4..0e2a4e1d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0) project(musikcube) set (musikcube_VERSION_MAJOR 0) set (musikcube_VERSION_MINOR 65) -set (musikcube_VERSION_PATCH 0) +set (musikcube_VERSION_PATCH 1) set (musikcube_VERSION "${musikcube_VERSION_MAJOR}.${musikcube_VERSION_MINOR}.${musikcube_VERSION_PATCH}") include(CMakeToolsHelpers OPTIONAL) diff --git a/musikcube.spec b/musikcube.spec index f9453e0c7..a52ead31c 100644 --- a/musikcube.spec +++ b/musikcube.spec @@ -1,6 +1,6 @@ %define name musikcube %define build_timestamp %{lua: print(os.date("%Y%m%d"))} -%define version 0.65.0 +%define version 0.65.1 Name: %{name} Version: %{version} Release: %{dist} diff --git a/src/musikcube/app/version.h b/src/musikcube/app/version.h index ae10fe95a..826ab69fa 100644 --- a/src/musikcube/app/version.h +++ b/src/musikcube/app/version.h @@ -4,8 +4,8 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 65 -#define VERSION_PATCH 0 -#define VERSION "0.65.0" +#define VERSION_PATCH 1 +#define VERSION "0.65.1" namespace musik { namespace cube { diff --git a/src/musikcube/musikcube.rc b/src/musikcube/musikcube.rc index a86a005d00e9ce4ea23673ef9f98babec3b1e06b..f6ce0d5eb47d21752f0bf6e0aed1427ca0467f04 100644 GIT binary patch delta 56 zcmbQBHbHHJ0T-j;WJ4}PRzn6I27}3Kxx_cuam``^a`k}RMqcgB9=xX*nStEN@43Y{ J>+nBe1^}1e4&VR) delta 56 zcmbQBHbHHJ0T-jeWJ4}PRs#kd27}3Kxx_cuam``^a`k}RMqcgB9=xX*nStEN@43Y{ J>+nBe1^|~{4%`3$