From nobody Mon Mar 06 14:15:20 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVgZx38lXz3wxNH; Mon, 6 Mar 2023 14:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVgZx1P7hz3R1R; Mon, 6 Mar 2023 14:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678112121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZsKm0v5H4iccKt0Vnh9GQEMl8BVArliL8/XO0WRyK4=; b=H9rK4QgtX/RGyIpkPUq+g4gi0QuobDH510+/mGOwbHDsMtC1fLj7ymqJdlau9x14BvNFnX LsrgBdLiNdUMPaaEUoucRHOsV8vZaQzwJnYbbhOfucO1JBkYBVE2Ciq1/R6H4/qdN3kFUR yTY5GpGzPjq6vzbs685L5SxAaU4K2GLL6ec5Ddvboy7wfuBXVDSHfbM+1sAVaun9xjbcH8 arwTKnbImATvYpHNRVIkONovo6wIIRVTvBToBn5GxV7hW6hGDt26RHWqFLmAfg8IpZ7IlT qCDP9e/4Kejz2YJYvuaYfcHZukrdSt/nf27YfMT3YQBw7l2yle2XZeo1bX1qsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678112121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qZsKm0v5H4iccKt0Vnh9GQEMl8BVArliL8/XO0WRyK4=; b=f+oHJQn4D10DJC50g+CBjMjTcWndDUtaEvdvLclpyzy2EhRwC7Y+lAf26HsonDx1eJGZrN /VEOZ2+aG779PxPRugS3xGfOzSVm1G8kaCy0xNWfWUuvw+41l9wgmRafM7NYQ3FfVH7znI nMmhAfoFQ/4Rdb00C0LS/RTRPxrZbBHN8Jv1XFipuMMEnkFbk7wOfFujtlKxKo0vix/c8t 4WWUXEicUbnifMhrAo1bR1fN4J6Svrk2VeZ/Pl2gZeudr1fAY3YLFeHYWiFOUyuzUo9Tvu 7aGzFH2dH+Cs0EoFYXvwFOYd0hAz62WHo9/gRuB78W1fHk7HmOw3965bZ8QkVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678112121; a=rsa-sha256; cv=none; b=Qv7ccBW3fvSdGJVsw8IuDBireqo4cWN4ICBMiqas99DYk52Xgf/v/KPQ4YLKPWl+pbY1RS Uwa0yftGwoNbsNSjjus2odkwToQ0gnmBc9cHachN53Z3TdMaHlYvAl19pwmWFq5PHplYVF dhgggIDRgM9eOV0pgxABKXzFIslfNxZAJ60+R0jR6RR1MXHjfAlMSOUvBfrntZ5vbHuHcI PAPbo2SBMLWFRIkhZVXY+k88t2j9LFlwt07Ybv2y7e2DzywanJ7UyS8s/Pti6lQ3H2ySSg T5xBasvGrhm845Za+8tasZ8e3tJTAT0tWbM5mPA3LiJKbXD36nfpb+cYtBleEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PVgZx0TKjz14gd; Mon, 6 Mar 2023 14:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326EFKuF094495; Mon, 6 Mar 2023 14:15:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326EFKhT094494; Mon, 6 Mar 2023 14:15:20 GMT (envelope-from git) Date: Mon, 6 Mar 2023 14:15:20 GMT Message-Id: <202303061415.326EFKhT094494@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 10eb33d8086a - main - editors/linux-r7-office: Assorted fixes. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10eb33d8086a88ac5bcb55d34d86608d554071ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=10eb33d8086a88ac5bcb55d34d86608d554071ac commit 10eb33d8086a88ac5bcb55d34d86608d554071ac Author: Gleb Popov AuthorDate: 2023-03-06 13:55:52 +0000 Commit: Gleb Popov CommitDate: 2023-03-06 14:15:00 +0000 editors/linux-r7-office: Assorted fixes. - Fix paths in .desktop file. - Install icon file. - Override LC_CTYPE with ru_RU.UTF-8 value [*]. [*] linux_base-c7 doesn't have C nor C.UTF-8 locales. This makes R7 Office render gibberish in file names in the "Open File ..." dialog. The LC_CTYPE override to ru_RU.UTF-8 makes most sense - the userbase of this suite is likely to consist of Russian-speaking users. Oterwise the user always may set LC_ALL to something else to switch R7 Office to the different locale. Reported by: fluffy Sponsored by: Serenity Cybersecurity, LLC --- editors/linux-r7-office/Makefile | 9 ++++---- .../files/patch-usr_bin_r7-office-desktopeditors | 26 +++++++++++++--------- .../files/patch-usr_bin_r7-office-imageviewer | 10 +++++++++ .../files/patch-usr_bin_r7-office-videoplayer | 10 +++++++++ editors/linux-r7-office/pkg-plist | 1 + 5 files changed, 42 insertions(+), 14 deletions(-) diff --git a/editors/linux-r7-office/Makefile b/editors/linux-r7-office/Makefile index 6aa3a661b237..4d242d6ef6e2 100644 --- a/editors/linux-r7-office/Makefile +++ b/editors/linux-r7-office/Makefile @@ -1,5 +1,6 @@ PORTNAME= r7-office PORTVERSION= 7.2.2 +PORTREVISION= 1 CATEGORIES= editors linux russian MASTER_SITES= https://download.r7-office.ru/ubuntu/ DISTNAME= r7-office @@ -32,10 +33,7 @@ post-extract: cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} data.tar.xz ${EXTRACT_AFTER_ARGS} post-patch: - ${REINPLACE_CMD} 's|/opt/r7-office/|${DATADIR}/|' ${WRKDIR}/usr/bin/r7-office-* - ${RM} ${WRKDIR}/usr/bin/*.bak - ${REINPLACE_CMD} 's|/usr/bin/|${PREFIX}/|' ${WRKDIR}/usr/share/applications/*.desktop - ${RM} ${WRKDIR}/usr/share/applications/*.bak + ${REINPLACE_CMD} -i '' 's|/usr/bin/|${PREFIX}/bin/|' ${WRKDIR}/usr/share/applications/*.desktop do-install: ${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/r7-office-* ${STAGEDIR}${PREFIX}/bin/ @@ -43,6 +41,9 @@ do-install: cd ${WRKDIR}/opt && ${CP} -r r7-office ${STAGEDIR}${PREFIX}/share cd ${WRKDIR}/usr/share && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/share + ${RLN} ${STAGEDIR}${DATADIR}/desktopeditors/asc-de-256.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/r7-office.png + ${RM} ${STAGEDIR}${PREFIX}/share/flyfm/templates/.source/* .for f in new.docx new.pptx new.xlsx ${RLN} ${STAGEDIR}${DATADIR}/desktopeditors/converter/empty/${f} \ diff --git a/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors b/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors index f54b184aee77..7de4e77687cc 100644 --- a/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors +++ b/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors @@ -1,17 +1,23 @@ --- usr/bin/r7-office-desktopeditors.orig 2022-12-11 00:52:25 UTC +++ usr/bin/r7-office-desktopeditors -@@ -82,7 +82,7 @@ check_templates() { - echo "system template's folder isn't found" +@@ -73,7 +73,7 @@ check_templates() { return 0 fi -- -+ - TEMPLATE_DOCX="$TEMPLATE_DIR/$NEW_DOCX_NAME.docx" - TEMPLATE_XLSX="$TEMPLATE_DIR/$NEW_XLSX_NAME.xlsx" - TEMPLATE_PPTX="$TEMPLATE_DIR/$NEW_PPTX_NAME.pptx" -@@ -111,4 +111,5 @@ export VLC_PLUGIN_PATH=$DIR_MV/plugins - DIR_MV=/opt/r7-office/mediaviewer + +- SOURCE_DOC_DIR="/opt/r7-office/desktopeditors/converter/empty" ++ SOURCE_DOC_DIR="/usr/local/share/r7-office/desktopeditors/converter/empty" + + set_names_ru + +@@ -107,8 +107,9 @@ check_templates "$@" + + check_templates "$@" + +-DIR=/opt/r7-office/desktopeditors +-DIR_MV=/opt/r7-office/mediaviewer ++DIR=/usr/local/share/r7-office/desktopeditors ++DIR_MV=/usr/local/share/r7-office/mediaviewer export LD_LIBRARY_PATH=$DIR:$DIR/converter:$DIR_MV:$LD_LIBRARY_PATH export VLC_PLUGIN_PATH=$DIR_MV/plugins -+export LANG= ++export LC_CTYPE=ru_RU.UTF-8 exec $DIR/DesktopEditors "$@" diff --git a/editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer b/editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer new file mode 100644 index 000000000000..5960cd6c0c2e --- /dev/null +++ b/editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer @@ -0,0 +1,10 @@ +--- usr/bin/r7-office-imageviewer.orig 2022-12-11 00:52:25 UTC ++++ usr/bin/r7-office-imageviewer +@@ -1,5 +1,6 @@ + #!/bin/sh + +-DIR=/opt/r7-office/mediaviewer ++DIR=/usr/local/share/r7-office/mediaviewer + export LD_LIBRARY_PATH=$DIR:$LD_LIBRARY_PATH ++export LC_CTYPE=ru_RU.UTF-8 + exec $DIR/ImageViewer "$@" diff --git a/editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer b/editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer new file mode 100644 index 000000000000..9dd1d6ce0258 --- /dev/null +++ b/editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer @@ -0,0 +1,10 @@ +--- usr/bin/r7-office-videoplayer.orig 2022-12-11 00:52:25 UTC ++++ usr/bin/r7-office-videoplayer +@@ -1,5 +1,6 @@ + #!/bin/sh + +-DIR=/opt/r7-office/mediaviewer ++DIR=/usr/local/share/r7-office/mediaviewer + export LD_LIBRARY_PATH=$DIR:$LD_LIBRARY_PATH ++export LC_CTYPE=ru_RU.UTF-8 + exec $DIR/VideoPlayer "$@" diff --git a/editors/linux-r7-office/pkg-plist b/editors/linux-r7-office/pkg-plist index 412a2dce8a77..1619fb54bbe6 100644 --- a/editors/linux-r7-office/pkg-plist +++ b/editors/linux-r7-office/pkg-plist @@ -12,6 +12,7 @@ share/flyfm/templates/.source/new.xlsx share/flyfm/templates/desktopeditors.docx.desktop share/flyfm/templates/desktopeditors.pptx.desktop share/flyfm/templates/desktopeditors.xlsx.desktop +share/pixmaps/r7-office.png %%DATADIR%%/desktopeditors/3DPARTYLICENSE %%DATADIR%%/desktopeditors/DesktopEditors %%DATADIR%%/desktopeditors/LICENSE.htm