mirror of
https://github.com/arcan1s/arcanis.me.git
synced 2025-04-24 23:37:19 +00:00
change build of qutim to current state
This commit is contained in:
parent
2ca387a0bb
commit
7f3bc08008
@ -82,22 +82,7 @@ diff -ruN qutim.orig/core/libqutim.qbs qutim/core/libqutim.qbs
|
|||||||
}
|
}
|
||||||
|
|
||||||
{% endhighlight %}
|
{% endhighlight %}
|
||||||
<p align="justify">The second one is qbs:</p>
|
<p align="justify">And the second one is Vk plugin:</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>
|
|
||||||
{% highlight diff %}
|
{% highlight diff %}
|
||||||
diff -ruN qutim.orig/protocols/vkontakte/vreen/vreen.qbs qutim/protocols/vkontakte/vreen/vreen.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.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"
|
"qutim-qbs-1.1.patch"
|
||||||
"qbs-qutim.conf")
|
"qbs-qutim.conf")
|
||||||
md5sums=('SKIP'
|
md5sums=('SKIP'
|
||||||
'c0f151c43c055f76d3fa3efa3b8005e0'
|
'12c30176729a5230ff7e6effbb1b37f8'
|
||||||
'40f096b269eb00b040035591fce8e259')
|
'40f096b269eb00b040035591fce8e259')
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
|
@ -9,13 +9,13 @@ arch=('i686' 'x86_64')
|
|||||||
url="http://qutim.org"
|
url="http://qutim.org"
|
||||||
license=('LGPL' 'GPL3')
|
license=('LGPL' 'GPL3')
|
||||||
depends=('jreen-git' 'libc++abi' 'qt5-quick1' 'qt5-x11extras')
|
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)
|
conflicts=(qutim-0.2_ru-git, qutim-0.3-git, qutim-stable, qutim-git)
|
||||||
source=("${_gitname}::git+https://github.com/euroelessar/qutim.git"
|
source=("${_gitname}::git+https://github.com/euroelessar/qutim.git"
|
||||||
"qutim-qbs-1.1.patch"
|
"qutim-qbs-1.1.patch"
|
||||||
"qbs-qutim.conf")
|
"qbs-qutim.conf")
|
||||||
md5sums=('SKIP'
|
md5sums=('SKIP'
|
||||||
'c0f151c43c055f76d3fa3efa3b8005e0'
|
'12c30176729a5230ff7e6effbb1b37f8'
|
||||||
'40f096b269eb00b040035591fce8e259')
|
'40f096b269eb00b040035591fce8e259')
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
|
@ -10,18 +10,7 @@ diff -ruN qutim.orig/core/libqutim.qbs qutim/core/libqutim.qbs
|
|||||||
return flags;
|
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
|
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.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
|
+++ qutim/protocols/vkontakte/vreen/vreen.qbs 2014-01-06 15:46:47.142178486 +0400
|
||||||
|
@ -82,21 +82,6 @@ diff -ruN qutim.orig/core/libqutim.qbs qutim/core/libqutim.qbs
|
|||||||
}
|
}
|
||||||
|
|
||||||
{% endhighlight %}
|
{% 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>
|
<p align="justify">И пофиксить сборку библиотеки для Vk:</p>
|
||||||
{% highlight diff %}
|
{% highlight diff %}
|
||||||
diff -ruN qutim.orig/protocols/vkontakte/vreen/vreen.qbs qutim/protocols/vkontakte/vreen/vreen.qbs
|
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"
|
"qutim-qbs-1.1.patch"
|
||||||
"qbs-qutim.conf")
|
"qbs-qutim.conf")
|
||||||
md5sums=('SKIP'
|
md5sums=('SKIP'
|
||||||
'c0f151c43c055f76d3fa3efa3b8005e0'
|
'12c30176729a5230ff7e6effbb1b37f8'
|
||||||
'40f096b269eb00b040035591fce8e259')
|
'40f096b269eb00b040035591fce8e259')
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
|
Loading…
Reference in New Issue
Block a user