From owner-svn-ports-head@freebsd.org Mon Nov 21 12:14:45 2016 Return-Path: Delivered-To: svn-ports-head@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 03467C4DF5C; Mon, 21 Nov 2016 12:14:45 +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 ADC9319E0; Mon, 21 Nov 2016 12:14:44 +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 uALCEhHO038890; Mon, 21 Nov 2016 12:14:43 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uALCEh5E038888; Mon, 21 Nov 2016 12:14:43 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201611211214.uALCEh5E038888@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Mon, 21 Nov 2016 12:14:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426706 - in head/www/qupzilla-qt4: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2016 12:14:45 -0000 Author: tcberner Date: Mon Nov 21 12:14:43 2016 New Revision: 426706 URL: https://svnweb.freebsd.org/changeset/ports/426706 Log: www/qupzilla-qt4: Repair the KWALLET option The recent move of all the KDE4 includes into ${LOCALBASE}/include/kde4 broke the KWALLET option. This patch fixes the option by inserting the right include path. Also, convert USE_OPENSSL to USES=ssl. PR: 214531 Submitted by: Matthew Rezny (maintainer) Approved by: rakuco (mentor) Added: head/www/qupzilla-qt4/files/patch-src_plugins_KWalletPasswords_KWalletPasswords.pro (contents, props changed) Modified: head/www/qupzilla-qt4/Makefile Modified: head/www/qupzilla-qt4/Makefile ============================================================================== --- head/www/qupzilla-qt4/Makefile Mon Nov 21 11:29:05 2016 (r426705) +++ head/www/qupzilla-qt4/Makefile Mon Nov 21 12:14:43 2016 (r426706) @@ -16,12 +16,11 @@ LIB_DEPENDS= libhunspell-1.3.so:textproc CONFLICTS_INSTALL= ${PORTNAME}-qt5* -USES= desktop-file-utils execinfo pkgconfig qmake tar:xz +USES= desktop-file-utils execinfo pkgconfig qmake ssl tar:xz USE_QT4= corelib gui network script sql webkit xml \ linguisttools_build moc_build rcc_build uic_build \ imageformats_run sql-sqlite3_run USE_XORG= x11 -USE_OPENSSL= yes CONFIGURE_ENV= QUPZILLA_PREFIX=${PREFIX}/ USE_LDCONFIG= yes INSTALLS_ICONS= yes @@ -49,5 +48,7 @@ post-patch: ${WRKSRC}/src/install.pri \ ${WRKSRC}/src/defines.pri \ ${WRKSRC}/src/lib/plugins/plugins.cpp + @${REINPLACE_CMD} -e 's|%%KDE4_INC%%|${LOCALBASE}/include/kde4|g' \ + ${WRKSRC}/src/plugins/KWalletPasswords/KWalletPasswords.pro .include Added: head/www/qupzilla-qt4/files/patch-src_plugins_KWalletPasswords_KWalletPasswords.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/qupzilla-qt4/files/patch-src_plugins_KWalletPasswords_KWalletPasswords.pro Mon Nov 21 12:14:43 2016 (r426706) @@ -0,0 +1,10 @@ +--- src/plugins/KWalletPasswords/KWalletPasswords.pro.orig 2016-11-15 12:42:46 UTC ++++ src/plugins/KWalletPasswords/KWalletPasswords.pro +@@ -55,6 +55,7 @@ isEqual(QT_MAJOR_VERSION, 5) { + QT += KWallet + } else { + LIBS += -lkdeui ++ INCPATH += %%KDE4_INC%% + } + + PLUGIN_DIR = $$PWD