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
cvs diff -r1.80 -r1.81 pkgsrc/wm/awesome/Makefile (expand / switch to unified diff)

--- 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,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.80 2023/01/29 21:17:56 ryoon Exp $ 1# $NetBSD: Makefile,v 1.81 2023/05/07 20:48:50 nikita Exp $
2 2
3DISTNAME= awesome-4.3 3DISTNAME= awesome-4.3
4PKGREVISION= 10 4PKGREVISION= 11
5CATEGORIES= wm lua 5CATEGORIES= wm lua
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/}
8GITHUB_RELEASE= v${PKGVERSION_NOREV} 8GITHUB_RELEASE= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= pallegra@gmail.com 10MAINTAINER= pallegra@gmail.com
11HOMEPAGE= https://awesomewm.org/ 11HOMEPAGE= https://awesomewm.org/
12COMMENT= Tiling window manager based on dwm 12COMMENT= Tiling window manager based on dwm
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15CONFLICTS+= awesome<3.0 15CONFLICTS+= awesome<3.0
16 16
17USE_TOOLS+= bash pkg-config 17USE_TOOLS+= bash pkg-config
@@ -46,26 +46,37 @@ CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCON @@ -46,26 +46,37 @@ CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCON
46BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor 46BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor-[0-9]*:../../textproc/ruby-asciidoctor
47TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick 47TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
48DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi 48DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
49 49
50SUBST_CLASSES+= lua 50SUBST_CLASSES+= lua
51SUBST_STAGE.lua= pre-configure 51SUBST_STAGE.lua= pre-configure
52SUBST_MESSAGE.lua= Fixing lua executable name. 52SUBST_MESSAGE.lua= Fixing lua executable name.
53SUBST_FILES.lua+= awesomeConfig.cmake 53SUBST_FILES.lua+= awesomeConfig.cmake
54SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g' 54SUBST_SED.lua= -e 's|COMMAND lua|COMMAND ${LUA_INTERPRETER}|g'
55 55
56pre-configure: 56pre-configure:
57 ${RUN} mkdir -p ${WRKSRC}/build 57 ${RUN} mkdir -p ${WRKSRC}/build
58 58
 59# rc.lua does not end up being installed where the PLIST states it does,
 60# so install it manually, then remove the file which now ends up in the
 61# default location of the build-system.
 62pre-install:
 63 ${MKDIR} ${DESTDIR}${EGDIR}
 64 ${INSTALL_DATA} ${WRKSRC}/build/script_files/rc.lua ${DESTDIR}${EGDIR}
 65
 66post-install:
 67 ${RM} ${DESTDIR}${PKG_SYSCONFDIR}/rc.lua
 68 ${RMDIR} ${DESTDIR}${PKG_SYSCONFDIR}
 69
59.include "../../devel/glib2/buildlink3.mk" 70.include "../../devel/glib2/buildlink3.mk"
60.include "../../devel/pango/buildlink3.mk" 71.include "../../devel/pango/buildlink3.mk"
61.include "../../graphics/cairo/buildlink3.mk" 72.include "../../graphics/cairo/buildlink3.mk"
62.include "../../graphics/cairo-gobject/buildlink3.mk" 73.include "../../graphics/cairo-gobject/buildlink3.mk"
63.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 74.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
64.include "../../lang/lua/buildlink3.mk" 75.include "../../lang/lua/buildlink3.mk"
65.include "../../x11/libX11/buildlink3.mk" 76.include "../../x11/libX11/buildlink3.mk"
66.include "../../x11/libxcb/buildlink3.mk" 77.include "../../x11/libxcb/buildlink3.mk"
67.include "../../x11/libxdg-basedir/buildlink3.mk" 78.include "../../x11/libxdg-basedir/buildlink3.mk"
68.include "../../x11/libxkbcommon/buildlink3.mk" 79.include "../../x11/libxkbcommon/buildlink3.mk"
69.include "../../x11/xcb-util/buildlink3.mk" 80.include "../../x11/xcb-util/buildlink3.mk"
70.include "../../x11/xcb-util-cursor/buildlink3.mk" 81.include "../../x11/xcb-util-cursor/buildlink3.mk"
71.include "../../x11/xcb-util-keysyms/buildlink3.mk" 82.include "../../x11/xcb-util-keysyms/buildlink3.mk"
cvs diff -r1.25 -r1.26 pkgsrc/wm/awesome/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.25 2022/10/30 06:41:56 triaxx Exp $ 1$NetBSD: distinfo,v 1.26 2023/05/07 20:48:50 nikita Exp $
2 2
3BLAKE2s (awesome-4.3.tar.xz) = 996ff487c8d2f850bf78d26f151ea5269c96cff94ccae95626ec2e0cb59e55d4 3BLAKE2s (awesome-4.3.tar.xz) = 996ff487c8d2f850bf78d26f151ea5269c96cff94ccae95626ec2e0cb59e55d4
4SHA512 (awesome-4.3.tar.xz) = c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 4SHA512 (awesome-4.3.tar.xz) = c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5
5Size (awesome-4.3.tar.xz) = 1037816 bytes 5Size (awesome-4.3.tar.xz) = 1037816 bytes
 6SHA1 (patch-CMakeLists.txt) = 0e7a55084a038903474e8c05719ad351946ccf60
6SHA1 (patch-awesomeConfig.cmake) = 5748d5495e9a0e21f7d80b78d2e73423657f1866 7SHA1 (patch-awesomeConfig.cmake) = 5748d5495e9a0e21f7d80b78d2e73423657f1866
7SHA1 (patch-CMakeLists.txt) = a3473fdbea318b0cf280a9c29e77798d38d17d70 
cvs diff -r1.2 -r1.3 pkgsrc/wm/awesome/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- 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 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-CMakeLists.txt,v 1.2 2019/07/17 22:08:58 nia Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.3 2023/05/07 20:48:50 nikita Exp $
2 2
3Install config file to the examples directory. 3Do not introduce timestamps in PNG files (for icons).
 4See <https://wiki.debian.org/ReproducibleBuilds/TimestampsInPNG>.
4 5
5--- CMakeLists.txt.orig 2019-01-28 06:53:24.000000000 +0000 6--- CMakeLists.txt.orig 2023-05-07 21:57:36.859234114 +0200
6+++ CMakeLists.txt 7+++ CMakeLists.txt 2023-05-07 21:59:09.539145363 +0200
7@@ -371,7 +371,7 @@ install(TARGETS ${PROJECT_AWE_NAME} RUNT 8@@ -336,7 +336,7 @@
8 install(FILES "utils/awesome-client" DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) 9 set(ALL_ICONS ${ALL_ICONS} ${output})
9 install(DIRECTORY ${BUILD_DIR}/lib DESTINATION ${AWESOME_DATA_PATH} 10
10 PATTERN "*.in" EXCLUDE) 11 add_custom_command(
11-install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${AWESOME_SYSCONFDIR} 12- COMMAND ${CONVERT_EXECUTABLE} ${input} -strip ${ARGN} ${output}
12+install(FILES ${BUILD_DIR}/awesomerc.lua DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/awesome 13+ COMMAND ${CONVERT_EXECUTABLE} +set date:create +set date:modify -define png:exclude-chunk=time ${input} -strip ${ARGN} ${output}
13 RENAME rc.lua) 14 OUTPUT ${output}
14 if(GENERATE_MANPAGES) 15 DEPENDS ${input}
15 if(COMPRESS_MANPAGES) 16 VERBATIM)