Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-03 17:39:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request '1.0.0 fixes' (#395) from tobtoht/feather:1.0.0 into master

Browse source 
Reviewed-on: https://git.featherwallet.org/feather/feather/pulls/395
This commit is contained in:
tobtoht 2021-10-29 11:05:37 +00:00
commit f625435196
7 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -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

6
BUILDING.md
View file

@ -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

6
CMakeLists.txt
View file

@ -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)
@ -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)

11
README.md
View file

@ -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`

2
monero

@ -1 +1 @@
Subproject commit bdd284b35d2e2c9c6ac733b4bc5ce8bd3b1162dd
Subproject commit 39af9bca6f5561a3e06667a868185b30353b77fb

8
src/CMakeLists.txt
View file

@ -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

1
src/assets/ack.txt
View file

@ -22,6 +22,7 @@ boogerlad
bruh
btsfav
csd
Csilla Brimer
CzarekNakamoto
deanguss
dEBRUYNE