[arch-commits] Commit in kvirc/repos (8 files)

Antonio Rojas arojas at archlinux.org
Mon Mar 13 18:21:22 UTC 2017


    Date: Monday, March 13, 2017 @ 18:21:21
  Author: arojas
Revision: 216106

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  kvirc/repos/community-staging-i686/
  kvirc/repos/community-staging-i686/PKGBUILD
    (from rev 216105, kvirc/trunk/PKGBUILD)
  kvirc/repos/community-staging-i686/kvirc-4.0.4-gcc-4.7.0.patch
    (from rev 216105, kvirc/trunk/kvirc-4.0.4-gcc-4.7.0.patch)
  kvirc/repos/community-staging-i686/kvirc-fix-build.patch
    (from rev 216105, kvirc/trunk/kvirc-fix-build.patch)
  kvirc/repos/community-staging-x86_64/
  kvirc/repos/community-staging-x86_64/PKGBUILD
    (from rev 216105, kvirc/trunk/PKGBUILD)
  kvirc/repos/community-staging-x86_64/kvirc-4.0.4-gcc-4.7.0.patch
    (from rev 216105, kvirc/trunk/kvirc-4.0.4-gcc-4.7.0.patch)
  kvirc/repos/community-staging-x86_64/kvirc-fix-build.patch
    (from rev 216105, kvirc/trunk/kvirc-fix-build.patch)

------------------------------------------------------+
 community-staging-i686/PKGBUILD                      |   49 +++++++++++++
 community-staging-i686/kvirc-4.0.4-gcc-4.7.0.patch   |   62 +++++++++++++++++
 community-staging-i686/kvirc-fix-build.patch         |   20 +++++
 community-staging-x86_64/PKGBUILD                    |   49 +++++++++++++
 community-staging-x86_64/kvirc-4.0.4-gcc-4.7.0.patch |   62 +++++++++++++++++
 community-staging-x86_64/kvirc-fix-build.patch       |   20 +++++
 6 files changed, 262 insertions(+)

Copied: kvirc/repos/community-staging-i686/PKGBUILD (from rev 216105, kvirc/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2017-03-13 18:21:21 UTC (rev 216106)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=kvirc
+pkgver=4.2.0
+pkgrel=11
+pkgdesc="Qt-based IRC client"
+url="http://www.kvirc.net"
+depends=('python2' 'libxss' 'qt4')
+arch=(i686 x86_64)
+makedepends=('cmake')
+license=('GPL')
+source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2 kvirc-fix-build.patch)
+md5sums=('bf7229aaae132933a18b6a35125a2328'
+         'dd8a892c17cc34107942fa5d7257f118')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build
+  patch -p1 -i ../kvirc-fix-build.patch
+  # Fix overlinking
+  sed -e '/lcrypto/d' -i CMakeLists.txt
+}
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DWANT_KDE4=OFF \
+    -DWANT_PERL=ON \
+    -DWANT_PHONON=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
+    -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
+    -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so
+  make
+}
+
+package() {
+  cd "$srcdir"/build
+  make DESTDIR="$pkgdir" install
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+	_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+	_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+	depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+}

Copied: kvirc/repos/community-staging-i686/kvirc-4.0.4-gcc-4.7.0.patch (from rev 216105, kvirc/trunk/kvirc-4.0.4-gcc-4.7.0.patch)
===================================================================
--- community-staging-i686/kvirc-4.0.4-gcc-4.7.0.patch	                        (rev 0)
+++ community-staging-i686/kvirc-4.0.4-gcc-4.7.0.patch	2017-03-13 18:21:21 UTC (rev 216106)
@@ -0,0 +1,62 @@
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 4667)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6024)
+@@ -190,6 +190,6 @@
+ 	QString artist;
+ 	QString title;
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6024)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6025)
+@@ -139,6 +139,6 @@
+ 		return __return_if_fail; \
+ 	MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
+-	foreach (QVariant v, reply.arguments()) { \
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v); \
++	foreach (QVariant w, reply.arguments()) { \
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w); \
+ 		QVariant v = qdbus_cast<QVariantMap>(arg); \
+ 		if (v.userType() == QVariant::Map) { \
+@@ -214,6 +214,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", "")
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -292,6 +292,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", -1)
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -353,6 +353,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", "")
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -404,6 +404,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", -1)
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {

Copied: kvirc/repos/community-staging-i686/kvirc-fix-build.patch (from rev 216105, kvirc/trunk/kvirc-fix-build.patch)
===================================================================
--- community-staging-i686/kvirc-fix-build.patch	                        (rev 0)
+++ community-staging-i686/kvirc-fix-build.patch	2017-03-13 18:21:21 UTC (rev 216106)
@@ -0,0 +1,20 @@
+--- kvirc-4.2.0/src/kvirc/kernel/KviIrcConnection.cpp.orig	2016-05-12 09:06:26.860358905 +0000
++++ kvirc-4.2.0/src/kvirc/kernel/KviIrcConnection.cpp	2016-05-12 09:06:37.610323266 +0000
+@@ -669,7 +669,7 @@
+ 	while(m_pChannelList->first())
+ 	{
+ 		m_pChannelList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
+ 	}
+ }
+ 
+@@ -678,7 +678,7 @@
+ 	while(m_pQueryList->first())
+ 	{
+ 		m_pQueryList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
+ 	}
+ }
+ 

Copied: kvirc/repos/community-staging-x86_64/PKGBUILD (from rev 216105, kvirc/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2017-03-13 18:21:21 UTC (rev 216106)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=kvirc
+pkgver=4.2.0
+pkgrel=11
+pkgdesc="Qt-based IRC client"
+url="http://www.kvirc.net"
+depends=('python2' 'libxss' 'qt4')
+arch=(i686 x86_64)
+makedepends=('cmake')
+license=('GPL')
+source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2 kvirc-fix-build.patch)
+md5sums=('bf7229aaae132933a18b6a35125a2328'
+         'dd8a892c17cc34107942fa5d7257f118')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build
+  patch -p1 -i ../kvirc-fix-build.patch
+  # Fix overlinking
+  sed -e '/lcrypto/d' -i CMakeLists.txt
+}
+
+build() {
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DWANT_KDE4=OFF \
+    -DWANT_PERL=ON \
+    -DWANT_PHONON=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
+    -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
+    -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so
+  make
+}
+
+package() {
+  cd "$srcdir"/build
+  make DESTDIR="$pkgdir" install
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+	_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+	_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+	depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
+}

Copied: kvirc/repos/community-staging-x86_64/kvirc-4.0.4-gcc-4.7.0.patch (from rev 216105, kvirc/trunk/kvirc-4.0.4-gcc-4.7.0.patch)
===================================================================
--- community-staging-x86_64/kvirc-4.0.4-gcc-4.7.0.patch	                        (rev 0)
+++ community-staging-x86_64/kvirc-4.0.4-gcc-4.7.0.patch	2017-03-13 18:21:21 UTC (rev 216106)
@@ -0,0 +1,62 @@
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 4667)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6024)
+@@ -190,6 +190,6 @@
+ 	QString artist;
+ 	QString title;
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+Index: /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp
+===================================================================
+--- /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6024)
++++ /branches/kvirc/4.0/src/modules/mediaplayer/mp_mprisinterface.cpp	(revision 6025)
+@@ -139,6 +139,6 @@
+ 		return __return_if_fail; \
+ 	MPRIS_CALL_METHOD("GetMetadata", __return_if_fail) \
+-	foreach (QVariant v, reply.arguments()) { \
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v); \
++	foreach (QVariant w, reply.arguments()) { \
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w); \
+ 		QVariant v = qdbus_cast<QVariantMap>(arg); \
+ 		if (v.userType() == QVariant::Map) { \
+@@ -214,6 +214,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", "")
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -292,6 +292,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", -1)
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -353,6 +353,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", "")
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {
+@@ -404,6 +404,6 @@
+ 	MPRIS_CALL_METHOD("GetMetadata", -1)
+ 
+-	foreach (QVariant v, reply.arguments()) {
+-		QDBusArgument arg = qvariant_cast<QDBusArgument>(v);
++	foreach (QVariant w, reply.arguments()) {
++		QDBusArgument arg = qvariant_cast<QDBusArgument>(w);
+ 		QVariant v = qdbus_cast<QVariantMap>(arg);
+ 		if (v.userType() == QVariant::Map) {

Copied: kvirc/repos/community-staging-x86_64/kvirc-fix-build.patch (from rev 216105, kvirc/trunk/kvirc-fix-build.patch)
===================================================================
--- community-staging-x86_64/kvirc-fix-build.patch	                        (rev 0)
+++ community-staging-x86_64/kvirc-fix-build.patch	2017-03-13 18:21:21 UTC (rev 216106)
@@ -0,0 +1,20 @@
+--- kvirc-4.2.0/src/kvirc/kernel/KviIrcConnection.cpp.orig	2016-05-12 09:06:26.860358905 +0000
++++ kvirc-4.2.0/src/kvirc/kernel/KviIrcConnection.cpp	2016-05-12 09:06:37.610323266 +0000
+@@ -669,7 +669,7 @@
+ 	while(m_pChannelList->first())
+ 	{
+ 		m_pChannelList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
+ 	}
+ }
+ 
+@@ -678,7 +678,7 @@
+ 	while(m_pQueryList->first())
+ 	{
+ 		m_pQueryList->first()->close();
+-		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers & QEventLoop::ExcludeUserInputEvents);
++		QApplication::processEvents(QEventLoop::ExcludeSocketNotifiers | QEventLoop::ExcludeUserInputEvents);
+ 	}
+ }
+ 


More information about the arch-commits mailing list