summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaffle2020-05-19 18:25:02 +0300
committerWaffle2020-05-19 18:25:02 +0300
commit0602a71e8968b854f09415025e99ed9229cbd860 (patch)
treeb1bdf373a9fb849bd79458d3afa03aefc3cafd67
parentcf115edd1e9591f1d8c589154cb270f42ff0e0b6 (diff)
downloadaur-0602a71e8968b854f09415025e99ed9229cbd860.tar.gz
update to latest version
Remove `#commit=` from source url, fix broken path, add new patch for `.desktop` file.
-rw-r--r--.SRCINFO8
-rw-r--r--0001-Change-instalation-path-to-be-Arch-linux-friendly.patch22
-rw-r--r--0001-change-Exec-value-in-.desktop-file-to-match-archlinu.patch26
-rw-r--r--PKGBUILD13
4 files changed, 52 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6928ddd2797..26a71e3f5c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = anilibria-winmaclinux-git
pkgdesc = AniLibria client for major desktop platforms
- pkgver = r92.5bb0d79
+ pkgver = r139.10ad710
pkgrel = 1
url = https://github.com/anilibria/anilibria-winmaclinux
arch = x86_64
@@ -13,12 +13,14 @@ pkgbase = anilibria-winmaclinux-git
depends = gst-libav
provides = anilibria-winmaclinux
conflicts = anilibria-winmaclinux
- source = git+https://github.com/anilibria/anilibria-winmaclinux.git#commit=5bb0d79899b31ba15ad84f0187ad3b30e06190d9
+ source = git+https://github.com/anilibria/anilibria-winmaclinux.git
source = 0001-Change-instalation-path-to-be-Arch-linux-friendly.patch
source = 0001-disable-version-check.patch
+ source = 0001-change-Exec-value-in-.desktop-file-to-match-archlinu.patch
md5sums = SKIP
- md5sums = 90c273d473ea81ecba60f5c31a2db94f
+ md5sums = 59290afaa86d49b8a1e8894032663c0d
md5sums = c8f887de1082f4e8ff46d8e253ec623e
+ md5sums = 84b73c82d8240235096b278907443848
pkgname = anilibria-winmaclinux-git
diff --git a/0001-Change-instalation-path-to-be-Arch-linux-friendly.patch b/0001-Change-instalation-path-to-be-Arch-linux-friendly.patch
index 81d2f75db3e..49a2132f788 100644
--- a/0001-Change-instalation-path-to-be-Arch-linux-friendly.patch
+++ b/0001-Change-instalation-path-to-be-Arch-linux-friendly.patch
@@ -1,30 +1,34 @@
-From 2f48c641b66424a4614c10cad486aef13f1b30d3 Mon Sep 17 00:00:00 2001
+From 74a4dbfd9950a2713327cb5ea1de4bdeec8cabaf Mon Sep 17 00:00:00 2001
From: Waffle <waffle.lapkin@gmail.com>
-Date: Sun, 5 Apr 2020 23:34:32 +0300
+Date: Tue, 19 May 2020 11:17:13 +0300
Subject: [PATCH] Change instalation path to be Arch linux friendly
---
- src/AniLibria.pro | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
+ src/AniLibria.pro | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/AniLibria.pro b/src/AniLibria.pro
-index 546abff..a856440 100644
+index 58fdddf..33da0f8 100644
--- a/src/AniLibria.pro
+++ b/src/AniLibria.pro
-@@ -42,10 +42,9 @@ QML_IMPORT_PATH =
+@@ -92,14 +92,9 @@ QML_IMPORT_PATH =
# Additional import path used to resolve QML modules just for Qt Quick Designer
QML_DESIGNER_IMPORT_PATH =
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
--!isEmpty(target.path): INSTALLS += target
+-
+-!isEmpty(target.path) {
+- unix: INSTALLS += target desktop $${UNIX_ICONS}
+- else:macx: INSTALLS += target
+-}
+# Arch linux common instalation path
+target.path = /usr/bin
-+INSTALLS += target
++INSTALLS += target desktop $${UNIX_ICONS}
HEADERS += \
Classes/Models/changesmodel.h \
--
-2.26.0
+2.26.2
diff --git a/0001-change-Exec-value-in-.desktop-file-to-match-archlinu.patch b/0001-change-Exec-value-in-.desktop-file-to-match-archlinu.patch
new file mode 100644
index 00000000000..e8018db9b24
--- /dev/null
+++ b/0001-change-Exec-value-in-.desktop-file-to-match-archlinu.patch
@@ -0,0 +1,26 @@
+From 2cc483c48645141294b29638f785a61923a805ca Mon Sep 17 00:00:00 2001
+From: Waffle <waffle.lapkin@gmail.com>
+Date: Tue, 19 May 2020 11:02:51 +0300
+Subject: [PATCH] change `Exec` value in `.desktop` file to match archlinux
+ installation path
+
+---
+ data/anilibria.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/anilibria.desktop b/data/anilibria.desktop
+index 3dfcc73..04c92a5 100644
+--- a/data/anilibria.desktop
++++ b/data/anilibria.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=AniLibria
+ Comment=AniLibria desktop client
+-Exec=/opt/AniLibria/bin/AniLibria
++Exec=/usr/bin/AniLibria
+ Icon=anilibria
+ Type=Application
+ Version=0.1.2
+--
+2.26.2
+
diff --git a/PKGBUILD b/PKGBUILD
index e6dc8192e77..1ef79e1743d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Waffle Lapkin <waffle.lapkin@gmail.com>
pkgname='anilibria-winmaclinux-git'
-pkgver=r92.5bb0d79
+pkgver=r139.10ad710
pkgrel=1
pkgdesc='AniLibria client for major desktop platforms'
arch=('x86_64')
@@ -11,12 +11,14 @@ depends=('qt5-webview' 'gst-libav')
makedepends=('qt5-base' 'qt5-multimedia' 'qt5-svg' 'git')
provides=("${pkgname%-git}")
conflicts=("${pkgname%-git}")
-source=('git+https://github.com/anilibria/anilibria-winmaclinux.git#commit=5bb0d79899b31ba15ad84f0187ad3b30e06190d9'
+source=('git+https://github.com/anilibria/anilibria-winmaclinux.git'
'0001-Change-instalation-path-to-be-Arch-linux-friendly.patch'
- '0001-disable-version-check.patch')
+ '0001-disable-version-check.patch'
+ '0001-change-Exec-value-in-.desktop-file-to-match-archlinu.patch')
md5sums=('SKIP'
- '90c273d473ea81ecba60f5c31a2db94f'
- 'c8f887de1082f4e8ff46d8e253ec623e')
+ '59290afaa86d49b8a1e8894032663c0d'
+ 'c8f887de1082f4e8ff46d8e253ec623e'
+ '84b73c82d8240235096b278907443848')
pkgver() {
cd "${pkgname%-git}"
@@ -29,6 +31,7 @@ prepare() {
cd "$srcdir/${pkgname%-git}"
patch -p1 -i "$srcdir/0001-Change-instalation-path-to-be-Arch-linux-friendly.patch"
patch -p1 -i "$srcdir/0001-disable-version-check.patch"
+ patch -p1 -i "$srcdir/0001-change-Exec-value-in-.desktop-file-to-match-archlinu.patch"
}
build() {