[packages/kadu] - fix building jabber plugin

baggins baggins at pld-linux.org
Sun Nov 25 18:48:07 CET 2018


commit 12907c7e7a0de7a4da45bdfc8169bbb38576420e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 25 18:47:50 2018 +0100

    - fix building jabber plugin

 jabber-plugin.patch | 11 +++++++++++
 kadu.spec           |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/kadu.spec b/kadu.spec
index 8d6039c..664b4a8 100644
--- a/kadu.spec
+++ b/kadu.spec
@@ -115,7 +115,7 @@ Source16:	http://www.ultr.pl/kadu/messagessplitter-%{messagessplitter_ver}.tar.g
 # Source16-md5:	d57cc78d5fd0f2321a2c4029c0c1df0b
 Source17:	http://www.ultr.pl/kadu/networkping-%{networkping_ver}.tar.gz
 # Source17-md5:	811aaee22156d92bad558e09eb6dc5a7
-#Patch0:		%{name}-mail.patch
+Patch0:		jabber-plugin.patch
 URL:		http://kadu.im/
 %{?with_geoip:BuildRequires:	GeoIP-devel}
 BuildRequires:	Qt3Support-devel >= %{qt_ver}
@@ -799,6 +799,7 @@ Moduł automatycznej zamiany słów dla Kadu.
 
 %prep
 %setup -q -T -b 0
+%patch0 -p1
 
 %if %{with anonymous_check}
 tar xjf %{SOURCE2} -C plugins
@@ -809,7 +810,6 @@ tar xzf %{SOURCE3} -C plugins
 %if %{with mail}
 tar xjf %{SOURCE4} -C plugins
 %undos plugins/mail/translations/mail_pl.ts
-%patch1 -p0
 %endif
 %if %{with mime_tex}
 tar xjf %{SOURCE5} -C plugins
diff --git a/jabber-plugin.patch b/jabber-plugin.patch
new file mode 100644
index 0000000..67efd64
--- /dev/null
+++ b/jabber-plugin.patch
@@ -0,0 +1,11 @@
+--- kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt~	2012-08-30 16:13:17.000000000 +0200
++++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2018-11-25 18:41:17.930573989 +0100
+@@ -26,7 +26,7 @@
+ 					get_filename_component (_basename ${_current_MOC} NAME_WE)
+ 					set (_header ${_abs_FILE})
+ 					set (_moc ${_abs_PATH}/${_current_MOC})
+-					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
++					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
+ 					MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
+ 				endforeach (_current_MOC_INC)
+ 			endif (_match)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kadu.git/commitdiff/12907c7e7a0de7a4da45bdfc8169bbb38576420e



More information about the pld-cvs-commit mailing list