From 7f3bc080085c2bf05b35ba95becc45f28d171d3f Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Thu, 6 Mar 2014 21:27:14 +0400
Subject: [PATCH] change build of qutim to current state

---
 .../2014-01-21-building-qutim-using-qt5.html  | 19 ++-----------------
 resources/docs/qutim-qt5-git/PKGBUILD         |  4 ++--
 .../docs/qutim-qt5-git/qutim-qbs-1.1.patch    | 13 +------------
 .../2014-01-21-building-qutim-using-qt5.html  | 17 +----------------
 4 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/_posts/2014-01-21-building-qutim-using-qt5.html b/_posts/2014-01-21-building-qutim-using-qt5.html
index 1346ab1..1075e8a 100644
--- a/_posts/2014-01-21-building-qutim-using-qt5.html
+++ b/_posts/2014-01-21-building-qutim-using-qt5.html
@@ -82,22 +82,7 @@ diff -ruN qutim.orig/core/libqutim.qbs qutim/core/libqutim.qbs
          }
  
 {% endhighlight %}
-<p align="justify">The second one is qbs:</p>
-{% highlight diff %}
-diff -ruN qutim.orig/protocols/jabber/jreen/jreen.qbs qutim/protocols/jabber/jreen/jreen.qbs
---- qutim.orig/protocols/jabber/jreen/jreen.qbs 2014-01-06 15:41:33.000000000 +0400
-+++ qutim/protocols/jabber/jreen/jreen.qbs  2014-01-06 15:44:54.502175067 +0400
-@@ -2,7 +2,7 @@
- 
- Project {
- 
--    moduleSearchPaths: "qbs/modules"
-+    qbsSearchPaths: "qbs/modules"
- 
-     references: "src/src.qbs"
- }
-{% endhighlight %}
-<p align="justify">And the last one is Vk plugin:</p>
+<p align="justify">And the second one is Vk plugin:</p>
 {% highlight diff %}
 diff -ruN qutim.orig/protocols/vkontakte/vreen/vreen.qbs qutim/protocols/vkontakte/vreen/vreen.qbs
 --- qutim.orig/protocols/vkontakte/vreen/vreen.qbs  2014-01-06 15:41:42.000000000 +0400
@@ -160,7 +145,7 @@ source=("${_gitname}::git+https://github.com/euroelessar/qutim.git"
         "qutim-qbs-1.1.patch"
         "qbs-qutim.conf")
 md5sums=('SKIP'
-         'c0f151c43c055f76d3fa3efa3b8005e0'
+         '12c30176729a5230ff7e6effbb1b37f8'
          '40f096b269eb00b040035591fce8e259')
 
 pkgver() {
diff --git a/resources/docs/qutim-qt5-git/PKGBUILD b/resources/docs/qutim-qt5-git/PKGBUILD
index e3499f1..4dc0088 100644
--- a/resources/docs/qutim-qt5-git/PKGBUILD
+++ b/resources/docs/qutim-qt5-git/PKGBUILD
@@ -9,13 +9,13 @@ arch=('i686' 'x86_64')
 url="http://qutim.org"
 license=('LGPL' 'GPL3')
 depends=('jreen-git' 'libc++abi' 'qt5-quick1' 'qt5-x11extras')
-makedepends=('clang' 'qbs')
+makedepends=('git' 'clang' 'qbs')
 conflicts=(qutim-0.2_ru-git, qutim-0.3-git, qutim-stable, qutim-git)
 source=("${_gitname}::git+https://github.com/euroelessar/qutim.git"
         "qutim-qbs-1.1.patch"
         "qbs-qutim.conf")
 md5sums=('SKIP'
-         'c0f151c43c055f76d3fa3efa3b8005e0'
+         '12c30176729a5230ff7e6effbb1b37f8'
          '40f096b269eb00b040035591fce8e259')
 
 pkgver() {
diff --git a/resources/docs/qutim-qt5-git/qutim-qbs-1.1.patch b/resources/docs/qutim-qt5-git/qutim-qbs-1.1.patch
index 6fcfe35..e078fa1 100644
--- a/resources/docs/qutim-qt5-git/qutim-qbs-1.1.patch
+++ b/resources/docs/qutim-qt5-git/qutim-qbs-1.1.patch
@@ -10,18 +10,7 @@ diff -ruN qutim.orig/core/libqutim.qbs qutim/core/libqutim.qbs
              return flags;
          }
  
-diff -ruN qutim.orig/protocols/jabber/jreen/jreen.qbs qutim/protocols/jabber/jreen/jreen.qbs
---- qutim.orig/protocols/jabber/jreen/jreen.qbs	2014-01-06 15:41:33.000000000 +0400
-+++ qutim/protocols/jabber/jreen/jreen.qbs	2014-01-06 15:44:54.502175067 +0400
-@@ -2,7 +2,7 @@
- 
- Project {
- 
--    moduleSearchPaths: "qbs/modules"
-+    qbsSearchPaths: "qbs/modules"
- 
-     references: "src/src.qbs"
- }
+
 diff -ruN qutim.orig/protocols/vkontakte/vreen/vreen.qbs qutim/protocols/vkontakte/vreen/vreen.qbs
 --- qutim.orig/protocols/vkontakte/vreen/vreen.qbs	2014-01-06 15:41:42.000000000 +0400
 +++ qutim/protocols/vkontakte/vreen/vreen.qbs	2014-01-06 15:46:47.142178486 +0400
diff --git a/ru/_posts/2014-01-21-building-qutim-using-qt5.html b/ru/_posts/2014-01-21-building-qutim-using-qt5.html
index ab849dc..65c6dce 100644
--- a/ru/_posts/2014-01-21-building-qutim-using-qt5.html
+++ b/ru/_posts/2014-01-21-building-qutim-using-qt5.html
@@ -82,21 +82,6 @@ diff -ruN qutim.orig/core/libqutim.qbs qutim/core/libqutim.qbs
          }
  
 {% endhighlight %}
-<p align="justify">Далее пофиксить устаревший стандарт qbs:</p>
-{% highlight diff %}
-diff -ruN qutim.orig/protocols/jabber/jreen/jreen.qbs qutim/protocols/jabber/jreen/jreen.qbs
---- qutim.orig/protocols/jabber/jreen/jreen.qbs 2014-01-06 15:41:33.000000000 +0400
-+++ qutim/protocols/jabber/jreen/jreen.qbs  2014-01-06 15:44:54.502175067 +0400
-@@ -2,7 +2,7 @@
- 
- Project {
- 
--    moduleSearchPaths: "qbs/modules"
-+    qbsSearchPaths: "qbs/modules"
- 
-     references: "src/src.qbs"
- }
-{% endhighlight %}
 <p align="justify">И пофиксить сборку библиотеки для Vk:</p>
 {% highlight diff %}
 diff -ruN qutim.orig/protocols/vkontakte/vreen/vreen.qbs qutim/protocols/vkontakte/vreen/vreen.qbs
@@ -160,7 +145,7 @@ source=("${_gitname}::git+https://github.com/euroelessar/qutim.git"
         "qutim-qbs-1.1.patch"
         "qbs-qutim.conf")
 md5sums=('SKIP'
-         'c0f151c43c055f76d3fa3efa3b8005e0'
+         '12c30176729a5230ff7e6effbb1b37f8'
          '40f096b269eb00b040035591fce8e259')
 
 pkgver() {