From nobody Fri Feb 23 21:09:46 2024 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 4ThN1l0sdVz5BWpB; Fri, 23 Feb 2024 21:09:47 +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 4ThN1l0Jrlz42hq; Fri, 23 Feb 2024 21:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708722587; 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=QgIDK5eF33sQzYudRORIcKuYIw4PGrB6LUlALh4UqbA=; b=uAYT2di3qS0V2zbRcxTZFUeFQIT7ic6JGfkKZlBilwtOkdnprN59c5zZLVQlOANYdiRj/8 +R/4Y+UkoL5EqJDALVbETfVpdDQRcHKeVtltitkWNDv9pbw09X7ceRttWxV/YisxtYz+mG /kgyX1q2KJWR3T+dlm2mJ+PRNk+hjww/Fi/nkzKTlnT/XjcKYus2aGW1rV0B9WaIu7GycQ huIXsk1bzs0IPH/T+tkva/GBtAQ0vEGBTFw8C32lXE2shd/TqS5h5CaeWN1hphDz+Acccp rOcK/yM7RUj6jSnL5Bq7H6xpopmXR9hzMC0xg7QdXatsWyHh22O3EVpz1Nw6+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708722587; a=rsa-sha256; cv=none; b=DFEtaTI6pwFK04WWZ3Srt2WXzJvdP2R+Xcop0FgkR8DQ43KxLkZGnIelrhsPQQRCc9xvUo O6pVkfdLdBKGtUuaUczbV0dvJT1iJBd42WkQDOotDUVCgHweYRTbQweOWAA547tyBGqfOz F4bnD5i47pXyNGaoWhussJ4QE3wH24u1GwN5i7H8GNT0A2rFdrISVGMJJ0QHOQ0hkBBYe8 67NJjkY7Q8csGS/gMYSypsTeTKP05Fh85VhgVoZQ+0vTwm10LOUr9hgIFbj40FdBsPSc/D GcbpQtDDw69czroCTFg9orLs4QUbhajy63u+WMtejVd3uFozOgYZ6S+brXLR+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708722587; 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=QgIDK5eF33sQzYudRORIcKuYIw4PGrB6LUlALh4UqbA=; b=IVWJCKA2nx99eMEDsDQTUcLrzwhmYevz8UEpDbjsdF0b7ewV/JT1tN2d1OKeeHSgNJb2Xr vYs9T7iXuj5fS6PuD6VpYw36xPJaXeqg7UNgr8bZkFce1gdZb9ZeV3E0sfpca7TjGw6NRm LfGoLNmFqo6a4MWxnTHfb86hiWd+8YQELzjmYt2/J8OYZTKpJ88QwqZGBbXy4nRl/QpUHM OWRP/w0ZM+G339RSNNqqRrMYkZl73zBysFoWnW2lm/4lj1y5YKLrz5yTn0HdU5FS9OCUzj 0fJZ2gUEXSDk2qJiYNsW4LUDn90R5uZiC41LyitS0OKwTnHeWKqRh5rPrjlhxw== 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 4ThN1k6VTtzXpy; Fri, 23 Feb 2024 21:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NL9kZo042912; Fri, 23 Feb 2024 21:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NL9kR5042909; Fri, 23 Feb 2024 21:09:46 GMT (envelope-from git) Date: Fri, 23 Feb 2024 21:09:46 GMT Message-Id: <202402232109.41NL9kR5042909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: e3919a6fd919 - 2024Q1 - graphics/xournalpp: Install desktop 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: e3919a6fd9191b18b993d11e174369602ff8b244 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3919a6fd9191b18b993d11e174369602ff8b244 commit e3919a6fd9191b18b993d11e174369602ff8b244 Author: Michael Straube AuthorDate: 2024-02-23 21:00:56 +0000 Commit: Yuri Victorovich CommitDate: 2024-02-23 21:09:42 +0000 graphics/xournalpp: Install desktop files (cherry picked from commit 0af14d659e48b71780fd2c9b14104fa7ce5d7bdf) --- graphics/xournalpp/Makefile | 4 ++-- graphics/xournalpp/distinfo | 4 +++- graphics/xournalpp/files/patch-CMakeLists.txt | 22 ++++++++++++++++++++++ graphics/xournalpp/pkg-plist | 10 ++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/graphics/xournalpp/Makefile b/graphics/xournalpp/Makefile index cf60e1ddc8a0..31c0fbc880d0 100644 --- a/graphics/xournalpp/Makefile +++ b/graphics/xournalpp/Makefile @@ -1,7 +1,7 @@ PORTNAME= xournalpp DISTVERSIONPREFIX= v DISTVERSION= 1.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -19,7 +19,7 @@ LIB_DEPENDS= libgtksourceview-4.so:x11-toolkits/gtksourceview4 \ libsndfile.so:audio/libsndfile \ libzip.so:archivers/libzip -USES= cmake compiler:c++11-lang gettext-tools gnome lua pkgconfig tex xorg +USES= cmake compiler:c++11-lang gettext-tools gnome lua pkgconfig tex xorg desktop-file-utils shared-mime-info USE_GITHUB= yes USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 librsvg2 libxml2 pango USE_XORG= x11 xext xi diff --git a/graphics/xournalpp/distinfo b/graphics/xournalpp/distinfo index 8e40485aad8c..293c9b90a983 100644 --- a/graphics/xournalpp/distinfo +++ b/graphics/xournalpp/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1697346808 +TIMESTAMP = 1708720261 SHA256 (xournalpp-xournalpp-v1.2.2_GH0.tar.gz) = b873ea4e2beadc3061fab87faef31c374ae7876c88dbda5565c491945cf7290f SIZE (xournalpp-xournalpp-v1.2.2_GH0.tar.gz) = 16705580 +SHA256 (26889c0e901ba4271b355e1893a6af7c4a2c2afa.patch) = 0b03b64ffdee49b9dcc2923c25a6080c0304527c5d4002bab1b06a293e36ccaa +SIZE (26889c0e901ba4271b355e1893a6af7c4a2c2afa.patch) = 2432 diff --git a/graphics/xournalpp/files/patch-CMakeLists.txt b/graphics/xournalpp/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..1adee6476114 --- /dev/null +++ b/graphics/xournalpp/files/patch-CMakeLists.txt @@ -0,0 +1,22 @@ +--- CMakeLists.txt.orig 2023-10-14 09:09:56 UTC ++++ CMakeLists.txt +@@ -138,6 +138,10 @@ endif () + endif () + endif () + ++if (UNIX AND NOT APPLE AND NOT CYGWIN) ++ set(INSTALL_DESKTOP_FILES true) ++endif() ++ + find_package(ZLIB REQUIRED) + find_package(Threads REQUIRED) + +@@ -329,7 +333,7 @@ install(DIRECTORY resources + ) + + # Install desktop shortcuts for Linux +-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++if (${INSTALL_DESKTOP_FILES}) + message("Installing desktop files") + + # Install icons diff --git a/graphics/xournalpp/pkg-plist b/graphics/xournalpp/pkg-plist index cfa73f3bd15e..29b96a6bca24 100644 --- a/graphics/xournalpp/pkg-plist +++ b/graphics/xournalpp/pkg-plist @@ -1,5 +1,12 @@ bin/xournalpp bin/xournalpp-thumbnailer +share/applications/com.github.xournalpp.xournalpp.desktop +share/icons/hicolor/scalable/apps/com.github.xournalpp.xournalpp.svg +share/icons/hicolor/scalable/mimetypes/application-x-xojpp.svg +share/icons/hicolor/scalable/mimetypes/application-x-xopp.svg +share/icons/hicolor/scalable/mimetypes/application-x-xopt.svg +share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopp.svg +share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopt.svg share/locale/af_ZA/LC_MESSAGES/xournalpp.mo share/locale/ar/LC_MESSAGES/xournalpp.mo share/locale/bn_BD/LC_MESSAGES/xournalpp.mo @@ -40,6 +47,9 @@ share/locale/zh_HK/LC_MESSAGES/xournalpp.mo share/locale/zh_TW/LC_MESSAGES/xournalpp.mo share/man/man1/xournalpp-thumbnailer.1.gz share/man/man1/xournalpp.1.gz +share/metainfo/com.github.xournalpp.xournalpp.appdata.xml +share/mime/packages/com.github.xournalpp.xournalpp.xml +share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/plugins/ColorCycle/main.lua %%DATADIR%%/plugins/ColorCycle/plugin.ini %%DATADIR%%/plugins/Example/main.lua