From nobody Mon Jan 16 16:31:09 2023 X-Original-To: dev-commits-ports-main@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 4NwcwF4mkGz2smkk; Mon, 16 Jan 2023 16:31:09 +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 4NwcwF4M0Vz3Gk1; Mon, 16 Jan 2023 16:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673886669; 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=O1KOKniisqRABm98/W33WO0XJEuLEcNCSN/8NliUJlg=; b=mXnoNFWcLm00D2VG0EYFXka25Mxl9wFRqt/ZqPI7GYNOONPXfj6drjgaTzr0iu3MjDB2Xm CFEGKEHYvkmorrkVs51xyHR3uQjMHy+eva0p+CtP40dMZbdr/PKjKS+icN7Qa36qLuqdXs lB7dlqh4Ed6h8X9pEUVuk8DbTnh3ct78dFAX8vInSP4gv6QDciF0xRtSsXU/vX+NZ4xvHd dgWhD1w7VAqJnjGsKdwYGMwaMz8IwKx64+t1ljibhURtKZZ9fNUegmoK4/Wj9LZwyIsl48 7ApU8TbB4Lug9xoyMFu1oXIjsWpKWmqvE2F4mjwUvjKYUVH8uaQ/CPPr4Fo+Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673886669; 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=O1KOKniisqRABm98/W33WO0XJEuLEcNCSN/8NliUJlg=; b=kJaaLt/ImgDjeOOZ8aD+3hq94JWIXvf5QZvi8PvgmBtLlr6c9BgtXncObQYSEpMJpDlSgz BVAZqqRzxKlszkmUZfBQGmVjFte9t0KFafVBenip8DAxY7n21webeKZ2RLJsmIRGRW8au2 zs0ii1255DNskvNWjC9QX03jWU4nmT/9JXDp78IUeQQA3/bPermAwfN2GcJOsdb5QTDqia n92y5kzjJRC8L5PavD7NM8bSW6EWdO5CtMha2SfX6A4kbSRVkYuSEga11Gsn6V1k/4+dIM znyWb5g942lOyFGY8BKLoHSOOf0/XBJ2zpegK+VY1IShwAMr5INNOuxIjEVyuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673886669; a=rsa-sha256; cv=none; b=aruE7mTwoTjw++Pspj2DKGkT46OZNqCcbDVfnSHUOWrJgpmys2cg5pRXoctk+yLrVXELpK Qop51qRAngtknCgj6HaZ7HMmh4jm+4QQ/10C00RAB9yueiABk4rpMKEJ53172py8ZYc3Ee DojPqbAmuJF7gIfD2+/Wv6DcvT4VQQCgdShgjTdhe7zWm3TKtHJm08Dtv0S6dujlnh2GCK woIKB3HIaU9Vvqt524OScjhYs4WFj7DqliMCvJIX8xxxyP3AMYO+9oEr16ou6LYb5vo6g3 vBToTSHnJ5my1Zaghew8tu11nrpNy91fR1Lwj8vO6zdnTqHJ9Zjp13PHwE86+w== 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 4NwcwF3Sdlz1CHK; Mon, 16 Jan 2023 16:31:09 +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 30GGV993016104; Mon, 16 Jan 2023 16:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GGV9nJ016103; Mon, 16 Jan 2023 16:31:09 GMT (envelope-from git) Date: Mon, 16 Jan 2023 16:31:09 GMT Message-Id: <202301161631.30GGV9nJ016103@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: bc3622e6e5fc - main - games/powder-toy: remove bogus patches and fix icons List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc3622e6e5fcb85a279ba4310866e490b7ec4b0c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc3622e6e5fcb85a279ba4310866e490b7ec4b0c commit bc3622e6e5fcb85a279ba4310866e490b7ec4b0c Author: Dmitry Marakasov AuthorDate: 2023-01-16 15:23:56 +0000 Commit: Dmitry Marakasov CommitDate: 2023-01-16 16:31:02 +0000 games/powder-toy: remove bogus patches and fix icons --- games/powder-toy/Makefile | 12 +++++++----- .../powder-toy/files/patch-resources_powder.template.desktop | 8 ++++++++ games/powder-toy/files_/patch-resources_powder.appdata.xml | 11 ----------- games/powder-toy/files_/patch-resources_powder.desktop | 12 ------------ games/powder-toy/pkg-plist | 2 +- 5 files changed, 16 insertions(+), 29 deletions(-) diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile index f4e344329676..2bad8d6cf2ef 100644 --- a/games/powder-toy/Makefile +++ b/games/powder-toy/Makefile @@ -1,6 +1,7 @@ PORTNAME= powder-toy DISTVERSIONPREFIX= v DISTVERSION= 97.0.352 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -43,13 +44,14 @@ do-install: ${INSTALL_DATA} ${BUILD_WRKSRC}/resources/powder.desktop ${STAGEDIR}${PREFIX}/share/applications/uk.co.powdertoy.tpt.desktop # as mentioned in appdata @${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata ${INSTALL_DATA} ${BUILD_WRKSRC}/resources/appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/powder-toy.appdata.xml -.for s in 16 32 48 256 +.for s in 16 24 32 48 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps - ${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe${${s} == 256:?:_${s}}.png \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/powder-toy.png .endfor - ${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe_32.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/powder-toy.png + ${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe_16.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/powder-toy.png + ${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe_32.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/24x24/apps/powder-toy.png # for e.g. lxpanel + ${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe_32.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/powder-toy.png + ${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe_48.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/powder-toy.png + ${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/powder-toy.png do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/games/powder-toy/files/patch-resources_powder.template.desktop b/games/powder-toy/files/patch-resources_powder.template.desktop new file mode 100644 index 000000000000..e60b76b7e182 --- /dev/null +++ b/games/powder-toy/files/patch-resources_powder.template.desktop @@ -0,0 +1,8 @@ +--- resources/powder.template.desktop.orig 2023-01-04 02:02:45 UTC ++++ resources/powder.template.desktop +@@ -5,4 +5,4 @@ Comment=@APPCOMMENT@ + MimeType=application/vnd.powdertoy.save;x-scheme-handler/ptsave; + Categories=Game;Simulation; + Exec=@APPEXE@ %u +-Icon=@APPVENDOR@-@APPEXE@ ++Icon=@APPEXE@ diff --git a/games/powder-toy/files_/patch-resources_powder.appdata.xml b/games/powder-toy/files_/patch-resources_powder.appdata.xml deleted file mode 100644 index b6bc4e2b6685..000000000000 --- a/games/powder-toy/files_/patch-resources_powder.appdata.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- resources/powder.appdata.xml.orig 2020-02-27 03:38:53 UTC -+++ resources/powder.appdata.xml -@@ -8,7 +8,7 @@ - - moderate - -- powder.desktop -+ powder-toy.desktop - -

- The Powder Toy is a free physics sandbox game, which simulates air pressure and velocity, heat, gravity and a countless number of interactions between different substances! The game provides you with various building materials, liquids, gases and electronic components which can be used to construct complex machines, guns, bombs, realistic terrains and almost anything else. You can then mine them and watch cool explosions, add intricate wirings, play with little stickmen or operate your machine. You can browse and play thousands of different saves made by the community or upload your own - we welcome your creations! diff --git a/games/powder-toy/files_/patch-resources_powder.desktop b/games/powder-toy/files_/patch-resources_powder.desktop deleted file mode 100644 index eecd45588cbf..000000000000 --- a/games/powder-toy/files_/patch-resources_powder.desktop +++ /dev/null @@ -1,12 +0,0 @@ ---- resources/powder.desktop.orig 2019-02-17 19:08:04 UTC -+++ resources/powder.desktop -@@ -3,7 +3,7 @@ Version=1.0 - Encoding=UTF-8 - Name=Powder Toy - Comment=Physics sandbox game --Exec=powder --Icon=powder -+Exec=powder-toy -+Icon=powder-toy - Type=Application - Categories=Game;Simulation; diff --git a/games/powder-toy/pkg-plist b/games/powder-toy/pkg-plist index 46bab49ed0f4..c44befb1ae41 100644 --- a/games/powder-toy/pkg-plist +++ b/games/powder-toy/pkg-plist @@ -2,7 +2,7 @@ bin/powder-toy share/appdata/powder-toy.appdata.xml share/applications/uk.co.powdertoy.tpt.desktop share/icons/hicolor/16x16/apps/powder-toy.png +share/icons/hicolor/24x24/apps/powder-toy.png share/icons/hicolor/256x256/apps/powder-toy.png share/icons/hicolor/32x32/apps/powder-toy.png share/icons/hicolor/48x48/apps/powder-toy.png -share/pixmaps/powder-toy.png