Date: Tue, 7 Feb 2017 20:37:18 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433619 - in head/editors/libreoffice: . files Message-ID: <201702072037.v17KbIfI063178@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Feb 7 20:37:18 2017 New Revision: 433619 URL: https://svnweb.freebsd.org/changeset/ports/433619 Log: Fix opening URL via xdg-open. Submitted by: Alexander Zagrebin (alex at zagrebin dot ru) (initial patch) Added: head/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx (contents, props changed) Modified: head/editors/libreoffice/Makefile Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Tue Feb 7 20:33:53 2017 (r433618) +++ head/editors/libreoffice/Makefile Tue Feb 7 20:37:18 2017 (r433619) @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://dev-www.libreoffice.org/src/:src \ http://dev-www.libreoffice.org/extern/:ext @@ -71,7 +71,8 @@ LIB_DEPENDS= libapr-1.so:devel/apr1 \ libmythes-1.2.so:textproc/mythes \ librdf.so:textproc/redland \ libserf-1.so:www/serf -RUN_DEPENDS= ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ +RUN_DEPENDS= xdg-open:devel/xdg-utils \ + ${LOCALBASE}/share/fonts/Caladea/Caladea-Bold.ttf:x11-fonts/crosextrafonts-caladea-ttf \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu \ ${LOCALBASE}/share/fonts/GentiumBasic/GenBasI.ttf:x11-fonts/gentium-basic \ @@ -282,6 +283,10 @@ CXXFLAGS_WARN+= -Wno-unused-local-typede CXXFLAGS_WARN= -Wshadow -Woverloaded-virtual .endif +post-patch: + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/shell/source/unix/exec/shellexec.cxx + pre-configure: @${TOUCH} ${WRKSRC}/autogen.lastrun Added: head/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/patch-shell_source_unix_exec_shellexec.cxx Tue Feb 7 20:37:18 2017 (r433619) @@ -0,0 +1,11 @@ +--- shell/source/unix/exec/shellexec.cxx.orig 2017-01-12 00:54:33 UTC ++++ shell/source/unix/exec/shellexec.cxx +@@ -157,7 +157,7 @@ void SAL_CALL ShellExec::execute( const + if (std::getenv("LIBO_FLATPAK") != nullptr) { + aBuffer.append("/app/bin/xdg-open"); + } else { +- aBuffer.append("/usr/bin/xdg-open"); ++ aBuffer.append("%%LOCALBASE%%/bin/xdg-open"); + } + #endif + aBuffer.append(" ");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702072037.v17KbIfI063178>