Attachment 177634 Details for Bug 215026 – The patch with the changes described in the bug report.

[patch] The patch with the changes described in the bug report.

quassel_pgsql_and_options.patch (text/plain), 4.86 KB, created by Christian Schwarz on 2016-12-03 13:28:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Schwarz

Created: 2016-12-03 13:28:21 UTC

Size: 4.86 KB

patch

obsolete

>commit b07982296a700b2a4ff82535a7e7308bb8cc7c78
>Author: Christian Schwarz <me@cschwarz.com>
>Date:   Sat Dec 3 13:14:00 2016 +0000
>
>    irc/quassel: PostregSQL option + restructure options
>    
>    PostgreSQL support:
>      Qt decides at run-time whether the PostgreSQL driver is installed
>      and only then allows running Quassel with that database backend.
>    
>      The fix without this patch is to manually install databases/qt5-sqldrivers-pgsql
>    
>      Users might run into this issue when migrating from Sqlite3 to PostgreSQL.
>    
>    Restructuring of master/slave port:
>      Only fairly recently has irc/quassel been split up into
>      irc/quassel and irc/quassel-core.
>    
>      Adding the explicit backend-knobs (see above) would have required
>      adding them only to the irc/quassel-core port.
>    
>      The handbook states that the slave should really only override
>      config knobs and otherwise differ as little as possible from master.
>    
>      Hence, despite of the addition of several '.if ${PORT_OPTIONS:}',
>      this change unifies all options in the master port.
>    
>      Side effect, which may require a note in UPDATING:
>      the MODULE option had to be made a RADIO.
>      -> some users might need to reconfig
>
>diff --git a/irc/quassel-core/Makefile b/irc/quassel-core/Makefile
>index fa57c26..2ac521a 100644
>--- a/irc/quassel-core/Makefile
>+++ b/irc/quassel-core/Makefile
>@@ -1,28 +1,11 @@
> # $FreeBSD$
> 
>-PKGNAMESUFFIX=	-core
>-
>-COMMENT=	Qt 5 based distributed IRC client (core/server only)
>-
>-LIB_DEPENDS=	libqca-qt5.so:devel/qca-qt5
>-
> MASTERDIR=	${.CURDIR}/../quassel
> 
>-USE_QT5=	buildtools_build core network qmake_build script sql sql-sqlite3_run
>-CMAKE_ARGS+=	-DWITH_KDE=off \
>-		-DUSE_QT5=on \
>-		-DWANT_CORE=on \
>-		-DWANT_QTCLIENT=off \
>-		-DWANT_MONO=off
>+PKGNAMESUFFIX=	-core
> 
>-USE_RC_SUBR=	quasselcore
>-USERS=		quasselcore
>-GROUPS=		${USERS}
>-SUB_FILES=	pkg-message
>-PLIST=		${.CURDIR}/pkg-plist
>-PLIST_FILES=	bin/quasselcore
>+COMMENT=	Qt 5 based distributed IRC client (core/server only)
> 
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselcore
>+OPTIONS_DEFAULT=	CORE SQLITE3 PGSQL
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile
>index 5d892da..7044acd 100644
>--- a/irc/quassel/Makefile
>+++ b/irc/quassel/Makefile
>@@ -18,31 +18,61 @@ USES=		cmake:outsource compiler:c++11-lib cpe execinfo pkgconfig tar:bzip2
> CPE_VENDOR=	quassel-irc
> CPE_PRODUCT=	quassel_irc
> 
>-.if !defined(MASTERDIR)
>-
>-LIB_DEPENDS=	libdbusmenu-qt5.so:devel/libdbusmenu-qt5
>-USE_QT5=	buildtools_build core dbus gui network phonon4 qmake_build webkit widgets
>+USE_QT5=	buildtools_build core network qmake_build
> CMAKE_ARGS=	-DWITH_KDE=off \
>-		-DUSE_QT5=on \
>-		-DWANT_CORE=off
>+		-DUSE_QT5=on
> 
> OPTIONS_DEFINE=		NLS
>-OPTIONS_MULTI=		MODULE
>-MODULE_DESC=		Quassel components
>-OPTIONS_MULTI_MODULE=	CLIENT MONO
>-OPTIONS_DEFAULT=	CLIENT
>+OPTIONS_RADIO=		MODULE
>+OPTIONS_MULTI=		CORE_BACKEND
>+MODULE_DESC=		Quassel component to build
>+OPTIONS_RADIO_MODULE=	CLIENT MONO CORE
>+CORE_BACKEND_DESC=	Supported database backends in Quassel core
>+OPTIONS_MULTI_CORE_BACKEND=SQLITE3 PGSQL
>+OPTIONS_DEFAULT?=	CLIENT SQLITE3
> OPTIONS_SUB=		yes
> 
>+.include <bsd.port.options.mk>
>+
> CLIENT_DESC=		Quassel client (for use with core)
>-CLIENT_CMAKE_ON=	-DWANT_QTCLIENT=on
>-CLIENT_CMAKE_OFF=	-DWANT_QTCLIENT=off
>+CLIENT_LIB_DEPENDS= 	libdbusmenu-qt5.so:devel/libdbusmenu-qt5
>+.if ${PORT_OPTIONS:MCLIENT}
>+USE_QT5+=	dbus gui phonon4 webkit widgets
>+CMAKE_ARGS+=	-DWANT_QTCLIENT=on -DWANT_CORE=off -DWANT_MONO=off
>+.endif
> 
> MONO_DESC=		Quassel standalone (monolithic binary: core+client combined)
>-MONO_CMAKE_ON=		-DWANT_MONO=on
>-MONO_CMAKE_OFF=		-DWANT_MONO=off
>+.if ${PORT_OPTIONS:MMONO}
>+USE_QT5+=	dbus gui phonon4 webkit widgets
>+CMAKE_ARGS+=	-DWANT_QTCLIENT=off -DWANT_CORE=off -DWANT_MONO=on
>+.endif
>+
>+CORE_DESC=		Quassel core (server-part only)
>+.if ${PORT_OPTIONS:MCORE}
>+USE_QT5+=	script sql
>+CMAKE_ARGS+=	-DWANT_QTCLIENT=off -DWANT_CORE=on -DWANT_MONO=off
>+USE_RC_SUBR=	quasselcore
>+USERS=		quasselcore
>+GROUPS=		${USERS}
>+SUB_FILES=	pkg-message
>+# core has only the binary, license and rc script to install
>+# => link to (currently) nonexistent plist
>+PLIST=		pkg-plist-quasselcore
>+PLIST_FILES=	bin/quasselcore
>+.endif
> 
> NLS_USE=		QT5=linguisttools_build
> 
>+SQLITE3_DESC=	Support for Sqlite3 backend
>+.if ${PORT_OPTIONS:MCORE} && ${PORT_OPTIONS:MSQLITE3}
>+USE_QT5+= 	sql-sqlite3_run
>+.endif
>+
>+PGSQL_DESC=	Supporot for PostgreSQL backend
>+.if ${PORT_OPTIONS:MCORE} && ${PORT_OPTIONS:MPGSQL}
>+USE_QT5+=	sql-pgsql
>+.endif
>+
> post-patch-NLS-off:
> 	${REINPLACE_CMD} -e '/add_subdirectory(po)/d' \
> 		${WRKSRC}/CMakeLists.txt
>@@ -51,7 +81,7 @@ post-install-CLIENT-on:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselclient
> post-install-MONO-on:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quassel
>-
>-.endif
>+post-install-CORE-on:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/quasselcore
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 215026: 177634