pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
flameshot: honour PKGMANDIR
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Wed Aug 7 00:44:12 2024 +0200
Changeset: 186a91aa85dad14a5634b7b8152e04bbad3a245d
Modified Files:
flameshot/Makefile
flameshot/PLIST
flameshot/distinfo
Added Files:
flameshot/patches/patch-src_CMakeLists.txt
Removed Files:
flameshot/TODO
Log Message:
flameshot: honour PKGMANDIR
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=186a91aa85dad14a5634b7b8152e04bbad3a245d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
flameshot/Makefile | 10 ++++------
flameshot/PLIST | 2 +-
flameshot/TODO | 1 -
flameshot/distinfo | 1 +
flameshot/patches/patch-src_CMakeLists.txt | 23 +++++++++++++++++++++++
5 files changed, 29 insertions(+), 8 deletions(-)
diffs:
diff --git a/flameshot/Makefile b/flameshot/Makefile
index 4c27e854d3..e0d89d6a3e 100644
--- a/flameshot/Makefile
+++ b/flameshot/Makefile
@@ -16,12 +16,10 @@ USE_LANGUAGES= c++
PKGCONFIG_OVERRIDE+= external/Qt-Color-Widgets/QtColorWidgets.pc.in
-# Unclear why this subsitution doesn't work.
-# It makes the manpage not get installed at all.
-#SUBST_CLASSES+= mandir
-#SUBST_STAGE.mandir= pre-configure
-#SUBST_FILES.mandir= src/CMakeLists.txt
-#SUBST_SED.mandir+= -e 's,share/man,${PKGMANDIR}/man,g'
+SUBST_CLASSES+= mandir
+SUBST_STAGE.mandir= pre-configure
+SUBST_FILES.mandir= src/CMakeLists.txt
+SUBST_VARS.mandir= PKGMANDIR
.include "../../devel/cmake/build.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/flameshot/PLIST b/flameshot/PLIST
index 47392cdc99..898b253e30 100644
--- a/flameshot/PLIST
+++ b/flameshot/PLIST
@@ -1,5 +1,6 @@
@comment $NetBSD$
bin/flameshot
+man/man1/flameshot.1
share/applications/org.flameshot.Flameshot.desktop
share/bash-completion/completions/flameshot
share/dbus-1/interfaces/org.flameshot.Flameshot.xml
@@ -45,6 +46,5 @@ share/icons/hicolor/48x48/apps/flameshot.png
share/icons/hicolor/48x48/apps/org.flameshot.Flameshot.png
share/icons/hicolor/scalable/apps/flameshot.svg
share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg
-share/man/man1/flameshot.1
share/metainfo/org.flameshot.Flameshot.metainfo.xml
share/zsh/site-functions/_flameshot
diff --git a/flameshot/TODO b/flameshot/TODO
deleted file mode 100644
index 573ec1171e..0000000000
--- a/flameshot/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Figure out why PKGMANDIR doesn't work.
diff --git a/flameshot/distinfo b/flameshot/distinfo
index e732268ff0..3ba270e56c 100644
--- a/flameshot/distinfo
+++ b/flameshot/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
BLAKE2s (flameshot-12.1.0.tar.gz) = 220b50c2033bd4b8532a10e33ceb0059f1a439daccc8bb3f8c666e45ffd8ff50
SHA512 (flameshot-12.1.0.tar.gz) = 159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c
Size (flameshot-12.1.0.tar.gz) = 15618560 bytes
+SHA1 (patch-src_CMakeLists.txt) = 7e84235f6a761c4951a3ca436920be5d10f6d128
diff --git a/flameshot/patches/patch-src_CMakeLists.txt b/flameshot/patches/patch-src_CMakeLists.txt
new file mode 100644
index 0000000000..260e53b1b8
--- /dev/null
+++ b/flameshot/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,23 @@
+$NetBSD$
+
+Honour PKGMANDIR.
+
+--- src/CMakeLists.txt.orig 2022-07-03 13:42:21.000000000 +0000
++++ src/CMakeLists.txt
+@@ -325,7 +325,7 @@ if (UNIX)
+
+ # Install man pages
+ configure_file(${CMAKE_SOURCE_DIR}/data/man/man1/flameshot.1
+- ${CMAKE_CURRENT_BINARY_DIR}/share/man/man1/flameshot.1 COPYONLY)
++ ${CMAKE_CURRENT_BINARY_DIR}/@PKGMANDIR@/man1/flameshot.1 COPYONLY)
+
+ # Install Icons
+ configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/org.flameshot.Flameshot.png
+@@ -349,6 +349,7 @@ if (UNIX)
+
+ # Install assets
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/@PKGMANDIR@/ DESTINATION ${CMAKE_INSTALL_MANDIR})
+
+ # Install Translations
+ install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/flameshot/translations)
Home |
Main Index |
Thread Index |
Old Index