Attachment 179800 Details for Bug 216943 – patch for qt4 fixes

[patch] patch for qt4 fixes

firebird_short.diff (text/plain), 3.09 KB, created by Mark Linimon on 2017-02-09 17:32:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2017-02-09 17:32:33 UTC

Size: 3.09 KB

patch

obsolete

>Index: Mk/bsd.qt.mk
>===================================================================
>--- Mk/bsd.qt.mk	(revision 432964)
>+++ Mk/bsd.qt.mk	(working copy)
>@@ -296,9 +296,12 @@
> _USE_QT_ALL=	assistant dbus declarative designer doc gui help \
> 				imageformats l10n linguist linguisttools multimedia \
> 				network opengl pixeltool qdbusviewer qmake script \
>-				scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
>+				scripttools sql sql-mysql sql-odbc sql-pgsql \
> 				sql-sqlite2 sql-sqlite3 svg testlib webkit \
> 				xml xmlpatterns
>+.if ${ARCH} == amd64 || ${ARCH} == i386
>+_USE_QT_ALL+=	sql-ibase
>+.endif
> 
> _USE_QT4_ONLY=	accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
> 				codecs-kr codecs-tw corelib demo graphicssystems-opengl \
>Index: databases/soci/Makefile
>===================================================================
>--- databases/soci/Makefile	(revision 432964)
>+++ databases/soci/Makefile	(working copy)
>@@ -22,9 +22,22 @@
> 
> OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
> BOOST_DESC=	Enable support for additional types using Boost
>-OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
>+OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST
> OPTIONS_SUB=	yes
> 
>+# firebird is currently only available on x86.
>+OPTIONS_DEFAULT_amd64=		FIREBIRD
>+OPTIONS_DEFAULT_i386=		FIREBIRD
>+# using OPTIONS_INCLUDE_<arch> would not define %%FIREBIRD%%.
>+# arguably this is a framework bug.
>+OPTIONS_EXCLUDE_aarch64=	FIREBIRD
>+OPTIONS_EXCLUDE_armv6=		FIREBIRD
>+OPTIONS_EXCLUDE_mips=		FIREBIRD
>+OPTIONS_EXCLUDE_mips64=		FIREBIRD
>+OPTIONS_EXCLUDE_powerpc=	FIREBIRD
>+OPTIONS_EXCLUDE_powerpc64=	FIREBIRD
>+OPTIONS_EXCLUDE_sparc64=	FIREBIRD
>+
> MYSQL_USE=	MYSQL=yes
> MYSQL_CMAKE_ON=	-DWITH_MYSQL:BOOL=ON
> MYSQL_CMAKE_OFF=	-DWITH_MYSQL:BOOL=OFF
>Index: devel/qt4/Makefile
>===================================================================
>--- devel/qt4/Makefile	(revision 432964)
>+++ devel/qt4/Makefile	(working copy)
>@@ -31,7 +31,7 @@
> NLS_USE=	l10n
> 
> SQL_PLUGINS_DESC=	Install database plugins for QtSql
>-SQL_PLUGINS_USE=sql-ibase sql-mysql sql-odbc sql-pgsql sql-sqlite2 \
>+SQL_PLUGINS_USE=sql-mysql sql-odbc sql-pgsql sql-sqlite2 \
> 		sql-sqlite3
> 
> TOOLS_DESC=	Install Qt tools (qmake, moc, etc.)
>@@ -44,4 +44,10 @@
> ${opt}_USE:=	${${opt}_USE:S/^/QT4=/:S/$/_run/}
> .endfor
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${ARCH} == amd64 || ${ARCH} == i386
>+SQL_PLUGINS_USE+=sql-ibase
>+.endif
>+
> .include <bsd.port.mk>
>Index: editors/libreoffice/Makefile
>===================================================================
>--- editors/libreoffice/Makefile	(revision 432964)
>+++ editors/libreoffice/Makefile	(working copy)
>@@ -95,7 +95,7 @@
> USE_PERL5=	build
> USE_QT4=	# empty but required
> USE_XORG=	xaw xrandr
>-USES=		autoreconf:build bison compiler:c++11-lib cpe firebird gmake jpeg perl5 pkgconfig \
>+USES=		autoreconf:build bison compiler:c++11-lib cpe gmake jpeg perl5 pkgconfig \
> 		python shared-mime-info tar:xz
> WANT_GNOME=	yes
> 
>@@ -264,6 +264,12 @@
> 
> _MAKE_JOBS=	#
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${ARCH} == amd64 || ${ARCH} == i386
>+USES+=		firebird
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> .if ${OPSYS} == FreeBSD

Actions: View | Diff

Attachments on bug 216943: 179800 | 182581