From owner-svn-ports-all@freebsd.org Mon Sep 12 17:13:15 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6837BD8BA4; Mon, 12 Sep 2016 17:13:15 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B09A8771; Mon, 12 Sep 2016 17:13:15 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8CHDEBB017027; Mon, 12 Sep 2016 17:13:14 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8CHDE2a017026; Mon, 12 Sep 2016 17:13:14 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201609121713.u8CHDE2a017026@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Mon, 12 Sep 2016 17:13:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421940 - head/devel/libkolab X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 17:13:16 -0000 Author: tcberner Date: Mon Sep 12 17:13:14 2016 New Revision: 421940 URL: https://svnweb.freebsd.org/changeset/ports/421940 Log: Fix devel/libkolab, to properly export symbols in the library. The update to libkolab in r421840 unfortunately broke desktuils/libkolab on the current version of FreeBSD. The issue is addressed in two upstream commits * 62ebad910fa7d1843373056dd795fc5c36b20bb2 ==> Workaround for qt not defining Q_DECL_IMPORT * d0a2fda6059abda610afe6a8d29b8f5a1c6ae4ae ==> Fix multiple-definition-warning due to redefining Q_DECL_IMPORT. Instead of applying said two patches and enabling them on Q_OS_FREEBSD, rakcuo@ suggested to instead just define MAKE_KOLAB_LIB while the proper fix isn't upstreamed. Reported by: Steve Wills via jenkins Approved by: rakcuo (mentor) Modified: head/devel/libkolab/Makefile Modified: head/devel/libkolab/Makefile ============================================================================== --- head/devel/libkolab/Makefile Mon Sep 12 17:03:03 2016 (r421939) +++ head/devel/libkolab/Makefile Mon Sep 12 17:13:14 2016 (r421940) @@ -2,6 +2,7 @@ PORTNAME= libkolab PORTVERSION= 0.6.3 +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= http://mirror.kolabsys.com/pub/releases/ @@ -27,6 +28,8 @@ USE_KDE= automoc4 kdelibs pimlibs USE_LDCONFIG= yes USE_QT4= corelib dbus gui network svg xml \ moc_build qmake_build rcc_build uic_build +# Fix build of desktuils/kdepim4-runtime: +CXXFLAGS+= -DMAKE_KOLAB_LIB PLIST_SUB= SHLIB_VER=${PORTVERSION}