From 0e37f97aa27d3dfd488b601c5a89b2062ffcc6b9 Mon Sep 17 00:00:00 2001
From: dsc <dsc@xmr.pm>
Date: Fri, 30 Apr 2021 20:50:09 +0200
Subject: [PATCH] Update .deb builder and including XMRig functionality by
 default for Linux

---
 CMakeLists.txt              |   1 -
 Makefile                    |   1 +
 contrib/debian/build-deb.sh |  12 ++++++------
 contrib/debian/changelog.gz | Bin 133 -> 138 bytes
 contrib/debian/control      |   2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 990a3a8..b1a1e5c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,6 @@ include(CheckSymbolExists)
 
 set(WOWNERO_HEAD "f611d5c9e32bc62f1735f6571b0bdb95cc020531")
 set(BUILD_GUI_DEPS ON)
-set(ARCH "x86-64" CACHE STRING "Target architecture")
 set(BUILD_64 ON CACHE BOOL "Build 64-bit binaries")
 set(INSTALL_VENDORED_LIBUNBOUND ${STATIC})
 set(USE_SINGLE_BUILDDIR ON)
diff --git a/Makefile b/Makefile
index d4781bf..dd004f7 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,7 @@ CMAKEFLAGS = \
 	$(CMAKEFLAGS_EXTRA)
 
 release-static: CMAKEFLAGS += -DBUILD_TAG="linux-x64"
+release-static: CMAKEFLAGS += -DXMRIG=ON
 release-static: CMAKEFLAGS += -DTOR_BIN=$(or ${TOR_BIN},OFF)
 release-static: CMAKEFLAGS += -DCMAKE_BUILD_TYPE=Release
 release-static: CMAKEFLAGS += -DREPRODUCIBLE=$(or ${SOURCE_DATE_EPOCH},OFF)
diff --git a/contrib/debian/build-deb.sh b/contrib/debian/build-deb.sh
index 4a50997..a20a546 100755
--- a/contrib/debian/build-deb.sh
+++ b/contrib/debian/build-deb.sh
@@ -22,13 +22,13 @@ mkdir -p "$DEBDIR/usr/share/icons/hicolor/256x256/apps/"
 
 # Copy over assets
 
-cp "$PWD/src/assets/control" "$DEBDIR/DEBIAN/control"
-cp "$PWD/src/assets/copyright" "$DEBDIR/debian/copyright"
-cp "$PWD/src/assets/copyright" "$DEBDIR/usr/share/doc/wowlet/copyright"
-cp "$PWD/src/assets/changelog.gz" "$DEBDIR/usr/share/doc/wowlet/changelog.gz"
+cp "$PWD/contrib/debian/control" "$DEBDIR/DEBIAN/control"
+cp "$PWD/contrib/debian/copyright" "$DEBDIR/debian/copyright"
+cp "$PWD/contrib/debian/copyright" "$DEBDIR/usr/share/doc/wowlet/copyright"
+cp "$PWD/contrib/debian/changelog.gz" "$DEBDIR/usr/share/doc/wowlet/changelog.gz"
 cp "$PWD/src/assets/org.wowlet.wowlet.metainfo.xml" "$DEBDIR/usr/share/metainfo/org.wowlet.wowlet.metainfo.xml"
 cp "$PWD/README.md" "$DEBDIR/usr/share/doc/wowlet/README"
-cp "$PWD/SECURITY.md" "$DEBDIR/usr/share/doc/wowlet/SECURITY"
+cp "$PWD/docs/SECURITY.md" "$DEBDIR/usr/share/doc/wowlet/SECURITY"
 cp "$PWD/build/bin/wowlet" "$DEBDIR/usr/bin/wowlet"
 cp "$PWD/src/assets/org.wowlet.wowlet.desktop" "$DEBDIR/usr/share/applications/org.wowlet.wowlet.desktop"
 cp "$PWD/src/assets/wowlet.1.gz" "$DEBDIR/usr/share/man/man1/wowlet.1.gz"
@@ -43,4 +43,4 @@ cp "$PWD/src/assets/images/appicons/256x256.png" "$DEBDIR/usr/share/icons/hicolo
 # Build deb package
 
 dpkg-deb --build $DEBDIR
-mv wowlet.DebDir.deb wowlet_1.0_amd64.deb
+mv wowlet.DebDir.deb wowlet_2.0_amd64.deb
diff --git a/contrib/debian/changelog.gz b/contrib/debian/changelog.gz
index 400ee15be81f62e48ce5b102e126bd63dc59f83c..794b504359ddb1423dd2758caa3c94c92db98206 100644
GIT binary patch
literal 138
zcmV;50CoQ#iwFo>d4FI417m1mZf9j|Z)X4v$h{82AQT4Bou~LltG2n&!KD7Aj!uru
z*xneDTWEj=eS1CQu}>>purnPs*g`JuC49z~-W;ayRbo{N*y9m=@lKFf*k%4_+oHzm
sl8?B|c^W@U>el53Se}nC8uvB9kRj-P=uZO?4y1|H5ByD@L302A07I%l1ONa4

literal 133
zcmV;00DAu)iwFP!0000211-os3&JoE2H?HF;vM~Jxuk>Gs<=87$IfRtByi11niBl?
zI=DSN<6~6G*tmwaSmToUsnTOjFNxFVqE@O3*x?>S4y;I`!i)T}u2HOT3WoC^w|BB^
naps`SWb+jmEFR!b7&yU`C%Cq2j~x;A<cO*-RwnSAe*gdg@6JB-

diff --git a/contrib/debian/control b/contrib/debian/control
index 3673118..a0627b8 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -1,5 +1,5 @@
 Package: wowlet
-Version: 1.0
+Version: 2.0
 Section: net
 Priority: optional
 Architecture: amd64