summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwcyat2023-11-26 13:58:03 +0800
committerwcyat2023-11-26 14:00:38 +0800
commitdb8a7264fea6f9b23f7a6223530b84b603921893 (patch)
tree413a52155af2ed9cc5d771586b348cf55d01ffe4
parente6bcfc94cd2c3bc234a8ba1c6d87c170fbb119c4 (diff)
downloadaur-db8a7264fea6f9b23f7a6223530b84b603921893.tar.gz
upgrade to 1.7.1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD26
-rw-r--r--deploy.pri.patch26
3 files changed, 15 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7c6f504b447c..42fe83d76082 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
pkgbase = apk-editor-studio
pkgdesc = Powerful yet easy to use APK editor
- pkgver = 1.4.0
+ pkgver = 1.7.1
pkgrel = 1
url = https://qwertycube.com/apk-editor-studio
arch = x86_64
license = GPL3
makedepends = qt5-base
+ makedepends = cmake
depends = qt5-base
depends = java-runtime>=8
depends = hicolor-icon-theme
@@ -13,10 +14,7 @@ pkgbase = apk-editor-studio
depends = android-sdk-platform-tools
depends = android-apktool
optdepends = libsecret: Enable password manager backend
- source = apk-editor-studio-1.4.0.tar.gz::https://github.com/kefir500/apk-editor-studio/archive/v1.4.0.tar.gz
- source = deploy.pri.patch
- sha256sums = 62f2830a282f44d4860330a8f371b1ac27676257fe39a70f6203d34a6633a5e5
- sha256sums = SKIP
+ source = apk-editor-studio-1.7.1.tar.gz::https://github.com/kefir500/apk-editor-studio/archive/v1.7.1.tar.gz
+ sha256sums = 676d236c8025ae1b1ac15e9ebe0617eba1fb7bb7a2728841e6bbab451174d5c9
pkgname = apk-editor-studio
-
diff --git a/PKGBUILD b/PKGBUILD
index dbc44fc3170c..7f6c7ecb5637 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
pkgname=apk-editor-studio
-pkgver=1.4.0
+pkgver=1.7.1
pkgrel=1
pkgdesc="Powerful yet easy to use APK editor"
arch=('x86_64')
@@ -14,31 +14,27 @@ depends=('qt5-base'
'android-sdk-platform-tools'
'android-apktool')
optdepends=('libsecret: Enable password manager backend')
-makedepends=('qt5-base')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kefir500/apk-editor-studio/archive/v${pkgver}.tar.gz"
- 'deploy.pri.patch')
-sha256sums=('62f2830a282f44d4860330a8f371b1ac27676257fe39a70f6203d34a6633a5e5'
- 'SKIP')
+makedepends=('qt5-base' 'cmake')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kefir500/apk-editor-studio/archive/v${pkgver}.tar.gz")
+sha256sums=('676d236c8025ae1b1ac15e9ebe0617eba1fb7bb7a2728841e6bbab451174d5c9')
prepare() {
cd "${pkgname}-${pkgver}"
- patch < "${srcdir}/deploy.pri.patch"
}
build() {
cd "${pkgname}-${pkgver}"
rm -rf build
mkdir build
- cd "${srcdir}/${pkgname}-${pkgver}/build"
- qmake PREFIX=/usr ..
- make
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ cmake -B ./build -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="/usr/lib/qt"
+ cmake --build ./build --config Release
}
package() {
cd "${pkgname}-${pkgver}"
- install -d "${pkgdir}/usr"
- cp -R bin/linux/bin "${pkgdir}/usr"
- cp -R bin/linux/share "${pkgdir}/usr"
- chown -R root:root "${pkgdir}/"
+ install -Dm755 build/bin/apk-editor-studio -t "${pkgdir}/usr/bin/"
+ install -Dm644 dist/linux/share/applications/* -t "${pkgdir}/usr/share/applications/"
+ cp -r dist/linux/share/icons/ "${pkgdir}/usr/share/"
}
-# vim:set ts=2 sw=2 et: \ No newline at end of file
+# vim:set ts=2 sw=2 et:
diff --git a/deploy.pri.patch b/deploy.pri.patch
deleted file mode 100644
index 16bc4be28ea6..000000000000
--- a/deploy.pri.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/deploy.pri 2020-05-01 09:50:23.000000000 +0300
-+++ deploy.pri 2020-06-19 08:53:25.467347443 +0300
-@@ -27,11 +27,6 @@
- QMAKE_POST_LINK += $$mkdir($$DESTDIR/../share/$$TARGET)
- QMAKE_POST_LINK += $$copy(all/., ../share/$$TARGET)
- QMAKE_POST_LINK += $$copy(linux/share, ..)
-- isEmpty(PACKAGE) {
-- QMAKE_POST_LINK += $$copy(linux/bin, ..)
-- QMAKE_POST_LINK += $$executable($$DESTDIR/adb)
-- QMAKE_POST_LINK += $$executable($$DESTDIR/zipalign)
-- }
- # Install:
- isEmpty(PREFIX): PREFIX = /usr
- target.path = $$PREFIX/bin
-@@ -40,11 +35,6 @@
- share2.files = $$PWD/res/deploy/linux/share/*
- share2.path = $$PREFIX/share
- INSTALLS += target share1 share2
-- isEmpty(PACKAGE) {
-- bin.files = $$PWD/res/deploy/linux/bin/*
-- bin.path = $$PREFIX/bin
-- INSTALLS += bin
-- }
- }
-
- macx {