games/citra: Fix github tarball handling.

https://slackbuilds.org/GITHUB_URLs.txt

This avoids having differently named tarballs based on whether the
client respects content disposition headers or not.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 10 insertions, 10 deletions

diff --git a/games/citra/citra.SlackBuild b/games/citra/citra.SlackBuild
index 29a667fc38a0..c71a146de044 100644
--- a/games/citra/citra.SlackBuild
+++ b/games/citra/citra.SlackBuild
@@ -95,9 +95,9 @@ rm -rf $SRCNAM-$PRGVER
 tar xvf $CWD/$SRCNAM-$PRGVER.tar.?z
 
 # citra has quite a few external dependencies, we need to extract them to the correct location.
-tar xvf $CWD/boost-$BOOST.tar.gz -C \
+tar xvf $CWD/ext-boost-$BOOST.tar.gz -C \
   $DEPS/boost --strip-components 1
-tar xvf $CWD/catch-$CATCH.tar.gz -C \
+tar xvf $CWD/Catch2-$CATCH.tar.gz -C \
   $DEPS/catch2 --strip-components 1
 tar xvf $CWD/cpp-jwt-$CPPJWT.tar.gz -C \
   $DEPS/cpp-jwt --strip-components 1
@@ -115,11 +115,11 @@ tar xvf $CWD/enet-$ENET.tar.gz -C \
   $DEPS/enet --strip-components 1
 tar xvf $CWD/ext-soundtouch-$EXTSOUNDTOUCH.tar.gz -C \
   $DEPS/soundtouch --strip-components 1
-tar xvf $CWD/fmtlib-$FMTLIB.tar.gz -C \
+tar xvf $CWD/fmt-$FMTLIB.tar.gz -C \
   $DEPS/fmt --strip-components 1
 tar xvf $CWD/inih-$INIH.tar.gz -C \
   $DEPS/inih/inih --strip-components 1
-tar xvf $CWD/libressl-portable-$LIBRESSL.tar.gz -C \
+tar xvf $CWD/ext-libressl-portable-$LIBRESSL.tar.gz -C \
   $DEPS/libressl --strip-components 1
 tar xvf $CWD/libusb-$LIBUSB.tar.gz -C \
   $DEPS/libusb/libusb --strip-components 1
@@ -163,7 +163,7 @@ echo "gitdir: ../../.git/modules/teakra" > $DEPS/teakra/.git
 echo "gitdir: ../../.git/modules/xbyak" > $DEPS/xbyak/.git
 echo "gitdir: ../../.git/modules/zstd" > $DEPS/zstd/.git 
 
-cd $PRGNAM-nightly-nightly-$PRGVER
+cd $SRCNAM-$PRGVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
diff --git a/games/citra/citra.info b/games/citra/citra.info
index be5993b1d3f6..45c3052276f3 100644
--- a/games/citra/citra.info
+++ b/games/citra/citra.info
@@ -3,8 +3,8 @@ VERSION="0.1822"
 HOMEPAGE="https://citra-emu.org/"
 DOWNLOAD="UNSUPPORTED"
 MD5SUM=""
-DOWNLOAD_x86_64="https://github.com/citra-emu/ext-boost/archive/66937ea62d126a92b5057e3fd9ceac7c44daf4f5/boost-66937ea62d126a92b5057e3fd9ceac7c44daf4f5.tar.gz \
-                 https://github.com/catchorg/Catch2/archive/dc001fa935d71b4b77f263fce405c9dbdfcbfe28/catch-dc001fa935d71b4b77f263fce405c9dbdfcbfe28.tar.gz \
+DOWNLOAD_x86_64="https://github.com/citra-emu/ext-boost/archive/66937ea62d126a92b5057e3fd9ceac7c44daf4f5/ext-boost-66937ea62d126a92b5057e3fd9ceac7c44daf4f5.tar.gz \
+                 https://github.com/catchorg/Catch2/archive/dc001fa935d71b4b77f263fce405c9dbdfcbfe28/Catch2-dc001fa935d71b4b77f263fce405c9dbdfcbfe28.tar.gz \
                  https://github.com/citra-emu/citra-nightly/archive/nightly-1822/citra-nightly-nightly-1822.tar.gz \
                  https://github.com/arun11299/cpp-jwt/archive/e12ef06218596b52d9b5d6e1639484866a8e7067/cpp-jwt-e12ef06218596b52d9b5d6e1639484866a8e7067.tar.gz \
                  https://github.com/weidai11/cryptopp/archive/f2102243e6fdd48c0b2a393a0993cca228f20573/cryptopp-f2102243e6fdd48c0b2a393a0993cca228f20573.tar.gz \
@@ -13,16 +13,16 @@ DOWNLOAD_x86_64="https://github.com/citra-emu/ext-boost/archive/66937ea62d126a92
                  https://github.com/citra-emu/dynarmic/archive/7a926d689bcc1cc39dd26d5bba379dffcc6815a3/dynarmic-7a926d689bcc1cc39dd26d5bba379dffcc6815a3.tar.gz \
                  https://github.com/lsalzman/enet/archive/4f8e9bdc4ce6d1f61a6274b0e557065a38190952/enet-4f8e9bdc4ce6d1f61a6274b0e557065a38190952.tar.gz \
                  https://github.com/citra-emu/ext-soundtouch/archive/060181eaf273180d3a7e87349895bd0cb6ccbf4a/ext-soundtouch-060181eaf273180d3a7e87349895bd0cb6ccbf4a.tar.gz \
-                 https://github.com/fmtlib/fmt/archive/a33701196adfad74917046096bf5a2aa0ab0bb50/fmtlib-a33701196adfad74917046096bf5a2aa0ab0bb50.tar.gz \
+                 https://github.com/fmtlib/fmt/archive/a33701196adfad74917046096bf5a2aa0ab0bb50/fmt-a33701196adfad74917046096bf5a2aa0ab0bb50.tar.gz \
                  https://github.com/google/googletest/archive/800f5422ac9d9e0ad59cd860a2ef3a679588acb4/googletest-800f5422ac9d9e0ad59cd860a2ef3a679588acb4.tar.gz \
                  https://github.com/benhoyt/inih/archive/5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b/inih-5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b.tar.gz \
-                 https://github.com/citra-emu/ext-libressl-portable/archive/8929f818fd748fd31a34fec7c04558399e13014a/libressl-portable-8929f818fd748fd31a34fec7c04558399e13014a.tar.gz \
+                 https://github.com/citra-emu/ext-libressl-portable/archive/8929f818fd748fd31a34fec7c04558399e13014a/ext-libressl-portable-8929f818fd748fd31a34fec7c04558399e13014a.tar.gz \
                  https://github.com/libusb/libusb/archive/e782eeb2514266f6738e242cdcb18e3ae1ed06fa/libusb-e782eeb2514266f6738e242cdcb18e3ae1ed06fa.tar.gz \
                  https://github.com/lemenkov/libyuv/archive/6900494d90ae095d44405cd4cc3f346971fa69c9/libyuv-6900494d90ae095d44405cd4cc3f346971fa69c9.tar.gz \
                  https://github.com/lvandeve/lodepng/archive/18964554bc769255401942e0e6dfd09f2fab2093/lodepng-18964554bc769255401942e0e6dfd09f2fab2093.tar.gz \
                  https://github.com/neobrain/nihstro/archive/fd69de1a1b960ec296cc67d32257b0f9e2d89ac6/nihstro-fd69de1a1b960ec296cc67d32257b0f9e2d89ac6.tar.gz \
                  https://github.com/arsenm/sanitizers-cmake/archive/aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a/sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a.tar.gz \
-		 https://github.com/libsdl-org/SDL/archive/a1d1946dcba6509f0679f507b57e7b228d32e6f8/SDL-a1d1946dcba6509f0679f507b57e7b228d32e6f8.tar.gz \
+                 https://github.com/libsdl-org/SDL/archive/a1d1946dcba6509f0679f507b57e7b228d32e6f8/SDL-a1d1946dcba6509f0679f507b57e7b228d32e6f8.tar.gz \
                  https://github.com/wwylele/teakra/archive/01db7cdd00aabcce559a8dddce8798dabb71949b/teakra-01db7cdd00aabcce559a8dddce8798dabb71949b.tar.gz \
                  https://github.com/herumi/xbyak/archive/48457bfa0ded67bb4ae2d4c141c36b35469257ee/xbyak-48457bfa0ded67bb4ae2d4c141c36b35469257ee.tar.gz \
                  https://github.com/facebook/zstd/archive/e47e674cd09583ff0503f0f6defd6d23d8b718d3/zstd-e47e674cd09583ff0503f0f6defd6d23d8b718d3.tar.gz"