Attachment 160173 Details for Bug 202547 – Patch.diff

[patch] Patch.diff

patch-licq-qt-gui.diff (text/plain), 6.24 KB, created by Andriy Voskoboinyk on 2015-08-21 14:48:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-08-21 14:48:33 UTC

Size: 6.24 KB

patch

obsolete

>Index: net-im/licq-qt-gui/Makefile
>===================================================================
>--- net-im/licq-qt-gui/Makefile	(revision 394262)
>+++ net-im/licq-qt-gui/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	qt4-gui
> PORTVERSION=	1.8.2
>+PORTREVISION=	1
> CATEGORIES=	net-im
> PKGNAMESUFFIX?=	${KDE_SUFFIX}${PKGNAMESUFFIX2}
> 
>@@ -14,15 +15,29 @@
> LIB_DEPENDS=	libboost_regex.so:${PORTSDIR}/devel/boost-libs
> RUN_DEPENDS=	${LOCALBASE}/lib/licq/protocol_icq.so:${PORTSDIR}/${LICQ_PORT}-icq
> 
>-USE_XORG=	x11 xext ice xscrnsaver
>+USE_XORG=	ice x11 xext xscrnsaver
> USES=		cmake
>-USE_QT4=	qmake_build moc_build rcc_build uic_build linguist_build
>+USE_QT4=	qmake_build moc_build rcc_build uic_build linguisttools_build \
>+		corelib xml gui
> 
>-OPTIONS_DEFINE=	KDE4
>+OPTIONS_DEFINE=	HUNSPELL KDE4
> OPTIONS_DEFAULT=
> 
> LICQ_PORT?=	net-im/licq
> 
>+HUNSPELL_LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
>+HUNSPELL_CMAKE_ON=	-DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \
>+			-DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.3.so \
>+			-DHUNSPELL_FOUND:BOOL=ON
>+HUNSPELL_CMAKE_OFF=	-DHUNSPELL_FOUND:BOOL=OFF
>+
>+KDE4_USE=		KDE4=kdelibs,automoc4
>+KDE4_PREVENTS=		HUNSPELL
>+KDE4_CMAKE_ON=		-DWITH_KDE:BOOL=ON
>+KDE4_CMAKE_OFF=		-DWITH_KDE:BOOL=OFF
>+KDE4_PLIST_SUB=		GUI_NAME=kde4 WITH_KDE="" WITH_QT="@comment "
>+KDE4_PLIST_SUB_OFF=	GUI_NAME=qt4  WITH_KDE="@comment " WITH_QT=""
>+
> .include <bsd.port.options.mk>
> 
> .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc"
>@@ -29,16 +44,6 @@
> 
> .if ${PORT_OPTIONS:MKDE4}
> KDE_SUFFIX=	-kde
>-USE_KDE4=	kdelibs automoc4
>-CMAKE_ARGS+=	-DWITH_KDE:BOOL=ON
>-PLIST_SUB+=	GUI_NAME=kde4
>-PLIST_SUB+=	WITH_KDE=""
>-PLIST_SUB+=	WITH_QT="@comment "
>-.else
>-USE_QT4+=	xml gui
>-PLIST_SUB+=	GUI_NAME=qt4
>-PLIST_SUB+=	WITH_KDE="@comment "
>-PLIST_SUB+=	WITH_QT=""
> .endif
> 
> .include <bsd.port.mk>
>Index: net-im/licq-qt-gui/files/patch-contactuserdata.h
>===================================================================
>--- net-im/licq-qt-gui/files/patch-contactuserdata.h	(revision 394262)
>+++ net-im/licq-qt-gui/files/patch-contactuserdata.h	(working copy)
>@@ -1,11 +0,0 @@
>---- src/contactlist/contactuserdata.h.orig	2013-08-25 11:45:17.000000000 +0200
>-+++ src/contactlist/contactuserdata.h	2014-02-13 21:44:51.000000000 +0100
>-@@ -20,6 +20,8 @@
>- #ifndef CONTACTUSERDATA_H
>- #define CONTACTUSERDATA_H
>- 
>-+#include <time.h>
>-+
>- #include <QList>
>- #include <QString>
>- #include <QTimer>
>Index: net-im/licq-qt-gui/files/patch-plugin.cpp
>===================================================================
>--- net-im/licq-qt-gui/files/patch-plugin.cpp	(revision 394262)
>+++ net-im/licq-qt-gui/files/patch-plugin.cpp	(working copy)
>@@ -1,10 +0,0 @@
>---- src/core/plugin.cpp.orig	2014-06-01 21:16:42.000000000 +0200
>-+++ src/core/plugin.cpp	2014-06-06 22:08:35.000000000 +0200
>-@@ -31,6 +31,7 @@
>- # include <QInternal>
>- #include <KDE/KCmdLineArgs>
>- #include <KDE/KMessage>
>-+#include <stdlib.h>
>- #else
>- # include <QStyleFactory>
>- #endif
>Index: net-im/licq-qt-gui/files/patch-src_contactlist_contactuserdata.h
>===================================================================
>--- net-im/licq-qt-gui/files/patch-src_contactlist_contactuserdata.h	(revision 0)
>+++ net-im/licq-qt-gui/files/patch-src_contactlist_contactuserdata.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/contactlist/contactuserdata.h.orig	2014-06-01 19:16:42 UTC
>++++ src/contactlist/contactuserdata.h
>+@@ -20,6 +20,8 @@
>+ #ifndef CONTACTUSERDATA_H
>+ #define CONTACTUSERDATA_H
>+ 
>++#include <time.h>
>++
>+ #include <QList>
>+ #include <QString>
>+ #include <QTimer>
>
>Property changes on: net-im/licq-qt-gui/files/patch-src_contactlist_contactuserdata.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-im/licq-qt-gui/files/patch-src_core_plugin.cpp
>===================================================================
>--- net-im/licq-qt-gui/files/patch-src_core_plugin.cpp	(revision 0)
>+++ net-im/licq-qt-gui/files/patch-src_core_plugin.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/core/plugin.cpp.orig	2014-06-01 19:16:42 UTC
>++++ src/core/plugin.cpp
>+@@ -31,6 +31,7 @@
>+ # include <QInternal>
>+ #include <KDE/KCmdLineArgs>
>+ #include <KDE/KMessage>
>++#include <stdlib.h>
>+ #else
>+ # include <QStyleFactory>
>+ #endif
>
>Property changes on: net-im/licq-qt-gui/files/patch-src_core_plugin.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net-im/licq-qt-gui/files/patch-src_userevents_usereventcommon.h
>===================================================================
>--- net-im/licq-qt-gui/files/patch-src_userevents_usereventcommon.h	(revision 0)
>+++ net-im/licq-qt-gui/files/patch-src_userevents_usereventcommon.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/userevents/usereventcommon.h.orig	2014-06-01 19:16:42 UTC
>++++ src/userevents/usereventcommon.h
>+@@ -20,6 +20,8 @@
>+ #ifndef USEREVENTCOMMON_H
>+ #define USEREVENTCOMMON_H
>+ 
>++#include <time.h>
>++
>+ #include <QWidget>
>+ 
>+ #include <list>
>
>Property changes on: net-im/licq-qt-gui/files/patch-src_userevents_usereventcommon.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: net-im/licq-qt-gui/files/patch-usereventcommon.h
>===================================================================
>--- net-im/licq-qt-gui/files/patch-usereventcommon.h	(revision 394262)
>+++ net-im/licq-qt-gui/files/patch-usereventcommon.h	(working copy)
>@@ -1,11 +0,0 @@
>---- src/userevents/usereventcommon.h.orig	2013-08-25 11:45:17.000000000 +0200
>-+++ src/userevents/usereventcommon.h	2014-02-13 21:45:16.000000000 +0100
>-@@ -20,6 +20,8 @@
>- #ifndef USEREVENTCOMMON_H
>- #define USEREVENTCOMMON_H
>- 
>-+#include <time.h>
>-+
>- #include <QWidget>
>- 
>- #include <list>

Actions: View | Diff

Attachments on bug 202547: 160173 | 160174 | 160175 | 160176 | 160177 | 160408 | 160409 | 160410 | 160411 | 160412