[arch-commits] Commit in konversation (7 files)

[Antonio Rojas]

    Date: Wednesday, April 8, 2015 @ 08:28:48
  Author: arojas
Revision: 235604

Update to 1.6

Added:
  konversation/trunk/
Modified:
  konversation/trunk/PKGBUILD
Deleted:
  konversation/kde-unstable/
  konversation/repos/kde-unstable-i686/
  konversation/repos/kde-unstable-x86_64/
  konversation/trunk/
  konversation/trunk/qca-qt5.patch

---------------+
 PKGBUILD      |   14 +++---------
 qca-qt5.patch |   65 --------------------------------------------------------
 2 files changed, 4 insertions(+), 75 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD	2015-04-08 03:29:35 UTC (rev 235603)
+++ trunk/PKGBUILD	2015-04-08 06:28:48 UTC (rev 235604)
@@ -6,8 +6,7 @@
 # Contributor: Sergio Jovani Guzman <moret at paretux.org>
 
 pkgname=konversation
-pkgver=1.6beta1
-_pkgver=1.6-beta1
+pkgver=1.6
 pkgrel=1
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64')
@@ -17,21 +16,16 @@
 makedepends=('git' 'extra-cmake-modules' 'kdoctools' 'python')
 license=('GPL2' 'FDL')
 install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgname}/${_pkgver}/src/${pkgname}-${_pkgver}.tar.xz" 'qca-qt5.patch')
-sha1sums=('564bdc092cbdce1c0a9cf1e5362d4956c059c6f3'
-          '500739fc7d66aa812909e3fc805b363f50c971dd')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('16e8c1969b04c0946b48a436e8825654b0029bb9')
 
 prepare() {
   mkdir -p build
-
-# fix linking to Qca
-  cd $pkgname-$_pkgver
-  patch -p1 -i "$srcdir"/qca-qt5.patch
 }
 
 build() {
   cd build
-  cmake ../${pkgname}-${_pkgver} \
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_INSTALL_DIR=lib \

Deleted: trunk/qca-qt5.patch
===================================================================
--- kde-unstable/qca-qt5.patch	2015-04-08 03:29:35 UTC (rev 235603)
+++ trunk/qca-qt5.patch	2015-04-08 06:28:48 UTC (rev 235604)
@@ -1,65 +0,0 @@
-From: Harald Sitter <sitter at kde.org>
-Date: Tue, 13 Jan 2015 12:45:02 +0000
-Subject: use co-installable qca-qt5 version
-X-Git-Url: http://quickgit.kde.org/?p=konversation.git&a=commitdiff&h=3aa918b5e3ac0f90a76d55c2bab12fafcbb1279b
----
-use co-installable qca-qt5 version
-
-REVIEW: 122031
----
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,9 +44,9 @@
- find_package(Phonon4Qt5 4.6.60 REQUIRED)
- include_directories(${PHONON_INCLUDES})
- 
--find_package(Qca 2.1.0)
--set_package_properties(Qca PROPERTIES DESCRIPTION "Support for encryption"
--                       URL "http://delta.affinix.com/qca"
-+find_package(Qca-qt5 2.1.0)
-+set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION "Support for encryption"
-+                       URL "http://download.kde.org/stable/qca-qt5/"
-                        TYPE OPTIONAL)
- check_include_file("stropts.h" HAVE_STROPTS_H)
- check_include_file("byteswap.h" HAVE_BYTESWAP_H)
-@@ -55,7 +55,7 @@
- configure_file(config-konversation.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konversation.h )
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
--set(HAVE_QCA2 ${Qca_FOUND})
-+set(HAVE_QCA2 ${Qca-qt5_FOUND})
- 
- add_definitions(
-   -DQT_USE_QSTRINGBUILDER
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -185,10 +185,10 @@
-      dcc/whiteboardfontchooserui.ui
- )
- 
--if (Qca_FOUND)
-+if (Qca-qt5_FOUND)
-     set(cipher_SRCS
-         cipher.cpp)
--endif (Qca_FOUND)
-+endif (Qca-qt5_FOUND)
- 
- set(upnp_SRCS
-     upnp/soap.cpp
-@@ -235,9 +235,9 @@
-     KF5::ItemViews
-     Phonon::phonon4qt5)
- 
--if (Qca_FOUND)
--    target_link_libraries(konversation qca)
--endif (Qca_FOUND)
-+if (Qca-qt5_FOUND)
-+    target_link_libraries(konversation qca-qt5)
-+endif ()
- 
- install(TARGETS konversation ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
-