From owner-svn-ports-head@freebsd.org Tue Aug 27 16:37:28 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D3BC9D9B7A; Tue, 27 Aug 2019 16:37:28 +0000 (UTC) (envelope-from rigoletto@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Hvfw5F5Zz44Bn; Tue, 27 Aug 2019 16:37:28 +0000 (UTC) (envelope-from rigoletto@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 96BCE2187F; Tue, 27 Aug 2019 16:37:28 +0000 (UTC) (envelope-from rigoletto@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7RGbS42074702; Tue, 27 Aug 2019 16:37:28 GMT (envelope-from rigoletto@FreeBSD.org) Received: (from rigoletto@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7RGbS1n074700; Tue, 27 Aug 2019 16:37:28 GMT (envelope-from rigoletto@FreeBSD.org) Message-Id: <201908271637.x7RGbS1n074700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rigoletto set sender to rigoletto@FreeBSD.org using -f From: =?UTF-8?Q?Alexandre_C=2e_Guimar=c3=a3es?= Date: Tue, 27 Aug 2019 16:37:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510018 - in head/net-p2p: transmission-cli/files transmission-gtk X-SVN-Group: ports-head X-SVN-Commit-Author: rigoletto X-SVN-Commit-Paths: in head/net-p2p: transmission-cli/files transmission-gtk X-SVN-Commit-Revision: 510018 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2019 16:37:28 -0000 Author: rigoletto Date: Tue Aug 27 16:37:27 2019 New Revision: 510018 URL: https://svnweb.freebsd.org/changeset/ports/510018 Log: net-p2p/transmission-gtk: Fix .desktop file when NLS disabled. When the NLS option is disabled the installed transmission-gtk.desktop file contains fields that start with and underscore, like _Name instead of Name. When the NLS option is enabled these are replaced by translations. The attached patch adds a simple sed command that removes the underscores when NLS is disabled. PR: 240125 Submitted by: tijl Approved by: tcberner (mentor) Added: head/net-p2p/transmission-cli/files/patch-gtk_CMakeLists.txt (contents, props changed) Modified: head/net-p2p/transmission-gtk/Makefile Added: head/net-p2p/transmission-cli/files/patch-gtk_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/transmission-cli/files/patch-gtk_CMakeLists.txt Tue Aug 27 16:37:27 2019 (r510018) @@ -0,0 +1,36 @@ +--- gtk/CMakeLists.txt.orig 2018-05-01 17:18:29 UTC ++++ gtk/CMakeLists.txt +@@ -48,15 +48,22 @@ add_custom_command( + ${CMAKE_CURRENT_SOURCE_DIR} + ) + ++set(${PROJECT_NAME}_DESKTOP_FILE "${PROJECT_BINARY_DIR}/${TR_NAME}-gtk.desktop") + if(ENABLE_NLS) + find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge REQUIRED) +- set(${PROJECT_NAME}_DESKTOP_FILE "${PROJECT_BINARY_DIR}/${TR_NAME}-gtk.desktop") + add_custom_command( + OUTPUT ${${PROJECT_NAME}_DESKTOP_FILE} + COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --desktop-style --utf8 ${CMAKE_SOURCE_DIR}/po ${PROJECT_SOURCE_DIR}/transmission-gtk.desktop.in ${${PROJECT_NAME}_DESKTOP_FILE} + DEPENDS ${PROJECT_SOURCE_DIR}/transmission-gtk.desktop.in + VERBATIM + ) ++else() ++ add_custom_command( ++ OUTPUT ${${PROJECT_NAME}_DESKTOP_FILE} ++ COMMAND sed s/^_// ${PROJECT_SOURCE_DIR}/transmission-gtk.desktop.in > ${${PROJECT_NAME}_DESKTOP_FILE} ++ DEPENDS ${PROJECT_SOURCE_DIR}/transmission-gtk.desktop.in ++ VERBATIM ++ ) + endif() + + set(${PROJECT_NAME}_SOURCES +@@ -186,8 +193,4 @@ if(INSTALL_DOC) + install(FILES ${TR_NAME}-gtk.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + endif() + +-if(ENABLE_NLS) +- install(FILES ${${PROJECT_NAME}_DESKTOP_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) +-else() +- install(FILES transmission-gtk.desktop.in DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME ${TR_NAME}-gtk.desktop) +-endif() ++install(FILES ${${PROJECT_NAME}_DESKTOP_FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) Modified: head/net-p2p/transmission-gtk/Makefile ============================================================================== --- head/net-p2p/transmission-gtk/Makefile Tue Aug 27 15:52:46 2019 (r510017) +++ head/net-p2p/transmission-gtk/Makefile Tue Aug 27 16:37:27 2019 (r510018) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= -gtk LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \