jreen 1.2.0

3 files changed, 14 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee4cc9adc4a1..434fc750a013 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = jreen
 	pkgdesc = Free and Opensource Jabber library, written in C++ using cross-platform framework Qt.
-	pkgver = 1.1.1
-	pkgrel = 4
+	pkgver = 1.2.0
+	pkgrel = 1
 	url = http://qutim.org/jreen
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
-	depends = libidn
-	depends = qca-ossl
-	depends = zlib
+	depends = gsasl
+	depends = speex
+	depends = qt4
 	provides = jreen
 	conflicts = jreen-git
-	source = jreen-1.1.1.zip::http://github.com/euroelessar/jreen/archive/v1.1.1.zip
-	source = jreenMacros.cmake.patch
-	md5sums = 07e64faaae4be7cf2c99eac07f80fb8f
-	md5sums = 397e75be409ea7e8bddff88b6f977f5f
+	source = jreen-1.2.0.zip::http://github.com/euroelessar/jreen/archive/v1.2.0.zip
+	md5sums = ec99ee35e63dfdd22d650edbdb2e6edb
 
 pkgname = jreen
 
diff --git a/PKGBUILD b/PKGBUILD
index fc18acf52937..2768f82a727f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,20 +13,18 @@ _buildtype='Release'
 ##############################################################
 
 pkgname=jreen
-pkgver=1.1.1
-pkgrel=4
+pkgver=1.2.0
+pkgrel=1
 pkgdesc='Free and Opensource Jabber library, written in C++ using cross-platform framework Qt.'
 arch=('i686' 'x86_64')
 url='http://qutim.org/jreen'
 license=('GPL2')
-depends=('libidn' 'qca-ossl' 'zlib')
+depends=('gsasl' 'speex' 'qt4')
 makedepends=('cmake')
 provides=('jreen')
 conflicts=('jreen-git')
-source=("${pkgname}-${pkgver}.zip::http://github.com/euroelessar/${pkgname}/archive/v${pkgver}.zip"
-	'jreenMacros.cmake.patch')
-md5sums=('07e64faaae4be7cf2c99eac07f80fb8f'
-         '397e75be409ea7e8bddff88b6f977f5f')
+source=("${pkgname}-${pkgver}.zip::http://github.com/euroelessar/${pkgname}/archive/v${pkgver}.zip")
+md5sums=('ec99ee35e63dfdd22d650edbdb2e6edb')
 
 if [[ ! ${_buildtype} == 'Release' ]] && [[ ! ${_buildtype} == 'release' ]]; then
   options=('debug')
@@ -35,18 +33,16 @@ fi
 prepare() {
   if [[ -e ${srcdir}/${pkgname}-${pkgver}-build ]]; then rm -rf ${srcdir}/${pkgname}-${pkgver}-build; fi
   mkdir ${srcdir}/${pkgname}-${pkgver}-build
-
-  cd ${srcdir}/${pkgname}-${pkgver}/cmake
-  patch -i ${srcdir}/jreenMacros.cmake.patch
 }
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}-build
 
-  cmake -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+  cmake -DJREEN_FORCE_QT4=yes \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=${_buildtype} \
         ../${pkgname}-${pkgver}
+
   make
 }
 
diff --git a/jreenMacros.cmake.patch b/jreenMacros.cmake.patch
deleted file mode 100644
index 5e127f64f61e..000000000000
--- a/jreenMacros.cmake.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- jreenMacros.cmake	2013-01-06 17:49:31.000000000 +0200
-+++ jreenMacros.cmake_	2013-10-20 19:01:21.422281971 +0300
-@@ -19,7 +19,7 @@
- MACRO (JREEN_WRAP_CPP outfiles )
-         # get include dirs
-         QT4_GET_MOC_FLAGS(moc_flags)
--        QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
-+        QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
- 
-         FOREACH (it ${moc_files})
-                 GET_FILENAME_COMPONENT(_abs_FILE ${it} ABSOLUTE)
-@@ -39,7 +39,7 @@
-                                 FOREACH (_current_MOC_INC ${_match})
-                                         STRING(REGEX MATCH "moc_[^ <\"]+\\.cpp" _current_MOC "${_current_MOC_INC}")
-                                         SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
--                                        QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "")
-+                                        QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${_moc} "${_moc_INCS}" "${moc_options}" "${moc_target}")
-                                         MACRO_ADD_FILE_DEPENDENCIES(${_abs_FILE} ${_moc})
-                                 ENDFOREACH (_current_MOC_INC)
-                         ENDIF()
-@@ -47,7 +47,7 @@
-                                 FOREACH (_current_MOC_INC ${_match2})
-                                         STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}")
-                                         SET(_moc    ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
--                                        QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "")
-+                                        QT4_CREATE_MOC_COMMAND(${_header} ${_moc} "${_moc_INCS}" "${moc_options}" "${moc_target}")
-                                         MACRO_ADD_FILE_DEPENDENCIES(${_header} ${_moc})
-                                 ENDFOREACH (_current_MOC_INC)
-                         ENDIF()
-@@ -57,7 +57,7 @@
-                         STRING(REGEX MATCHALL "Q_OBJECT|Q_GADGET" _match2 "${_contents}")
-                         IF(_match2)
-                                 QT4_MAKE_OUTPUT_FILE(${_abs_FILE} moc_ cpp outfile)
--                                QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}")
-+                                QT4_CREATE_MOC_COMMAND(${_abs_FILE} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
-                                 SET(${outfiles} ${${outfiles}} ${outfile})
-                         ENDIF()
-                 ENDIF()