From 0a6e4a238715eb83fb89efe273829e71024790c2 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Mon, 15 Feb 2021 19:51:32 +0100 Subject: [PATCH] Remove references to old repo --- BUILDING.md | 6 ++-- CMakeLists.txt | 2 +- Dockerfile | 2 +- Dockerfile.windows | 2 +- Dockerfile.windows_mxe | 74 ------------------------------------------ Makefile | 14 -------- PKGBUILD | 2 +- README.md | 6 ++-- src/mainwindow.cpp | 2 +- 9 files changed, 11 insertions(+), 99 deletions(-) delete mode 100644 Dockerfile.windows_mxe diff --git a/BUILDING.md b/BUILDING.md index 4470f3f1..89229b85 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -18,7 +18,7 @@ so that the resulting Feather binary is static. For more information, check the #### 1. Clone ```bash -git clone --branch master --recursive https://git.wownero.com/feather/feather.git +git clone --branch master --recursive https://git.featherwallet.org/feather/feather.git cd feather ``` @@ -57,7 +57,7 @@ docker run --rm -it -v $PWD:/feather -w /feather feather:linux contrib/build-app #### 1. Clone ```bash -git clone --branch master --recursive https://git.wownero.com/feather/feather.git +git clone --branch master --recursive https://git.featherwallet.org/feather/feather.git cd feather ``` @@ -94,7 +94,7 @@ HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" \ Clone the repository. ```bash -git clone --recursive https://git.wownero.com/feather/feather.git +git clone --recursive https://git.featherwallet.org/feather/feather.git ``` Get the latest LTS from here: https://www.qt.io/offline-installers and install. diff --git a/CMakeLists.txt b/CMakeLists.txt index c0d1bab0..a1a3ac0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ find_package(monero-seed CONFIG) if(NOT monero-seed_FOUND) if(FETCH_DEPS) FetchContent_Declare(monero-seed - GIT_REPOSITORY https://git.wownero.com/feather/monero-seed.git) + GIT_REPOSITORY https://git.featherwallet.org/feather/monero-seed.git) FetchContent_GetProperties(monero-seed) if(NOT monero-seed_POPULATED) message(STATUS "Fetching monero-seed") diff --git a/Dockerfile b/Dockerfile index aa07f031..35294c2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -392,7 +392,7 @@ RUN git clone -b v4.0.2 --depth 1 https://github.com/fukuchi/libqrencode.git && make -j$THREADS install && \ rm -rf $(pwd) -RUN git clone https://git.wownero.com/feather/monero-seed.git && \ +RUN git clone https://git.featherwallet.org/feather/monero-seed.git && \ cd monero-seed && \ git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \ diff --git a/Dockerfile.windows b/Dockerfile.windows index e4d8928e..4fadfe60 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -172,7 +172,7 @@ RUN git clone -b tor-0.4.5.5-rc --depth 1 https://git.torproject.org/tor.git && rm -rf $(pwd) && \ strip -s -D /usr/local/tor/bin/tor.exe -RUN git clone https://git.wownero.com/feather/monero-seed.git && \ +RUN git clone https://git.featherwallet.org/feather/monero-seed.git && \ cd monero-seed && \ git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \ cmake -DCMAKE_INSTALL_PREFIX=/depends/x86_64-w64-mingw32 \ diff --git a/Dockerfile.windows_mxe b/Dockerfile.windows_mxe deleted file mode 100644 index e81fa5ee..00000000 --- a/Dockerfile.windows_mxe +++ /dev/null @@ -1,74 +0,0 @@ -FROM ubuntu:18.04 - -ARG THREADS=1 - -RUN apt clean && apt update -ARG DEBIAN_FRONTEND=noninteractive -ENV TZ=Europe/Amsterdam - -RUN apt install -y \ - autoconf \ - automake \ - autopoint \ - aptitude \ - bash \ - build-essential \ - bison \ - bzip2 \ - ccache \ - flex \ - g++ \ - g++-multilib \ - gettext \ - git \ - gperf \ - intltool \ - libc6-dev-i386 \ - libgdk-pixbuf2.0-dev \ - libltdl-dev \ - libssl-dev \ - libtool-bin \ - libxml-parser-perl \ - lzip \ - nano \ - make \ - openssl \ - p7zip-full \ - patch \ - perl \ - python \ - python-mako \ - ruby \ - sed \ - scons \ - software-properties-common \ - unzip \ - tzdata \ - vim \ - wget \ - xz-utils - -RUN git clone -b feather-patch --depth 1 https://git.wownero.com/feather/mxe.git && \ - cd mxe && \ - make -j$THREADS MXE_TARGETS='x86_64-w64-mingw32.static' gcc libqrencode pkgconf libgpg_error libgcrypt cmake libsodium lzma readline libzmq boost qtbase qtsvg qtwebsockets qtimageformats qtmultimedia - -# plugins -RUN cd mxe && make -j$THREADS MXE_PLUGIN_DIRS='/mxe/plugins/apps/' MXE_TARGETS='x86_64-w64-mingw32.static' tor - -# fix env. -RUN echo "export PATH=\"/mxe/usr/bin/:\$PATH\"" >> "/root/.bashrc" -RUN ln -s /mxe/usr/bin/x86_64-w64-mingw32.static-cmake /usr/local/bin/cmake -RUN ln -s /mxe/usr/bin/x86_64-w64-mingw32.static-windres /usr/local/bin/windres -RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicudt.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicudt.a -RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicuio.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicuio.a -RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicutu.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicutu.a -RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicuuc.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicuuc.a -RUN ln -s /mxe/usr/x86_64-w64-mingw32.static/lib/libsicuin.a /mxe/usr/x86_64-w64-mingw32.static/lib/libicuin.a - -ENV PATH="/mxe/usr/bin/:$PATH" - -RUN git clone https://git.wownero.com/feather/monero-seed.git && \ - cd monero-seed && \ - cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \ - make -Cbuild -j$THREADS && \ - make -Cbuild install diff --git a/Makefile b/Makefile index a1f81ad0..d1f2073c 100644 --- a/Makefile +++ b/Makefile @@ -52,20 +52,6 @@ depends: mkdir -p build/$(target)/release cd build/$(target)/release && cmake -D STATIC=ON -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF) -DTOR_VERSION=$(or ${TOR_VERSION}, OFF) -DTOR_BIN=$(or ${TOR_BIN},OFF) -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE) -windows-mxe-release: CMAKEFLAGS += -DBUILD_TAG="win-x64" -windows-mxe-release: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF) -windows-mxe-release: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release -windows-mxe-release: - cmake -Bbuild $(CMAKEFLAGS) - $(MAKE) -Cbuild - -windows-mxe-debug: CMAKEFLAGS += -DBUILD_TAG="win-x64" -windows-mxe-debug: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF) -windows-mxe-debug: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Debug -windows-mxe-debug: - cmake -Bbuild $(CMAKEFLAGS) - $(MAKE) -Cbuild - mac-release: CMAKEFLAGS += -DSTATIC=Off mac-release: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF) mac-release: CMAKEFLAGS += -DBUILD_TAG="mac-x64" diff --git a/PKGBUILD b/PKGBUILD index e271d9e5..c8f7f04b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,7 +11,7 @@ url="https://featherwallet.org" depends=('boost-libs' 'libunwind' 'openssl' 'readline' 'pcsclite' 'hidapi' 'protobuf' 'miniupnpc' 'libgcrypt' 'qrencode' 'libsodium' 'libpgm' 'expat' 'qt5-base' 'qt5-websockets' 'tor') makedepends=('git' 'cmake' 'boost') -source=("${pkgname}"::"git+https://git.wownero.com/feather/feather") +source=("${pkgname}"::"git+https://git.featherwallet.org/feather/feather") sha256sums=('SKIP') diff --git a/README.md b/README.md index c8a1d01e..a7058f6e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Feather is a free, open-source Monero client Linux with ports for Mac OS and Win ## Development resources * Web: [featherwallet.org](https://featherwallet.org) -* Git: [git.wownero.com/feather/feather](https://git.wownero.com/feather/feather) +* Git: [git.featherwallet.org/feather/feather](https://git.featherwallet.org/feather/feather) * IRC: `#feather` on OFTC * Development builds: [build.featherwallet.org/files](https://build.featherwallet.org/files/) @@ -20,7 +20,7 @@ Feather uses Monero, as such it requires the same dependencies as outlined in [M - libqrencode - openpgp -See [BUILDING.md](https://git.wownero.com/feather/feather/src/branch/master/BUILDING.md) for information on how to compile a build. +See [BUILDING.md](https://git.featherwallet.org/feather/feather/src/branch/master/BUILDING.md) for information on how to compile a build. ## Supporting the project @@ -30,6 +30,6 @@ Feather is a 100% community-sponsored endeavor. If you want to join our efforts, ## Developers -See [HACKING.md](https://git.wownero.com/feather/feather/src/branch/master/HACKING.md) for useful development resources. +See [HACKING.md](https://git.featherwallet.org/feather/feather/src/branch/master/HACKING.md) for useful development resources. It is HIGHLY recommended that you join the `#feather` IRC channel on OFTC if you are hacking on Feather. Due to the nature of this open source software project, joining this channel and idling is the best way to stay updated on best practices and new developments. diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 8df08886..e6094c86 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -88,7 +88,7 @@ MainWindow::MainWindow(AppContext *ctx, QWidget *parent) : connect(ui->actionReport_bug, &QAction::triggered, [this](){ QMessageBox::information(this, "Reporting Bugs", "Please report any bugs as issues on our git repo:
\n" - "https://git.wownero.com/feather/feather/issues

" + "https://git.featherwallet.org/feather/feather/issues

" "\n" "Before reporting a bug, upgrade to the most recent version of Feather " "(latest release or git HEAD), and include the version number in your report. "