From nobody Fri Feb 23 21:09:19 2024 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 4ThN1C6p68z5BWp6; Fri, 23 Feb 2024 21:09:19 +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 4ThN1C5zB4z42kf; Fri, 23 Feb 2024 21:09:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708722559; 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=voZrwRR9PKoRN6GhGlAGp/myDGWNREW92V2SPd/oZ+4=; b=rgIGtI9DHFISiMdmXd59UzRHpLAr6h0zQzAuZ3TiF9qG4R0F5HKGENljBNeBslUrkPIbrq i6LwiTvdbtwH0hbSgAvMWdey/uAc9BD6LbTZM/zxuGcrINyU9Um3a5lz6GQwwSL/3FsdVJ sFWKQIEmHLQ/L/EMOLlquNVqY2ZsIeHYvxtti9TB5AWH7oJe81FX0LaMX0KpTejWzjCN+5 yaN0da7IJHqk+Ikt60gv6DqNy7HNijHp1nMOG1w9rFLSIVJbTRrRKnJrRZ0JYQB4B48u0K h1mGc3OzI+8GXzmaWgc3dJkEPMfXtAJbj1D2BNz21qNiVvYpClA8lWKuvaIIxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708722559; a=rsa-sha256; cv=none; b=uvjwRsAJoJ3hbC05rdoHpNSYKbXb1fCXbF+TsW4rAemwL9ghTCbVqfDaavBqUCffPpthFB QDx0kGnhaKJFPB5m3F86FWjsSrof1ZNchc+mb7JGHhKRzFshpCwbNBEEHFBaGk5gNF7S+9 V8Ew0R72ssMVfgxTzZCFpw2fS7fN8uRb0STKzP9KkQ6Yy1eWrNPf2lQz2682fLwQqlujal G52jmAyCcoxJym7g9lSfwJpbgTE8Qsm6LGDIZVMpL/SeOLRV3IuHDDa8bSk1EAmYj/TcRw /mu833YpalG5sXL766qxlwV0ATE/oKjOvPRZCXAYDpUsRYfki9mc+k2RQ+b0ng== 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=1708722559; 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=voZrwRR9PKoRN6GhGlAGp/myDGWNREW92V2SPd/oZ+4=; b=vmSQTXPvEsEIXLUqQHy3SbO/Z5ufkF7if2YIEisZiBr32WOs35lOloC2G9QVpOBQRNAN+G BenhOeGKXVuHnDaB7LxEwPZCuJpOEQzTHq3PVONL40FhjAyewXf3wTL4WQeBTtE8veo5SQ gbM7xmIbMlKS1ltVw95jXHRmdT2w6zl8CzNH/tEXWGCM8hgfGErPrw8YHK8JYQbejqEnrI ag/L7BPfbKrmbSyF6oc9yEqwr9pyBAEfZF4ZXtEvu567ueiBVkL5TPovT1LT43WBaJeeSp bCeTGj5N6v2zSertW4/2/VTVqr978FW/Vqxo1OReNZklZJFjK2s8eOWfMRk4iQ== 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 4ThN1C4sd9zXmR; Fri, 23 Feb 2024 21:09:19 +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 41NL9JMu042700; Fri, 23 Feb 2024 21:09:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NL9JgE042697; Fri, 23 Feb 2024 21:09:19 GMT (envelope-from git) Date: Fri, 23 Feb 2024 21:09:19 GMT Message-Id: <202402232109.41NL9JgE042697@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 0af14d659e48 - main - graphics/xournalpp: Install desktop files 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0af14d659e48b71780fd2c9b14104fa7ce5d7bdf Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0af14d659e48b71780fd2c9b14104fa7ce5d7bdf commit 0af14d659e48b71780fd2c9b14104fa7ce5d7bdf Author: Michael Straube AuthorDate: 2024-02-23 21:00:56 +0000 Commit: Yuri Victorovich CommitDate: 2024-02-23 21:09:17 +0000 graphics/xournalpp: Install desktop files --- 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