From 4bfeafa42b1cdc707ed6de5ce2e278f162f8b38c Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Mon, 10 Jun 2019 18:04:29 -0400 Subject: [PATCH] remove qt --- PKGBUILD | 53 +++++++++-------------------------------------- ppsspp-qt.desktop | 9 -------- ppsspp-qt.sh | 4 ---- 3 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 ppsspp-qt.desktop delete mode 100644 ppsspp-qt.sh diff --git a/PKGBUILD b/PKGBUILD index 341fa4e..9087c9f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,15 +6,17 @@ # Contributor: uberushaximus pkgbase=ppsspp-git -pkgname=('ppsspp-git' 'ppsspp-qt-git') +pkgname='ppsspp-git' pkgver=1.6.3.r383.22a536fb0 pkgrel=1 pkgdesc='A PSP emulator written in C++' arch=('x86_64') url='http://www.ppsspp.org/' license=('GPL2') -depends=('gcc-libs' 'glew' 'glibc' 'libgl' 'sdl2' 'zlib') -makedepends=('cmake' 'git' 'glu' 'libglvnd' 'libzip' 'qt5-tools') +provides=('ppsspp') +conflicts=('ppsspp' 'ppsspp-qt' 'ppsspp-qt-git') +depends=('gcc-libs' 'glew' 'glibc' 'libgl' 'sdl2' 'zlib' 'hicolor-icon-theme' 'libzip') +makedepends=('cmake' 'git' 'glu' 'libglvnd' 'libzip') source=('git+https://github.com/hrydgard/ppsspp.git' 'git+https://github.com/Kingcom/armips.git' 'git+https://github.com/discordapp/discord-rpc.git' @@ -25,9 +27,7 @@ source=('git+https://github.com/hrydgard/ppsspp.git' 'git+https://github.com/KhronosGroup/SPIRV-Cross.git' 'armips-tinyformat::git+https://github.com/Kingcom/tinyformat.git' 'ppsspp.sh' - 'ppsspp-qt.sh' 'ppsspp.desktop' - 'ppsspp-qt.desktop' 'ppsspp-flags.patch') sha256sums=('SKIP' 'SKIP' @@ -39,9 +39,7 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' '2c2d1ee6d1ce5c2acec372d58b8079885f6d5d674633cfea489cd550252a5426' - '828b06aacc56672a4d953d77342717c5be414a68261025f74e466abd084b8e6b' '1c332702d0aeced07df7e12ba8530bc3f19a52bc76c355f6c84c141becfd46d8' - 'b3b1fb9e0ecd3c4472b51f27d028a69514b1a3823c26e33da6ffaebfb1522b7f' '6694643d96dae673f01555637139468eb277f3379afbcceccad3f7e0ae670278') pkgver() { @@ -76,12 +74,10 @@ prepare() { popd - for ui in sdl qt; do - if [[ -d build-$ui ]]; then - rm -rf build-$ui - fi - mkdir build-$ui - done + if [[ -d build-sdl ]]; then + rm -rf build-sdl + fi + mkdir build-sdl } build() { @@ -93,22 +89,9 @@ build() { -DHEADLESS='ON' \ -DUSE_SYSTEM_LIBZIP='ON' make - - cd ../build-qt - - cmake .. \ - -DCMAKE_BUILD_TYPE='Release' \ - -DCMAKE_SKIP_RPATH='ON' \ - -DUSE_SYSTEM_LIBZIP='ON' \ - -DUSING_QT_UI='ON' - make } -package_ppsspp-git() { - depends+=('hicolor-icon-theme' 'libzip') - provides=('ppsspp') - conflicts=('ppsspp' 'ppsspp-qt' 'ppsspp-qt-git') - +package() { cd ppsspp/build-sdl install -dm 755 "${pkgdir}"/{opt/ppsspp,usr/{bin,share/{applications,icons,pixmaps}}} @@ -120,20 +103,4 @@ package_ppsspp-git() { install -m 644 ../../ppsspp.desktop "${pkgdir}"/usr/share/applications/ } -package_ppsspp-qt-git() { - depends+=('hicolor-icon-theme' 'libzip' 'qt5-base') - provides=('ppsspp-qt') - conflicts=('ppsspp' 'ppsspp-git' 'ppsspp-qt') - - cd ppsspp/build-qt - - install -dm 755 "${pkgdir}"/{opt/ppsspp,usr/{bin,share/{applications,icons,pixmaps}}} - install -m 755 PPSSPPQt "${pkgdir}"/opt/ppsspp/ - cp -dr --no-preserve='ownership' assets "${pkgdir}"/opt/ppsspp/ - cp -dr --no-preserve='ownership' ../icons/hicolor "${pkgdir}"/usr/share/icons/ - install -m 644 ../icons/icon-512.svg "${pkgdir}"/usr/share/pixmaps/ppsspp.svg - install -m 755 ../../ppsspp-qt.sh "${pkgdir}"/usr/bin/ppsspp-qt - install -m 644 ../../ppsspp-qt.desktop "${pkgdir}"/usr/share/applications/ -} - # vim ts=2 sw=2 et: diff --git a/ppsspp-qt.desktop b/ppsspp-qt.desktop deleted file mode 100644 index adbe5ca..0000000 --- a/ppsspp-qt.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=PPSSPP (Qt) -GenericName=PSP Emulator -Comment=PlayStation Portable Simulator Suitable for Playing Portably (PPSSPP) -Exec=ppsspp-qt %f -Icon=ppsspp -Categories=Game diff --git a/ppsspp-qt.sh b/ppsspp-qt.sh deleted file mode 100644 index 3ad73f6..0000000 --- a/ppsspp-qt.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd /opt/ppsspp -exec ./PPSSPPQt "$@"