From d7ca505e5805daf8cd77ef8c322631ed195477a9 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 28 Oct 2021 20:20:13 +0200 Subject: [PATCH 1/5] don't forget cryptotweetie --- src/assets/ack.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/ack.txt b/src/assets/ack.txt index a226a52d..5f0e7b1c 100644 --- a/src/assets/ack.txt +++ b/src/assets/ack.txt @@ -22,6 +22,7 @@ boogerlad bruh btsfav csd +Csilla Brimer CzarekNakamoto deanguss dEBRUYNE From 171648b7cc22abb8fb3d85111b2a3650febc7dd6 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 28 Oct 2021 20:32:10 +0200 Subject: [PATCH 2/5] Update BUILDING.md --- BUILDING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index a24a1523..e85398ce 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -14,7 +14,7 @@ Binaries produced in this section are reproducible and their digests should matc #### 1. Clone -Replace `master` with the desired version tag (e.g. `beta-9`) to build the release binary. +Replace `master` with the desired version tag (e.g. `1.0.0`) to build the release binary. ```bash git clone https://git.featherwallet.org/feather/feather.git @@ -61,7 +61,7 @@ Binaries produced in this section are not yet reproducible. #### 1. Clone -Replace `master` with the desired version tag (e.g. `beta-9`) to build the release binary. +Replace `master` with the desired version tag (e.g. `1.0.0`) to build the release binary. ```bash git clone https://git.featherwallet.org/feather/feather.git @@ -123,7 +123,7 @@ git clone --branch master --recursive https://git.featherwallet.org/feather/feat cd feather ``` -Replace `master` with the desired version tag (e.g. `beta-9`) to build the release binary. +Replace `master` with the desired version tag (e.g. `1.0.0`) to build the release binary. #### 2. Base image From 1806f3f367c58e72c48d61f60c563342c8331712 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 28 Oct 2021 23:14:01 +0200 Subject: [PATCH 3/5] Remove KDMacTouchBar module --- .gitmodules | 3 --- CMakeLists.txt | 4 ---- src/CMakeLists.txt | 8 -------- 3 files changed, 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index 74fabd61..5a3ea2dd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "contrib/tor"] path = contrib/tor url = https://git.torproject.org/tor.git -[submodule "contrib/KDMacTouchBar"] - path = contrib/KDMacTouchBar - url = https://github.com/KDAB/KDMacTouchBar.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e803939..0fcf663d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,8 +344,4 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}") -if(APPLE) - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/contrib/KDMacTouchBar") -endif() - add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bb4e6aaa..fdbbd7cd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -264,14 +264,6 @@ if (WITH_SCANNER) ) endif() -if(APPLE) - target_link_libraries(feather - KDMacTouchBar - ) - target_include_directories(feather - PUBLIC ../contrib/KDMacTouchBar) -endif() - if(NOT APPLE) target_link_libraries(feather Qt5::QSvgIconPlugin From a3329a7001bd8b72ec6994e85c6a54bc01bd76f1 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Fri, 29 Oct 2021 00:54:46 +0200 Subject: [PATCH 4/5] Update monero module --- CMakeLists.txt | 2 +- monero | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fcf663d..c1859179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if(DEBUG) set(CMAKE_VERBOSE_MAKEFILE ON) endif() -set(MONERO_HEAD "bdd284b35d2e2c9c6ac733b4bc5ce8bd3b1162dd") +set(MONERO_HEAD "39af9bca6f5561a3e06667a868185b30353b77fb") set(BUILD_GUI_DEPS ON) option(ARCH "Target architecture" "x86-64") set(BUILD_64 ON) diff --git a/monero b/monero index bdd284b3..39af9bca 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit bdd284b35d2e2c9c6ac733b4bc5ce8bd3b1162dd +Subproject commit 39af9bca6f5561a3e06667a868185b30353b77fb From abc05ca3bb5849a7f02876c0354dfdb9cc480c04 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Fri, 29 Oct 2021 01:10:01 +0200 Subject: [PATCH 5/5] Update README.md --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1ad5f748..80c68090 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,20 @@ -# Feather - a free Monero desktop wallet +# Feather Wallet Feather is a free, open-source Monero wallet for Linux, Tails, macOS and Windows. It is written in C++ with the Qt framework. Copyright (c) 2020-2021, The Monero Project. ## Resources + * Web: [featherwallet.org](https://featherwallet.org) +* Docs: [docs.featherwallet.org](https://docs.featherwallet.org) * Git: [git.featherwallet.org/feather/feather](https://git.featherwallet.org/feather/feather) +* Reddit: [/r/FeatherWallet](https://old.reddit.com/r/FeatherWallet) * Mail: dev@featherwallet.org * IRC: `#feather` on OFTC -* Development builds: [build.featherwallet.org/files](https://build.featherwallet.org/files/) +* Matrix: `#_oftc_#feather:matrix.org` + +Download the latest release [here](https://featherwallet.org/download). ## Compiling Feather from source @@ -17,7 +22,7 @@ See [BUILDING.md](https://git.featherwallet.org/feather/feather/src/branch/maste ## Supporting the project -Feather is a 100% community-sponsored endeavor. If you want to join our efforts, the easiest thing you can do is support the project financially. +Feather is a 100% community-sponsored project. If you want to join our efforts, the easiest thing you can do is support the project financially. `47ntfT2Z5384zku39pTM6hGcnLnvpRYW2Azm87GiAAH2bcTidtq278TL6HmwyL8yjMeERqGEBs3cqC8vvHPJd1cWQrGC65f`