summaryrefslogtreecommitdiff
path: root/app-office/naps2
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-10-08 04:26:34 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-10-08 04:26:34 +0100
commit325837835fc86686829aaa6acace3d3c06c74cea (patch)
tree6cc31680e4ce26ab26e863fd7b72d0ffe2d9366f /app-office/naps2
parent7ad61ca2bfc8f8da08d2fb3085e4333dcccb0a64 (diff)
gentoo auto-resync : 08:10:2024 - 04:26:34
Diffstat (limited to 'app-office/naps2')
-rw-r--r--app-office/naps2/Manifest2
-rw-r--r--app-office/naps2/naps2-7.5.2.ebuild373
2 files changed, 375 insertions, 0 deletions
diff --git a/app-office/naps2/Manifest b/app-office/naps2/Manifest
index 167d6c0be928..bff2dd00004d 100644
--- a/app-office/naps2/Manifest
+++ b/app-office/naps2/Manifest
@@ -69,6 +69,7 @@ DIST microsoft.windowsdesktop.app.ref.6.0.32.nupkg 3854138 BLAKE2B b36cf8f3165db
DIST microsoft.windowsdesktop.app.ref.8.0.7.nupkg 4466896 BLAKE2B 25772a98070145ec2567f703514cf2f7d6b01af5d531af90670d51fe818c7e5c2a36d16b603840725ad631e97c4f29589703f8a262aa70dbd28965e4f205edd0 SHA512 eb4abc341ba790836c744acce8d9c422d5b544f385bf4d28eecca8573831563ba723bf4bcddcd0e06cb05690d45c15f846ceaad2889bb3316c77b3ba8ff5ade2
DIST mimekitlite.4.7.1.nupkg 4782334 BLAKE2B dd066cde8b8f09a9aa0c44881a703d2e96b569d313cd6803be4ed568fc30360e7556c1e01baf61ab497880a46ba9304c3d9152787e3e460c273b2d92e801c23a SHA512 cfc5608a058c98f5e5771554f6b46dba0a77265137cdd82549d733e2efc54ac0dfdb24d578243cc4024b3bf272d4cf2ed6b589df88786f7c68a38e73a7569ba0
DIST naps2-7.5.1.tar.gz 41099136 BLAKE2B d64c2a910b5bc0e4c8182ba5e2face0973ff710fdd04b65477ec47be55cfd0570a9c198ca9d79d72fd8b657bd2ad18564e01654d773b91de5b3a3be73257553a SHA512 29f22ae88b349a765d2a96c02cc2891dfbc9b6bd14a6a2721236e620ae8376a2df9eda6088ff81cb9d274f48125988e52461f914f107b8d20a51aaf246c97d4a
+DIST naps2-7.5.2.tar.gz 41100551 BLAKE2B 7baea6b8bfdcbe0d4b4fdec4488f6df2d7d10e86af680060b4fd3fd13dd9693a0a01a0ab225c34f1675988681179c96807def9291d6c1fb68bd0eb745b134910 SHA512 748c1f454d9984426509e1cfcf7b2fdc23792236b9b8844b4c9972c61055219921fd4f97fb71eb6b2b9347ae510a9bc83eaaebf283a72f80ed8f224efb3b1c18
DIST naps2.mdns.1.0.1.nupkg 86085 BLAKE2B 85c41ed205c155ebf618b09ab09fa6c405a528dafa5f435e55a7a59a4d8831ab8efd68c2e08ab2eb61c79869ce6dab8a72b9d3851285a57488043c3876b97cd4 SHA512 0415de3d8758b301df93f89019ea096f554c7e4760658f387da5c2e25c895fcbb1d905ecdb89ee894cbac19580bb7948b0be57174f9823c338d57243d8fcf650
DIST naps2.ntwain.1.0.0.nupkg 490706 BLAKE2B 8208a15d6c9ec65eda196cff2141d9349c1278d6536dbb02552462e1c53fdebb68ecabd84c73150e4848ab80a537e25db15c6fca27d264f7dbfd904f65eb0560 SHA512 83ae07decef61c55fb3dc11212f335264288881be2014e194e104da1892c0d58ab71c1e32832d219cf9618b4f9485d2ad79668bcd0cffdbad9790f6d0798c6d2
DIST naps2.pdfium.binaries.1.1.0.nupkg 15878385 BLAKE2B 891bca3725934a7e0f86165f3f8665a24d552682c0dae726d75954008c850fdad22f9c388d956de8af7b85ef01ca3baed5aacaea13e3d8e502bddac3c055ad53 SHA512 b2b747628a2dd9fb9626c1ce977622b2a40079ddd506a845e39bff4264ac06406234b6a4b4b16c5c394dc5487b7a3b414b86370844c94a5245b594eaa1b5a761
@@ -273,4 +274,5 @@ DIST xunit.extensibility.execution.2.9.0.nupkg 378299 BLAKE2B 6ca0e2cf8026b3fb0b
DIST xunit.runner.visualstudio.2.8.2.nupkg 595969 BLAKE2B d1ef775c4234177fcca64dc44144fecc2d613976c7afe58ddfba0a204bd36b932cb8adaa3619e47922218306b487de1f256611f5d1448798afc393a91b896c13 SHA512 cfe133857c4b9609ff9fb150e49d032716c69ecff5bf1d643c987852af8e3c2851a5d4b2df1fcc0aa43f8ed91ba1cec144cb61cf5e24ee92f40f78aafdee1dd0
DIST zxing.net.0.16.9.nupkg 9657500 BLAKE2B a23c04e26bc09fccfec0a1e6f810ad2d3fae8e733fd5a3bd7ca17acc1010a7410657ae57576af6e66238999dcf945ca97f7e7b85abeee0b69b1b67692fa8332f SHA512 145f8e6bcf29b6c19ca336b4ec6063d0d35393f8fb613046cf40fcf68e9c1b7bb97341baece18ff3d37fc1cf31a227ff9da5266b994d6196dad592a43acfb567
EBUILD naps2-7.5.1-r2.ebuild 12474 BLAKE2B d2bbbac499ea1440dcac67c5e450300248182dd39269904f88fd732d05c69059bb7e51bf451f66ad082f53d9842e1647f395359e7c52c75dd6968731a1491ba7 SHA512 690d75561c28e674a3a1c204db2296a4795cb95f28f4107f7ec9c351ccda4bc63c2f8955e2f23c22f8f105394b5d7cfc18ebef59937b5af9cbce01d8d55a8948
+EBUILD naps2-7.5.2.ebuild 12474 BLAKE2B d2bbbac499ea1440dcac67c5e450300248182dd39269904f88fd732d05c69059bb7e51bf451f66ad082f53d9842e1647f395359e7c52c75dd6968731a1491ba7 SHA512 690d75561c28e674a3a1c204db2296a4795cb95f28f4107f7ec9c351ccda4bc63c2f8955e2f23c22f8f105394b5d7cfc18ebef59937b5af9cbce01d8d55a8948
MISC metadata.xml 1133 BLAKE2B 580656b19030f09df98a6dc493ccf97807fee8301643dad864a00f7b889989f75df7465173ef77538d62d14c74048bd009a73032995a581e82b6989dd988949e SHA512 b1753810c95191f97a04857519cdccee7f18567b0db3c531c0e1c48f93a6103e257248467ebf6908ba311ffc97a8ff4da0a3fe1d98279087fbc974287a884bb4
diff --git a/app-office/naps2/naps2-7.5.2.ebuild b/app-office/naps2/naps2-7.5.2.ebuild
new file mode 100644
index 000000000000..c5066fc03a17
--- /dev/null
+++ b/app-office/naps2/naps2-7.5.2.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOTNET_PKG_COMPAT="8.0"
+
+# Generated via gdmt, but the *.Mac projects had to be removed from the sln
+# manually first. Later they are removed via "DOTNET_PKG_BAD_PROJECTS".
+NUGETS="
+appium.webdriver@4.4.5
+atksharp@3.24.24.95
+autofac@8.0.0
+ben.demystifier@0.4.1
+cairosharp@3.24.24.95
+castle.core@4.3.1
+castle.core@5.0.0
+castle.core@5.1.1
+commandlineparser@2.9.1
+dotnetseleniumextras.pageobjects@3.11.0
+embedio@3.5.2
+eto.forms@2.8.3
+eto.platform.gtk@2.8.3
+eto.platform.windows@2.8.3
+gdksharp@3.24.24.95
+giosharp@3.24.24.95
+glibsharp@3.24.24.95
+google.protobuf@3.25.1
+grpc.core.api@2.59.0
+grpc.tools@2.65.0
+grpcdotnetnamedpipes@3.0.0
+gtksharp@3.24.24.95
+isexternalinit@1.0.3
+largeaddressaware@1.0.6
+libusbdotnet@3.0.102-alpha
+makaretu.dns@2.0.1
+microsoft-windowsapicodepack-core@1.1.4
+microsoft-windowsapicodepack-shell@1.1.4
+microsoft.bcl.asyncinterfaces@6.0.0
+microsoft.bcl.asyncinterfaces@7.0.0
+microsoft.bcl.asyncinterfaces@8.0.0
+microsoft.codecoverage@17.10.0
+microsoft.extensions.configuration.abstractions@2.1.0
+microsoft.extensions.configuration.abstractions@8.0.0
+microsoft.extensions.configuration.binder@2.1.0
+microsoft.extensions.configuration@2.1.0
+microsoft.extensions.dependencyinjection.abstractions@2.1.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.0
+microsoft.extensions.dependencyinjection.abstractions@8.0.1
+microsoft.extensions.dependencyinjection@8.0.0
+microsoft.extensions.logging.abstractions@2.1.0
+microsoft.extensions.logging.abstractions@8.0.0
+microsoft.extensions.logging.abstractions@8.0.1
+microsoft.extensions.logging@2.1.0
+microsoft.extensions.logging@8.0.0
+microsoft.extensions.options@2.1.0
+microsoft.extensions.options@8.0.0
+microsoft.extensions.primitives@2.1.0
+microsoft.extensions.primitives@8.0.0
+microsoft.net.test.sdk@17.10.0
+microsoft.netcore.app@2.1.30
+microsoft.netcore.dotnetapphost@2.1.30
+microsoft.netcore.dotnethostpolicy@2.1.30
+microsoft.netcore.dotnethostresolver@2.1.30
+microsoft.netcore.platforms@1.1.0
+microsoft.netcore.platforms@1.1.1
+microsoft.netcore.platforms@2.1.14
+microsoft.netcore.platforms@3.1.4
+microsoft.netcore.targets@1.1.0
+microsoft.netcore.targets@2.0.0
+microsoft.netframework.referenceassemblies.net462@1.0.3
+microsoft.netframework.referenceassemblies@1.0.3
+microsoft.testplatform.objectmodel@17.10.0
+microsoft.testplatform.testhost@17.10.0
+microsoft.win32.primitives@4.3.0
+microsoft.win32.systemevents@4.7.0
+microsoft.win32.systemevents@8.0.0
+microsoft.windowsdesktop.app.ref@6.0.32
+microsoft.windowsdesktop.app.ref@8.0.7
+mimekitlite@4.7.1
+naps2.mdns@1.0.1
+naps2.ntwain@1.0.0
+naps2.pdfium.binaries@1.1.0
+naps2.pdfsharp@1.0.1
+naps2.sane.binaries@1.1.0
+naps2.tesseract.binaries@1.2.0
+naps2.wia@2.0.3
+netstandard.library@1.6.1
+netstandard.library@2.0.3
+newtonsoft.json@13.0.1
+newtonsoft.json@13.0.3
+nlog.extensions.logging@5.3.11
+nlog@5.3.2
+nsubstitute@5.0.0
+nsubstitute@5.1.0
+pangosharp@3.24.24.95
+pdfavalidator@2.1.109
+polyfill@4.9.0
+richardszalay.mockhttp@7.0.0
+runtime.any.system.collections@4.3.0
+runtime.any.system.diagnostics.tools@4.3.0
+runtime.any.system.diagnostics.tracing@4.3.0
+runtime.any.system.globalization.calendars@4.3.0
+runtime.any.system.globalization@4.3.0
+runtime.any.system.io@4.3.0
+runtime.any.system.reflection.extensions@4.3.0
+runtime.any.system.reflection.primitives@4.3.0
+runtime.any.system.reflection@4.3.0
+runtime.any.system.resources.resourcemanager@4.3.0
+runtime.any.system.runtime.handles@4.3.0
+runtime.any.system.runtime.interopservices@4.3.0
+runtime.any.system.runtime@4.3.0
+runtime.any.system.text.encoding.extensions@4.3.0
+runtime.any.system.text.encoding@4.3.0
+runtime.any.system.threading.tasks@4.3.0
+runtime.any.system.threading.timer@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.linux-arm.microsoft.netcore.app@2.1.30
+runtime.linux-arm.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-arm.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-arm.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.linux-arm64.microsoft.netcore.app@2.1.30
+runtime.linux-arm64.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-arm64.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-arm64.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.app@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-musl-x64.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.linux-x64.microsoft.netcore.app@2.1.30
+runtime.linux-x64.microsoft.netcore.dotnetapphost@2.1.30
+runtime.linux-x64.microsoft.netcore.dotnethostpolicy@2.1.30
+runtime.linux-x64.microsoft.netcore.dotnethostresolver@2.1.30
+runtime.native.system.io.compression@4.3.0
+runtime.native.system.net.http@4.3.0
+runtime.native.system.security.cryptography.apple@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.native.system@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.0
+runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl@4.3.2
+runtime.unix.microsoft.win32.primitives@4.3.0
+runtime.unix.system.console@4.3.0
+runtime.unix.system.diagnostics.debug@4.3.0
+runtime.unix.system.io.filesystem@4.3.0
+runtime.unix.system.net.primitives@4.3.0
+runtime.unix.system.net.sockets@4.3.0
+runtime.unix.system.private.uri@4.3.0
+runtime.unix.system.runtime.extensions@4.3.0
+selenium.support@3.141.0
+selenium.webdriver@3.141.0
+sharpziplib@1.4.2
+simplebase@1.3.1
+sixlabors.fonts@1.0.1
+sixlabors.imagesharp@3.1.5
+standardsocketshttphandler@2.2.0.8
+system.appcontext@4.3.0
+system.buffers@4.3.0
+system.buffers@4.4.0
+system.buffers@4.5.1
+system.collections.concurrent@4.3.0
+system.collections.immutable@1.5.0
+system.collections.immutable@5.0.0
+system.collections.immutable@8.0.0
+system.collections.nongeneric@4.3.0
+system.collections.specialized@4.3.0
+system.collections@4.3.0
+system.componentmodel.annotations@5.0.0
+system.componentmodel.primitives@4.3.0
+system.componentmodel.typeconverter@4.3.0
+system.componentmodel@4.3.0
+system.console@4.3.0
+system.diagnostics.debug@4.3.0
+system.diagnostics.diagnosticsource@4.3.0
+system.diagnostics.diagnosticsource@7.0.2
+system.diagnostics.eventlog@6.0.0
+system.diagnostics.tools@4.3.0
+system.diagnostics.tracesource@4.3.0
+system.diagnostics.tracing@4.3.0
+system.drawing.common@4.7.2
+system.drawing.common@8.0.7
+system.dynamic.runtime@4.3.0
+system.globalization.calendars@4.3.0
+system.globalization.extensions@4.3.0
+system.globalization@4.3.0
+system.io.compression.zipfile@4.3.0
+system.io.compression@4.3.0
+system.io.filesystem.primitives@4.3.0
+system.io.filesystem@4.3.0
+system.io@4.3.0
+system.linq.async@6.0.1
+system.linq.expressions@4.3.0
+system.linq@4.3.0
+system.memory@4.5.0
+system.memory@4.5.1
+system.memory@4.5.4
+system.memory@4.5.5
+system.net.http@4.3.0
+system.net.http@4.3.4
+system.net.nameresolution@4.3.0
+system.net.primitives@4.3.0
+system.net.sockets@4.3.0
+system.numerics.vectors@4.4.0
+system.numerics.vectors@4.5.0
+system.objectmodel@4.3.0
+system.private.uri@4.3.0
+system.reflection.emit.ilgeneration@4.3.0
+system.reflection.emit.lightweight@4.3.0
+system.reflection.emit@4.3.0
+system.reflection.extensions@4.3.0
+system.reflection.metadata@1.6.0
+system.reflection.metadata@5.0.0
+system.reflection.primitives@4.3.0
+system.reflection.typeextensions@4.3.0
+system.reflection@4.3.0
+system.resources.extensions@7.0.0
+system.resources.extensions@8.0.0
+system.resources.resourcemanager@4.3.0
+system.runtime.compilerservices.unsafe@4.5.0
+system.runtime.compilerservices.unsafe@4.5.2
+system.runtime.compilerservices.unsafe@4.5.3
+system.runtime.compilerservices.unsafe@4.7.0
+system.runtime.compilerservices.unsafe@6.0.0
+system.runtime.extensions@4.3.0
+system.runtime.handles@4.3.0
+system.runtime.interopservices.runtimeinformation@4.3.0
+system.runtime.interopservices@4.3.0
+system.runtime.numerics@4.3.0
+system.runtime@4.3.0
+system.security.claims@4.3.0
+system.security.cryptography.algorithms@4.3.0
+system.security.cryptography.cng@4.3.0
+system.security.cryptography.csp@4.3.0
+system.security.cryptography.encoding@4.3.0
+system.security.cryptography.openssl@4.3.0
+system.security.cryptography.primitives@4.3.0
+system.security.cryptography.protecteddata@8.0.0
+system.security.cryptography.x509certificates@4.3.0
+system.security.principal.windows@4.3.0
+system.security.principal@4.3.0
+system.text.encoding.extensions@4.3.0
+system.text.encoding@4.3.0
+system.text.regularexpressions@4.3.0
+system.threading.tasks.dataflow@8.0.1
+system.threading.tasks.extensions@4.3.0
+system.threading.tasks.extensions@4.5.2
+system.threading.tasks.extensions@4.5.4
+system.threading.tasks@4.3.0
+system.threading.threadpool@4.3.0
+system.threading.timer@4.3.0
+system.threading@4.3.0
+system.valuetuple@4.5.0
+system.xml.readerwriter@4.3.0
+system.xml.xdocument@4.3.0
+system.xml.xmldocument@4.3.0
+unosquare.swan.lite@3.1.0
+xunit.abstractions@2.0.3
+xunit.analyzers@1.15.0
+xunit.assert@2.9.0
+xunit.core@2.9.0
+xunit.extensibility.core@2.9.0
+xunit.extensibility.execution@2.9.0
+xunit.runner.visualstudio@2.8.2
+xunit@2.9.0
+zxing.net@0.16.9
+"
+
+inherit dotnet-pkg desktop xdg
+
+DESCRIPTION="Document scanning application with a focus on simplicity and ease of use"
+HOMEPAGE="https://www.naps2.com/
+ https://github.com/cyanfish/naps2/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/cyanfish/${PN}.git"
+else
+ SRC_URI="https://github.com/cyanfish/${PN}/archive/refs/tags/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64"
+fi
+
+SRC_URI+=" ${NUGET_URIS} "
+
+LICENSE="AGPL-3+ Apache-2.0 BSD BSD-2 GPL-2+ LGPL-3+ MIT"
+SLOT="0"
+
+RDEPEND="
+ media-fonts/liberation-fonts
+ media-fonts/noto
+ media-fonts/noto-cjk
+ media-gfx/sane-backends
+ x11-libs/gtk+:3
+"
+
+DOTNET_PKG_PROJECTS=( NAPS2.App.Gtk )
+DOTNET_PKG_BAD_PROJECTS=(
+ # For MacOS.
+ NAPS2.App.Mac
+ NAPS2.Images.Mac
+ NAPS2.Lib.Mac
+
+ # For Windows.
+ NAPS2.App.Console
+ NAPS2.App.WinForms
+ NAPS2.App.Worker
+ NAPS2.Images.Wpf
+ NAPS2.Lib.WinForms
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_unpack() {
+ dotnet-pkg_src_unpack
+
+ if [[ -n "${EGIT_REPO_URI}" ]] ; then
+ git-r3_src_unpack
+ fi
+}
+
+src_prepare() {
+ dotnet-pkg_src_prepare
+
+ # Having this package reference in a proj file will make dotnet copy
+ # the host's libhostpolicy.so and break the Gentoo's mechanism of handling
+ # dotnet executables.
+ sed -e "/.*NETCore.App.*/d" -i NAPS2.App.Gtk/NAPS2.App.Gtk.csproj || die
+}
+
+src_test() {
+ dotnet-pkg-base_test NAPS2.Lib.Tests
+}
+
+src_install() {
+ dotnet-pkg_src_install
+ find "${ED}/usr/share/${P}/_linux" -type f -exec chmod a+x {} + || die
+
+ newicon --size 128 ./NAPS2.Lib/Icons/scanner-128.png com.naps2.Naps2.png
+ domenu ./NAPS2.Setup/config/linux/com.naps2.Naps2.desktop
+
+ insinto /usr/share/metainfo
+ doins ./NAPS2.Setup/config/linux/com.naps2.Naps2.metainfo.xml
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}