summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Bebbington2017-11-04 02:24:34 +0000
committerTom Bebbington2017-11-04 02:29:03 +0000
commit8382dd546a519df336889309cc5a24b5bf3ae865 (patch)
tree1fa7dd4a6b279a8c8728880ccc13128d6f4c2d17
parentb7c5644ab0f8e49f1349dec332ee7ab23ea4aafc (diff)
downloadaur-8382dd546a519df336889309cc5a24b5bf3ae865.tar.gz
Add wrappers to work around Citra not finding libcurl3
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD22
-rwxr-xr-xcitra-qt.bash3
-rwxr-xr-xcitra.bash3
4 files changed, 33 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5e66d46baac..85fd87ae54d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,21 @@
pkgbase = citra-nightly-bin
pkgdesc = An experimental open-source Nintendo 3DS emulator/debugger
- pkgver = 70_20170218_e594e63
- pkgrel = 2
+ pkgver = 385_20171031_ed17c54
+ pkgrel = 3
url = https://github.com/citra-emu/citra-nightly/
arch = x86_64
license = GPL
provides = citra
provides = citra-qt
- source = https://github.com/citra-emu/citra-nightly/releases/download/nightly-70/citra-linux-20170218-e594e63.tar.xz
+ source = https://github.com/citra-emu/citra-nightly/releases/download/nightly-385/citra-linux-20171031-ed17c54.tar.xz
source = https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.desktop
source = https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.svg
+ source = print-version.py
+ source = citra.bash
+ source = citra-qt.bash
+ sha256sums = SKIP
+ sha256sums = SKIP
+ sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
@@ -18,11 +24,15 @@ pkgname = citra-nightly-bin
depends = sdl2
depends = libpng
depends = libpng12
+ depends = libcurl-compat
+ depends = bash
pkgname = citra-qt-nightly-bin
depends = qt5-base
depends = shared-mime-info
depends = desktop-file-utils
+ depends = libcurl-compat
+ depends = bash
optdepends = libxkbcommon-x11: for X11 support
optdepends = qt5-wayland: for Wayland support
diff --git a/PKGBUILD b/PKGBUILD
index 3273a356859..b0ea92b49a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgbase='citra'
pkgbase="$_pkgbase-nightly-bin"
pkgname=("$_pkgbase-nightly-bin" "$_pkgbase-qt-nightly-bin")
-pkgrel=2
+pkgrel=3
pkgver="385_20171031_ed17c54"
pkgdesc="An experimental open-source Nintendo 3DS emulator/debugger"
provides=('citra' 'citra-qt')
@@ -17,8 +17,10 @@ source=(
"https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.desktop"
"https://raw.githubusercontent.com/citra-emu/citra/master/dist/citra.svg"
"print-version.py"
+ "citra.bash"
+ "citra-qt.bash"
)
-sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP')
+sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
pkgver() {
cd $srcdir
@@ -26,20 +28,24 @@ pkgver() {
python3 print-version.py
}
package_citra-nightly-bin() {
- depends=('sdl2' 'libpng' 'libpng12')
+ depends=('sdl2' 'libpng' 'libpng12' 'libcurl-compat' 'bash')
- cd $srcdir/citra-linux-$id
mkdir -p "${pkgdir}/usr/bin"
- mv citra "${pkgdir}/usr/bin"
+ cp $srcdir/citra.bash "${pkgdir}/usr/bin/citra"
+ cd $srcdir/citra-linux-$id
+ mkdir -p "${pkgdir}/opt/citra"
+ cp citra "${pkgdir}/opt/citra"
}
package_citra-qt-nightly-bin() {
- depends=('qt5-base' 'shared-mime-info' 'desktop-file-utils')
+ depends=('qt5-base' 'shared-mime-info' 'desktop-file-utils' 'libcurl-compat' 'bash')
optdepends=('libxkbcommon-x11: for X11 support'
'qt5-wayland: for Wayland support')
- cd $srcdir/citra-linux-$id
mkdir -p $pkgdir/usr/bin
- mv citra-qt $pkgdir/usr/bin
+ cp $srcdir/citra-qt.bash "${pkgdir}/usr/bin/citra-qt"
+ cd $srcdir/citra-linux-$id
+ mkdir -p $pkgdir/opt/citra
+ mv citra-qt $pkgdir/opt/citra
mkdir -p $pkgdir/usr/share/applications
cp $srcdir/citra.desktop $pkgdir/usr/share/applications
mkdir -p $pkgdir/usr/share/pixmaps
diff --git a/citra-qt.bash b/citra-qt.bash
new file mode 100755
index 00000000000..0c0f7fbfef5
--- /dev/null
+++ b/citra-qt.bash
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+env LD_PRELOAD=/usr/lib/libcurl.so.3 /opt/citra/citra-qt "$@" \ No newline at end of file
diff --git a/citra.bash b/citra.bash
new file mode 100755
index 00000000000..49780cfdf34
--- /dev/null
+++ b/citra.bash
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+env LD_PRELOAD=/usr/lib/libcurl.so.3 /opt/citra/citra "$@" \ No newline at end of file