update to 2.7.0 with minor build fix

3 files changed, 57 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0bb76f3e3156..86e5613825d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libqtelegram-ae
 	pkgdesc = Telegram library written in Qt based on telegram-cli code
-	pkgver = 5.0
+	pkgver = 6.0
 	pkgrel = 1
 	epoch = 2
 	url = https://launchpad.net/libqtelegram
@@ -10,8 +10,10 @@ pkgbase = libqtelegram-ae
 	makedepends = cmake
 	depends = qt5-base>=5.5
 	depends = qt5-multimedia
-	source = https://github.com/Aseman-Land/libqtelegram-aseman-edition/archive/v5.0.tar.gz
-	sha256sums = 372c4294cbfcfb614f53baf92badf1939d14076eb068fa38b4d693dff6c18515
+	source = https://github.com/Aseman-Land/libqtelegram-aseman-edition/archive/v6.0.tar.gz
+	source = buildfix.patch
+	sha256sums = 3dfc3f034054530cc664de99991de4d35972f00c29cfa2591822141864bf284d
+	sha256sums = 4fea9a823fac00675eca3a26c8013d374d78d51e377cf624e9bb615a35bbddb2
 
 pkgname = libqtelegram-ae
 
diff --git a/PKGBUILD b/PKGBUILD
index 86183b5719fd..27510193d3fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=libqtelegram-ae
 _pkgname=libqtelegram-aseman-edition
 epoch=2
-pkgver=5.0
+pkgver=6.0
 pkgrel=1
 pkgdesc="Telegram library written in Qt based on telegram-cli code"
 arch=('x86_64' 'i686')
@@ -16,18 +16,20 @@ license=('GPL3')
 url=("https://launchpad.net/libqtelegram")
 depends=('qt5-base>=5.5' 'qt5-multimedia')
 makedepends=('cmake')
-source=("https://github.com/Aseman-Land/libqtelegram-aseman-edition/archive/v$pkgver.tar.gz")
-sha256sums=('372c4294cbfcfb614f53baf92badf1939d14076eb068fa38b4d693dff6c18515')
+source=("https://github.com/Aseman-Land/libqtelegram-aseman-edition/archive/v$pkgver.tar.gz"
+        "buildfix.patch")
+sha256sums=('3dfc3f034054530cc664de99991de4d35972f00c29cfa2591822141864bf284d'
+            '4fea9a823fac00675eca3a26c8013d374d78d51e377cf624e9bb615a35bbddb2')
 
 prepare() {
   cd $_pkgname-$pkgver
-  sed -i 's#target.path = $$PREFIX/lib/$$LIB_PATH#target.path = $$PREFIX/lib#' libqtelegram-ae.pro
+  patch -p1 <../buildfix.patch
   mkdir -p build
 }
 
 build() {
   cd $_pkgname-$pkgver/build
-  qmake-qt5 -r .. PREFIX=/usr
+  qmake-qt5 -r .. PREFIX=/usr INSTALL_LIBS_PREFIX=/usr/lib INSTALL_HEADERS_PREFIX=/usr/include
   make
 }
 
diff --git a/buildfix.patch b/buildfix.patch
new file mode 100644
index 000000000000..30a9c7bfaa6b
--- /dev/null
+++ b/buildfix.patch
@@ -0,0 +1,45 @@
+From b884c25da99429ad6b6390608a4f57f6570fb77a Mon Sep 17 00:00:00 2001
+From: Bardia Daneshvar <bardia.daneshvar@gmail.com>
+Date: Mon, 5 Oct 2015 21:54:01 +0330
+Subject: [PATCH 1/2] Fix build problem
+
+---
+ libqtelegram-ae.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libqtelegram-ae.pro b/libqtelegram-ae.pro
+index 1853c07..814991b 100644
+--- a/libqtelegram-ae.pro
++++ b/libqtelegram-ae.pro
+@@ -24,7 +24,7 @@ linux {
+ }
+ 
+ isEmpty(PREFIX) {
+-    isEmpty(INSTALL_HEADERS_PREFIX): INSTALL_HEADE_PREFIXR = $$[QT_INSTALL_HEADERS]
++    isEmpty(INSTALL_HEADERS_PREFIX): INSTALL_HEADERS_PREFIX = $$[QT_INSTALL_HEADERS]
+     isEmpty(INSTALL_LIBS_PREFIX): INSTALL_LIBS_PREFIX = $$[QT_INSTALL_LIBS]
+ } else {
+     isEmpty(INSTALL_HEADERS_PREFIX): INSTALL_HEADER_PREFIX = $$PREFIX/include
+
+From 0a543096ecbd956a24c64dde997785d6bd887437 Mon Sep 17 00:00:00 2001
+From: Bardia Daneshvar <bardia.daneshvar@gmail.com>
+Date: Mon, 5 Oct 2015 21:55:08 +0330
+Subject: [PATCH 2/2] Fix build problem
+
+---
+ libqtelegram-ae.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libqtelegram-ae.pro b/libqtelegram-ae.pro
+index 814991b..5af7c40 100644
+--- a/libqtelegram-ae.pro
++++ b/libqtelegram-ae.pro
+@@ -27,7 +27,7 @@ isEmpty(PREFIX) {
+     isEmpty(INSTALL_HEADERS_PREFIX): INSTALL_HEADERS_PREFIX = $$[QT_INSTALL_HEADERS]
+     isEmpty(INSTALL_LIBS_PREFIX): INSTALL_LIBS_PREFIX = $$[QT_INSTALL_LIBS]
+ } else {
+-    isEmpty(INSTALL_HEADERS_PREFIX): INSTALL_HEADER_PREFIX = $$PREFIX/include
++    isEmpty(INSTALL_HEADERS_PREFIX): INSTALL_HEADERS_PREFIX = $$PREFIX/include
+     isEmpty(INSTALL_LIBS_PREFIX): INSTALL_LIBS_PREFIX = $$PREFIX/lib/$$LIB_PATH
+ }
+