Sun May 7 20:48:50 2023 UTC ()
awesome: add reproducibility patch. fix build according to plist.
(nikita)
diff -r1.80 -r1.81 pkgsrc/wm/awesome/Makefile
diff -r1.25 -r1.26 pkgsrc/wm/awesome/distinfo
diff -r1.2 -r1.3 pkgsrc/wm/awesome/patches/patch-CMakeLists.txt
--- pkgsrc/wm/awesome/Makefile 2023/01/29 21:17:56 1.80
+++ pkgsrc/wm/awesome/Makefile 2023/05/07 20:48:50 1.81
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2023/01/29 21:17:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.81 2023/05/07 20:48:50 nikita Exp $
DISTNAME= awesome-4.3
-PKGREVISION= 10
+PKGREVISION= 11
CATEGORIES= wm lua
EXTRACT_SUFX= .tar.xz
MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/}
@@ -55,6 +55,17 @@
pre-configure:
${RUN} mkdir -p ${WRKSRC}/build
+
+# rc.lua does not end up being installed where the PLIST states it does,
+# so install it manually, then remove the file which now ends up in the
+# default location of the build-system.
+pre-install:
+ ${MKDIR} ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/build/script_files/rc.lua ${DESTDIR}${EGDIR}
+
+post-install:
+ ${RM} ${DESTDIR}${PKG_SYSCONFDIR}/rc.lua
+ ${RMDIR} ${DESTDIR}${PKG_SYSCONFDIR}
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
--- pkgsrc/wm/awesome/distinfo 2022/10/30 06:41:56 1.25
+++ pkgsrc/wm/awesome/distinfo 2023/05/07 20:48:50 1.26
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2022/10/30 06:41:56 triaxx Exp $
+$NetBSD: distinfo,v 1.26 2023/05/07 20:48:50 nikita Exp $
BLAKE2s (awesome-4.3.tar.xz) = 996ff487c8d2f850bf78d26f151ea5269c96cff94ccae95626ec2e0cb59e55d4
SHA512 (awesome-4.3.tar.xz) = c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
Size (awesome-4.3.tar.xz) = 1037816 bytes
+SHA1 (patch-CMakeLists.txt) = 0e7a55084a038903474e8c05719ad351946ccf60
SHA1 (patch-awesomeConfig.cmake) = 5748d5495e9a0e21f7d80b78d2e73423657f1866
-SHA1 (patch-CMakeLists.txt) = a3473fdbea318b0cf280a9c29e77798d38d17d70
--- pkgsrc/wm/awesome/patches/patch-CMakeLists.txt 2019/07/17 22:08:58 1.2
+++ pkgsrc/wm/awesome/patches/patch-CMakeLists.txt 2023/05/07 20:48:50 1.3
@@ -1,15 +1,16 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2019/07/17 22:08:58 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/07 20:48:50 nikita Exp $
-Install config file to the examples directory.
+Do not introduce timestamps in PNG files (for icons).
+See <https://wiki.debian.org/ReproducibleBuilds/TimestampsInPNG>.
---- CMakeLists.txt.orig 2019-01-28 06:53:24.000000000 +0000
+--- CMakeLists.txt.orig 2023-05-07 21:57:36.859234114 +0200
-+++ CMakeLists.txt
++++ CMakeLists.txt 2023-05-07 21:59:09.539145363 +0200
-@@ -371,7 +371,7 @@ install(TARGETS ${PROJECT_AWE_NAME} RUNT
+@@ -336,7 +336,7 @@
- install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ set(ALL_ICONS ${ALL_ICONS} ${output})
- install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH}
+
- PATTERN "*.in" EXCLUDE)
+ add_custom_command(
--install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR}
+- COMMAND ${CONVERT_EXECUTABLE} ${input} -strip ${ARGN} ${output}
-+install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/awesome
++ COMMAND ${CONVERT_EXECUTABLE} +set date:create +set date:modify -define png:exclude-chunk=time ${input} -strip ${ARGN} ${output}
- RENAME rc.lua)
+ OUTPUT ${output}
- if(GENERATE_MANPAGES)
+ DEPENDS ${input}
- if(COMPRESS_MANPAGES)
+ VERBATIM)