pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
widelands: Move manpage to silence pkglink warning.
Module Name: pkgsrc-wip
Committed By: Paul Ripke <stix%stix.id.au@localhost>
Pushed By: stix
Date: Sun Jun 23 22:17:58 2024 +1000
Changeset: b4dedf0f38ee75f4cdfe1adf8c04fe285a269d65
Modified Files:
widelands/Makefile
widelands/PLIST
widelands/distinfo
Added Files:
widelands/patches/patch-xdg_CMakeLists.txt
Log Message:
widelands: Move manpage to silence pkglink warning.
Also remove all the old debug flags from Makefile.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b4dedf0f38ee75f4cdfe1adf8c04fe285a269d65
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
widelands/Makefile | 4 ----
widelands/PLIST | 2 +-
widelands/distinfo | 1 +
widelands/patches/patch-xdg_CMakeLists.txt | 17 +++++++++++++++++
4 files changed, 19 insertions(+), 5 deletions(-)
diffs:
diff --git a/widelands/Makefile b/widelands/Makefile
index 2187bc16e7..04184265d8 100644
--- a/widelands/Makefile
+++ b/widelands/Makefile
@@ -23,10 +23,6 @@ CMAKE_ARGS+= -DWL_INSTALL_BASEDIR=${PREFIX}
CMAKE_ARGS+= -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands
CMAKE_ARGS+= -DWL_INSTALL_BINDIR=${PREFIX}/bin
CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/boost
-#CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=-fsanitize=address
-#CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=-g
-#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo
-#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
BUILDLINK_TRANSFORM+= rm:-Werror=shadow
diff --git a/widelands/PLIST b/widelands/PLIST
index 429ce2196c..ad3536ac9f 100644
--- a/widelands/PLIST
+++ b/widelands/PLIST
@@ -3,6 +3,7 @@ bin/widelands
bin/wl_create_spritesheet
bin/wl_map_info
bin/wl_map_object_info
+man/man6/widelands.6
share/applications/org.widelands.Widelands.desktop
share/doc/widelands/COPYING
share/doc/widelands/CREDITS
@@ -13,7 +14,6 @@ share/icons/hicolor/16x16/apps/org.widelands.Widelands.png
share/icons/hicolor/32x32/apps/org.widelands.Widelands.png
share/icons/hicolor/48x48/apps/org.widelands.Widelands.png
share/icons/hicolor/64x64/apps/org.widelands.Widelands.png
-share/man/man6/widelands.6
share/metainfo/org.widelands.Widelands.appdata.xml
share/widelands/ai/ai_input_1.wai
share/widelands/ai/ai_input_2.wai
diff --git a/widelands/distinfo b/widelands/distinfo
index 894498b4c3..406199f5bb 100644
--- a/widelands/distinfo
+++ b/widelands/distinfo
@@ -14,3 +14,4 @@ SHA1 (patch-src_network_network.cc) = 3f2b24533e3657103c6c05d2a425fb7850e35f4f
SHA1 (patch-src_network_network.h) = 1f4ce455e2de0e91e9760e13df8fbba68a58ab20
SHA1 (patch-src_network_network__lan__promotion.cc) = 5cea8998d422c3645e032d212847b40c121a21ec
SHA1 (patch-src_scripting_lua__globals.cc) = 246f1d4425374025fc0a23c81381cff43fd40f4f
+SHA1 (patch-xdg_CMakeLists.txt) = ce08eacbfbf9d32b6c72e411538adb0472d58851
diff --git a/widelands/patches/patch-xdg_CMakeLists.txt b/widelands/patches/patch-xdg_CMakeLists.txt
new file mode 100644
index 0000000000..f64882a436
--- /dev/null
+++ b/widelands/patches/patch-xdg_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Move manpage installation to silence pkglint warning.
+
+--- xdg/CMakeLists.txt.orig 2024-06-23 09:05:52.889747814 +0000
++++ xdg/CMakeLists.txt
+@@ -8,8 +8,8 @@ foreach (icon_size ${icon_sizes})
+ #install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
+ install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
+ endforeach (icon_size ${icon_sizes})
+-#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
++#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
Home |
Main Index |
Thread Index |
Old Index