From nobody Tue Nov 1 13:18:08 2022 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 4N1rDc2rFyz4gJ3f; Tue, 1 Nov 2022 13:18:08 +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 4N1rDc2LTPz3bP1; Tue, 1 Nov 2022 13:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667308688; 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=aWea+YH8e4bQQkU2H3WtfTseNIS4bI2Py89dylPcCso=; b=hk9jMpUWHTnveP5vkqRhERwA/uYXlt54JvjFyvBk2T/uw5bw8ju+aIGDx8XLzEwSkbcxkH BipEezuHRhpk6fA+Zu0cmFebxQRPNsbspm2xGUSh0HpeZk45Bfavjvz2zv9PEB+CgxV5L3 vd42KY7Uv9m7oJRahNRHSuibqtLdyDuSp3nnfX3gZP0XpvY7AaFKkQKQ/4z1ZAnab7qm4X S7h1w4GMU5lmkGVTVJpW3rQYy1VU5fFPWqDOdjGtGtF3g0ey+jyR4i1P6SuB4HSgE0sFun eRigdrAfx552oQ/6tkpQ4LiVbXNolmUGoecPm1J4RBndhlkmDPxAXmuglqVmiw== 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 4N1rDc1MJSzHKf; Tue, 1 Nov 2022 13:18:08 +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 2A1DI8cH003667; Tue, 1 Nov 2022 13:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A1DI8dh003666; Tue, 1 Nov 2022 13:18:08 GMT (envelope-from git) Date: Tue, 1 Nov 2022 13:18:08 GMT Message-Id: <202211011318.2A1DI8dh003666@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: dec61bb0a1d0 - main - games/xonotic: fix installed icon files 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dec61bb0a1d02b46da9e9d6d293d5afad576131f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667308688; 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=aWea+YH8e4bQQkU2H3WtfTseNIS4bI2Py89dylPcCso=; b=nk6YFeZTEVBFo1IUq56g2Lyd675zGwmtHJSl+h965rinBDhLlfJmKNVbz/+YtK0i3OqB0J RAa2fAR0J9b+EEeh8xJ0jMNnFslj5fNKXvX3qbJiuhWOCsN9gabqBJTU0noZyRCIpo3eaf 11D5cvL5t1Ih1jPjgCqKZ+d3Df24rw3N7fWBJ743iipVeD6TM1EL6aUoBzOQz6GXPAGxPc d8lELdB74xp6lTzRkRZEmA005xag/++IHr3sVF8XYgYKxf3HRi6hbxDWa514dfc36TdgIv eyMCMnNxvqr6uiXMebepHrEocayw4XW6mi+ZktROnvGpqpSK8xliwGI32T30OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667308688; a=rsa-sha256; cv=none; b=XMLY54N/URJBH0fKF8d4FAKR6AMDjwq9F2fJrIG1M3GMUcUxCbTrU7Eco5DZikRKRfjldg k5hpb6i5oWBYDcq9XfFayg+kij1oC1Ge1432vGWDWkVuti1xxrpYXfa4jyK8y6vULgvIMB lC0a1NFIUQLo8o9hqVWpCYojEyPaRi6ykzF8liNUP7JjLA200q1GwuhphfZlyfHnhiQtVK aWhu0qM9vDuVVWc/e1igBjf93Pl4YEhdiG3WUz4vWCrEGhHcALp+rdr5hKjw0Yn5uEHCt0 cYyTgghYoLiDyDI1yGRVGnJqjH8bE3KI1rFkdak3Yuy/P3UWnT3j3ucEJ6ReEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=dec61bb0a1d02b46da9e9d6d293d5afad576131f commit dec61bb0a1d02b46da9e9d6d293d5afad576131f Author: Dmitry Marakasov AuthorDate: 2022-11-01 13:11:07 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-01 13:17:58 +0000 games/xonotic: fix installed icon files - Instead of broken .ico, install complete set of png and svg icons - Switch to upstream .desktop file as well PR: 267484 Reported by: yuri --- games/xonotic/Makefile | 18 +++++++++--------- games/xonotic/files/patch-misc_logos_xonotic.desktop | 11 +++++++++++ games/xonotic/pkg-plist | 13 +++++++++++++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index 667c96c39a76..b989d89872a5 100644 --- a/games/xonotic/Makefile +++ b/games/xonotic/Makefile @@ -1,5 +1,6 @@ PORTNAME= xonotic PORTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://nl.dl.xonotic.org/ \ http://mirror.bitmissile.com/xonotic/releases/ @@ -30,6 +31,7 @@ PORTDATA= * OPTIONS_MULTI= COMPONENTS OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED OPTIONS_DEFAULT= CLIENT DEDICATED +OPTIONS_SUB= yes CLIENT_DESC= Build client CLIENT_LIB_DEPENDS= libtheora.so:multimedia/libtheora \ @@ -40,17 +42,9 @@ CLIENT_LIB_DEPENDS= libtheora.so:multimedia/libtheora \ CLIENT_USES= sdl xorg CLIENT_USE= SDL=sdl2 XORG=x11 CLIENT_ALL_TARGET= sdl-release -CLIENT_PLIST_FILES= bin/${PORTNAME} share/pixmaps/${PORTNAME}.ico -CLIENT_DESKTOP_ENTRIES= "Xonotic" \ - "" \ - "${PREFIX}/share/pixmaps/${PORTNAME}.ico" \ - "${PORTNAME}" \ - "Game;Shooter;" \ - "" DEDICATED_DESC= Build dedicated server DEDICATED_ALL_TARGET= sv-release -DEDICATED_PLIST_FILES= bin/${PORTNAME}-dedicated post-patch: @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ @@ -63,7 +57,13 @@ do-install: do-install-CLIENT-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-sdl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/misc/logos/icons_ico/xonotic.ico ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/misc/logos/xonotic.desktop ${STAGEDIR}${PREFIX}/share/applications/ + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ + ${INSTALL_DATA} ${WRKSRC}/misc/logos/xonotic_icon.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/xonotic.svg +.for s in 16 22 24 32 48 64 128 256 512 + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/ + ${INSTALL_DATA} ${WRKSRC}/misc/logos/icons_png/xonotic_${s}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/xonotic.png +.endfor do-install-DEDICATED-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/darkplaces-dedicated ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-dedicated diff --git a/games/xonotic/files/patch-misc_logos_xonotic.desktop b/games/xonotic/files/patch-misc_logos_xonotic.desktop new file mode 100644 index 000000000000..4239b43d80b1 --- /dev/null +++ b/games/xonotic/files/patch-misc_logos_xonotic.desktop @@ -0,0 +1,11 @@ +--- misc/logos/xonotic.desktop.orig 2022-06-27 17:32:04 UTC ++++ misc/logos/xonotic.desktop +@@ -6,7 +6,7 @@ Comment=Multiplayer, deathmatch oriented first person + Comment[de]=Deathmatch- und Mehrspieler-orientierter Ego-Shooter + Comment[fr]=Jeu de tir à la première personne multijoueur + Icon=xonotic +-Exec=xonotic-sdl ++Exec=xonotic + Terminal=false + PrefersNonDefaultGPU=true + StartupNotify=false diff --git a/games/xonotic/pkg-plist b/games/xonotic/pkg-plist new file mode 100644 index 000000000000..46c10f3005c2 --- /dev/null +++ b/games/xonotic/pkg-plist @@ -0,0 +1,13 @@ +%%CLIENT%%bin/xonotic +%%DEDICATED%%bin/xonotic-dedicated +%%CLIENT%%share/applications/xonotic.desktop +%%CLIENT%%share/icons/hicolor/128x128/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/16x16/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/22x22/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/24x24/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/256x256/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/32x32/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/48x48/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/512x512/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/64x64/apps/xonotic.png +%%CLIENT%%share/icons/hicolor/scalable/apps/xonotic.svg