From f894b863316c35c4061d1308ccb1010e0cc1e6f1 Mon Sep 17 00:00:00 2001 From: ymshenyu Date: Mon, 25 May 2020 12:54:59 +0800 Subject: [PATCH] snap: using system zxing-cpp for snap packaging --- makespec/BUILDVERSION | 2 +- snap/snapcraft.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 21453bb2..b1ee089f 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -5527 +5528 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3295b4fc..93a030bf 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -57,6 +57,7 @@ parts: - libprotobuf-dev - protobuf-compiler-grpc - pkg-config + - libzxingcore-dev stage-packages: - libgcc1 - libstdc++6 @@ -68,11 +69,13 @@ parts: - libqt5network5 - libqt5widgets5 - libglib2.0-bin + - libzxingcore1 cmake-parameters: - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_BUILD_TYPE=Release - -DEMBED_TRANSLATIONS=ON - -DFALL_BACK_TO_XDG_OPEN=ON + - -DQV2RAY_ZXING_PROVIDER=package override-pull: | snapcraftctl pull build_number=$(cat makespec/BUILDVERSION)