fix jreen compilation

3 files changed, 49 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2171bda84363..ee4cc9adc4a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jreen
 	pkgdesc = Free and Opensource Jabber library, written in C++ using cross-platform framework Qt.
 	pkgver = 1.1.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://qutim.org/jreen
 	arch = i686
 	arch = x86_64
@@ -13,7 +13,9 @@ pkgbase = jreen
 	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
 
 pkgname = jreen
 
diff --git a/PKGBUILD b/PKGBUILD
index ef40ff6552c4..2176f6e5c151 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _buildtype="Release"
 
 pkgname=jreen
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Free and Opensource Jabber library, written in C++ using cross-platform framework Qt."
 arch=('i686' 'x86_64')
 url="http://qutim.org/jreen"
@@ -24,8 +24,10 @@ depends=('libidn' 'qca-ossl' 'zlib')
 makedepends=('cmake')
 provides=('jreen')
 conflicts=('jreen-git')
-source=("${pkgname}-${pkgver}.zip::http://github.com/euroelessar/${pkgname}/archive/v${pkgver}.zip")
-md5sums=('07e64faaae4be7cf2c99eac07f80fb8f')
+source=("${pkgname}-${pkgver}.zip::http://github.com/euroelessar/${pkgname}/archive/v${pkgver}.zip"
+	'jreenMacros.cmake.patch')
+md5sums=('07e64faaae4be7cf2c99eac07f80fb8f'
+         '397e75be409ea7e8bddff88b6f977f5f')
 
 # Clean options array to strip pkg if release buildtype is chosen
 if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
@@ -35,6 +37,9 @@ 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() {
diff --git a/jreenMacros.cmake.patch b/jreenMacros.cmake.patch
new file mode 100644
index 000000000000..5e127f64f61e
--- /dev/null
+++ b/jreenMacros.cmake.patch
@@ -0,0 +1,38 @@
+--- 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()