sync-my-l2p 2.4.1-5

* Fix qt5-base 5.14 compatibility
* Honor makepkg.conf flags
* Use source from tarball

4 files changed, 67 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3025b977dfa6..89bb07af4de5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = sync-my-l2p
 	pkgdesc = Sync the L2P and moodle instance of RWTH Aachen University
 	pkgver = 2.4.1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://syncmyl2p.de/
 	arch = x86_64
 	license = LGPL3
-	makedepends = git
 	depends = qt5-base
-	source = git+https://github.com/RobertKrajewski/Sync-my-L2P.git#commit=b35e60690f68c376bed925dfe0fa605a3c9e9f17
+	depends = hicolor-icon-theme
+	source = Sync-my-L2P-2.4.1.tar.gz::https://github.com/RobertKrajewski/Sync-my-L2P/archive/v2.4.1.tar.gz
+	source = 0001-Project-File-Fix-path-seperator.patch
 	source = https://github.com/RobertKrajewski/Sync-my-L2P/releases/download/v2.4.1/SyncMyL2P-2.4.1-linux.AppImage
-	sha256sums = SKIP
+	sha256sums = e737586597dba6f0cbc991d6dd005ac8552d289fd71081974cfb9f030aa999f2
+	sha256sums = 1a969a653252744c1243eacfadd7a156b5d78849d07dd8dd717e439a02e2b4c1
 	sha256sums = a84527eadedea94144452f300883eef87880ee0608957dc44094cbd66e6d02c1
 
 pkgname = sync-my-l2p
diff --git a/.gitignore b/.gitignore
index a250676b9565..90b84d5615ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-/*.tar.xz
+/*.tar.*
 /*.AppImage
 /pkg
 /src
-/Sync-my-L2P
+/*.log
diff --git a/0001-Project-File-Fix-path-seperator.patch b/0001-Project-File-Fix-path-seperator.patch
new file mode 100644
index 000000000000..506e207c25c3
--- /dev/null
+++ b/0001-Project-File-Fix-path-seperator.patch
@@ -0,0 +1,28 @@
+From 22329f32bf1a7923dabbf53e728836dd274e9734 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <m.kroening@hotmail.de>
+Date: Wed, 29 Jan 2020 12:38:33 +0100
+Subject: [PATCH] Project File: Fix path seperator
+
+Since Qt 5.14 backslashes are not permitted.
+---
+ Sync-my-L2P.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Sync-my-L2P.pro b/Sync-my-L2P.pro
+index 03baea5..5e73e82 100644
+--- a/Sync-my-L2P.pro
++++ b/Sync-my-L2P.pro
+@@ -62,8 +62,8 @@ TRANSLATIONS = lang/sync-my-l2p_de.ts \
+                lang/sync-my-l2p_sq.ts
+ 
+ RESOURCES += \
+-    icons\icons.qrc \
+-    lang\translation.qrc
++    icons/icons.qrc \
++    lang/translation.qrc
+ 
+ RC_FILE = icon.rc
+ 
+-- 
+2.25.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 952558f14344..9f4e76ccf9bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,48 +3,54 @@
 _realname=Sync-my-L2P
 pkgname=sync-my-l2p
 pkgver=2.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Sync the L2P and moodle instance of RWTH Aachen University'
 arch=('x86_64')
 url='https://syncmyl2p.de/'
 license=('LGPL3')
-depends=('qt5-base')
-makedepends=('git')
-_commit=b35e60690f68c376bed925dfe0fa605a3c9e9f17 # tags/v2.4.1^0
-source=("git+https://github.com/RobertKrajewski/$_realname.git#commit=$_commit"
+depends=('qt5-base' 'hicolor-icon-theme')
+source=("$_realname-$pkgver.tar.gz::https://github.com/RobertKrajewski/$_realname/archive/v$pkgver.tar.gz"
+        "0001-Project-File-Fix-path-seperator.patch"
         "https://github.com/RobertKrajewski/$_realname/releases/download/v$pkgver/SyncMyL2P-$pkgver-linux.AppImage")
-sha256sums=('SKIP'
+sha256sums=('e737586597dba6f0cbc991d6dd005ac8552d289fd71081974cfb9f030aa999f2'
+            '1a969a653252744c1243eacfadd7a156b5d78849d07dd8dd717e439a02e2b4c1'
             'a84527eadedea94144452f300883eef87880ee0608957dc44094cbd66e6d02c1')
 
 prepare() {
-	# Setup client_id
-	chmod +x SyncMyL2P-$pkgver-linux.AppImage
-	./SyncMyL2P-$pkgver-linux.AppImage --appimage-extract usr/bin/$_realname
-	client_id=$(strings squashfs-root/usr/bin/$_realname | grep .apps.rwth-aachen.de)
-	sed --in-place "s/\(#define CLIENTID\) .*/\1 \"$client_id\"/g; /#error ERROR: NO CLIENTID IN CLIENTID.H DEFINED/d" "$srcdir"/$_realname/include/clientId.h
+    # Setup client_id
+    chmod +x SyncMyL2P-$pkgver-linux.AppImage
+    ./SyncMyL2P-$pkgver-linux.AppImage --appimage-extract usr/bin/$_realname
+    client_id=$(strings squashfs-root/usr/bin/$_realname | grep .apps.rwth-aachen.de)
+    cd "$_realname-$pkgver"
+    sed --in-place "s/\(#define CLIENTID\) .*/\1 \"$client_id\"/g; /#error ERROR: NO CLIENTID IN CLIENTID.H DEFINED/d" include/clientId.h
 
-	mkdir -p build
+    patch -Np1 -i "$srcdir/0001-Project-File-Fix-path-seperator.patch"
+
+    mkdir -p build
 }
 
 build() {
-	cd build
+    cd "$_realname-$pkgver/build"
+
+    qmake-qt5 "../$_realname.pro" \
+        PREFIX=/usr \
+        QMAKE_CFLAGS="${CFLAGS}" \
+        QMAKE_CXXFLAGS="${CXXFLAGS}" \
+        QMAKE_LFLAGS="${LDFLAGS}"
 
-	qmake ../${_realname}
-	make
+    make
 }
 
 package() {
-	cd build
-
-	# Binary
-	install -D -m0755 bin/$_realname "$pkgdir"/usr/bin/$_realname
+    cd "$_realname-$pkgver"
 
-    cd ../${_realname}
+    # Binary
+    install -D -m0755 build/bin/$_realname "$pkgdir"/usr/bin/$_realname
 
-	# Desktop entry
-	install -D -m0644 linux/$_realname.desktop "$pkgdir"/usr/share/applications/$_realname.desktop
+    # Desktop entry
+    install -D -m0644 linux/$_realname.desktop "$pkgdir"/usr/share/applications/$_realname.desktop
 
-	# Icons
-	mkdir --parents "$pkgdir"/usr/share/icons && cp --recursive linux/hicolor "$pkgdir"/usr/share/icons/
-	chmod --recursive 755 "$pkgdir"/usr/share/icons/hicolor
+    # Icons
+    mkdir --parents "$pkgdir"/usr/share/icons && cp --recursive linux/hicolor "$pkgdir"/usr/share/icons/
+    chmod --recursive 755 "$pkgdir"/usr/share/icons/hicolor
 }