pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm/awesome Update wm/awesome to 4.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/9fbce34701f2
branches: trunk
changeset: 366534:9fbce34701f2
user: triaxx <triaxx%pkgsrc.org@localhost>
date: Tue Aug 15 10:57:35 2017 +0000
description:
Update wm/awesome to 4.2
Reviewed by maya@
Changes by packager:
* Add options handling
* Add DBus support through options.mk
* Add API doc generation through options.mk
* Move libexecinfo dependency to options.mk
Changes from Changelog:
https://awesomewm.org/changelogs/short/v4.2.txt
diffstat:
wm/awesome/Makefile | 55 +-
wm/awesome/PLIST | 427 ++++++++++++++++-
wm/awesome/distinfo | 16 +-
wm/awesome/options.mk | 34 +
wm/awesome/patches/patch-CMakeLists.txt | 15 +
wm/awesome/patches/patch-awesomeConfig.cmake | 49 +-
wm/awesome/patches/patch-build-utils_lgi-check.sh | 37 +-
wm/awesome/patches/patch-tests_examples_CMakeLists.txt | 36 +
8 files changed, 578 insertions(+), 91 deletions(-)
diffs (truncated from 855 to 300 lines):
diff -r 82a054d507f6 -r 9fbce34701f2 wm/awesome/Makefile
--- a/wm/awesome/Makefile Tue Aug 15 10:50:03 2017 +0000
+++ b/wm/awesome/Makefile Tue Aug 15 10:57:35 2017 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.58 2017/07/07 13:04:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.59 2017/08/15 10:57:35 triaxx Exp $
#
-DISTNAME= awesome-3.5.9
-CATEGORIES= x11 wm
-MASTER_SITES= https://awesomewm.org/download/
-EXTRACT_SUFX= .tar.xz
+DISTNAME= awesome-4.2
+CATEGORIES= wm
+MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pallegra%gmail.com@localhost
HOMEPAGE= https://awesomewm.org/
@@ -16,15 +16,18 @@
USE_TOOLS+= bash gmake pkg-config
USE_CMAKE= yes
USE_LANGUAGES= c c++
+REPLACE_BASH+= utils/awesome-client
-LUA_VERSIONS_ACCEPTED= 51
+.include "../../wm/awesome/options.mk"
PKG_SYSCONFSUBDIR= xdg/awesome
-CMAKE_ARGS+= -DWITH_DBUS=OFF
-CMAKE_ARGS+= -DSYSCONFDIR=${PKG_SYSCONFDIR:C/\/xdg\/awesome//}
+CONFIGURE_DIRS= ${WRKDIR}/build
+CMAKE_ARG_PATH= ${WRKSRC}
+
CMAKE_ARGS+= -DCOMPRESS_MANPAGES=${MANZ:Q}
-CMAKE_ARGS+= -DAWESOME_MAN_PATH=${PREFIX}/${PKGMANDIR}
+CMAKE_ARGS+= -DOVERRIDE_VERSION=${PKGVERSION_NOREV}
+CMAKE_ARGS+= -DLUA_INCLUDE_DIR=${PREFIX}/${LUA_INCDIR}
EGDIR= ${PREFIX}/share/examples/awesome
CONF_FILES= ${EGDIR}/rc.lua ${PKG_SYSCONFDIR}/rc.lua
@@ -35,27 +38,25 @@
SUBST_FILES.eg= CMakeLists.txt
SUBST_SED.eg= -e "s,\$${AWESOME_SYSCONFDIR},${EGDIR},"
-SUBST_CLASSES+= ev
-SUBST_MESSAGE.ev= Fixing pathnames for libev
-SUBST_STAGE.ev= pre-configure
-SUBST_FILES.ev= awesomeConfig.cmake
-SUBST_SED.ev= -e "s,@LIBEV_PREFIX@,${BUILDLINK_PREFIX.libev},"
-
-BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
-BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
+SUBST_CLASSES+= lua
+SUBST_MESSAGE.lua= Fixing lua prefix
+SUBST_STAGE.lua= pre-configure
+SUBST_FILES.lua= CMakeLists.txt awesomeConfig.cmake build-utils/lgi-check.sh \
+ tests/examples/CMakeLists.txt
+SUBST_SED.lua= -e "s,@LUA_INTERPRETER@,${LUA_INTERPRETER},"
-DEPENDS+= lua${_LUA_VERSION}-gi>=0.7.0:../../devel/lua-gi
-DEPENDS+= pango>=1.29.4nb2:../../devel/pango
+BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
+BUILD_DEPENDS+= asciidoc>=8.3.0:../../textproc/asciidoc
+BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
-LDFLAGS.Darwin+= -liconv
-LDFLAGS.SunOS+= -liconv
+DEPENDS+= ${LUA_PKGPREFIX}-gi>=0.7.0:../../devel/lua-gi
-.include "../../converters/libiconv/buildlink3.mk"
+pre-configure:
+ ${RUN} mkdir -p ${WRKDIR}/build
+
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libev/buildlink3.mk"
-.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../graphics/cairo-gobject/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
@@ -63,10 +64,12 @@
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libxcb/buildlink3.mk"
.include "../../x11/libxdg-basedir/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
.include "../../x11/xcb-util/buildlink3.mk"
.include "../../x11/xcb-util-cursor/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
.include "../../x11/xcb-util-wm/buildlink3.mk"
+.include "../../x11/xcb-util-xrm/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
diff -r 82a054d507f6 -r 9fbce34701f2 wm/awesome/PLIST
--- a/wm/awesome/PLIST Tue Aug 15 10:50:03 2017 +0000
+++ b/wm/awesome/PLIST Tue Aug 15 10:57:35 2017 +0000
@@ -1,24 +1,6 @@
-@comment $NetBSD: PLIST,v 1.7 2013/07/22 19:47:18 degroote Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/08/15 10:57:35 triaxx Exp $
bin/awesome
bin/awesome-client
-man/de/man1/awesome-client.1
-man/de/man1/awesome.1
-man/de/man5/awesomerc.5
-man/es/man1/awesome-client.1
-man/es/man1/awesome.1
-man/es/man5/awesomerc.5
-man/fr/man1/awesome-client.1
-man/fr/man1/awesome.1
-man/fr/man5/awesomerc.5
-man/it/man1/awesome-client.1
-man/it/man1/awesome.1
-man/it/man5/awesomerc.5
-man/man1/awesome-client.1
-man/man1/awesome.1
-man/man5/awesomerc.5
-man/ru/man1/awesome-client.1
-man/ru/man1/awesome.1
-man/ru/man5/awesomerc.5
share/awesome/icons/awesome16.png
share/awesome/icons/awesome32.png
share/awesome/icons/awesome48.png
@@ -26,13 +8,24 @@
share/awesome/lib/awful/autofocus.lua
share/awesome/lib/awful/button.lua
share/awesome/lib/awful/client.lua
+share/awesome/lib/awful/client/focus.lua
+share/awesome/lib/awful/client/shape.lua
+share/awesome/lib/awful/client/urgent.lua
share/awesome/lib/awful/completion.lua
share/awesome/lib/awful/dbus.lua
share/awesome/lib/awful/ewmh.lua
+share/awesome/lib/awful/hotkeys_popup/init.lua
+share/awesome/lib/awful/hotkeys_popup/keys/firefox.lua
+share/awesome/lib/awful/hotkeys_popup/keys/init.lua
+share/awesome/lib/awful/hotkeys_popup/keys/qutebrowser.lua
+share/awesome/lib/awful/hotkeys_popup/keys/tmux.lua
+share/awesome/lib/awful/hotkeys_popup/keys/vim.lua
+share/awesome/lib/awful/hotkeys_popup/widget.lua
share/awesome/lib/awful/init.lua
share/awesome/lib/awful/key.lua
share/awesome/lib/awful/keygrabber.lua
share/awesome/lib/awful/layout/init.lua
+share/awesome/lib/awful/layout/suit/corner.lua
share/awesome/lib/awful/layout/suit/fair.lua
share/awesome/lib/awful/layout/suit/floating.lua
share/awesome/lib/awful/layout/suit/init.lua
@@ -41,62 +34,119 @@
share/awesome/lib/awful/layout/suit/spiral.lua
share/awesome/lib/awful/layout/suit/tile.lua
share/awesome/lib/awful/menu.lua
-share/awesome/lib/awful/mouse/finder.lua
+share/awesome/lib/awful/mouse/drag_to_tag.lua
share/awesome/lib/awful/mouse/init.lua
+share/awesome/lib/awful/mouse/resize.lua
+share/awesome/lib/awful/mouse/snap.lua
share/awesome/lib/awful/placement.lua
share/awesome/lib/awful/prompt.lua
share/awesome/lib/awful/remote.lua
share/awesome/lib/awful/rules.lua
share/awesome/lib/awful/screen.lua
+share/awesome/lib/awful/spawn.lua
share/awesome/lib/awful/startup_notification.lua
share/awesome/lib/awful/tag.lua
share/awesome/lib/awful/titlebar.lua
share/awesome/lib/awful/tooltip.lua
share/awesome/lib/awful/util.lua
+share/awesome/lib/awful/wibar.lua
share/awesome/lib/awful/wibox.lua
share/awesome/lib/awful/widget/button.lua
+share/awesome/lib/awful/widget/calendar_popup.lua
+share/awesome/lib/awful/widget/clienticon.lua
share/awesome/lib/awful/widget/common.lua
share/awesome/lib/awful/widget/graph.lua
share/awesome/lib/awful/widget/init.lua
+share/awesome/lib/awful/widget/keyboardlayout.lua
share/awesome/lib/awful/widget/launcher.lua
share/awesome/lib/awful/widget/layoutbox.lua
+share/awesome/lib/awful/widget/only_on_screen.lua
share/awesome/lib/awful/widget/progressbar.lua
share/awesome/lib/awful/widget/prompt.lua
share/awesome/lib/awful/widget/taglist.lua
share/awesome/lib/awful/widget/tasklist.lua
share/awesome/lib/awful/widget/textclock.lua
+share/awesome/lib/awful/widget/watch.lua
share/awesome/lib/beautiful.lua
+share/awesome/lib/beautiful/init.lua
+share/awesome/lib/beautiful/theme_assets.lua
+share/awesome/lib/beautiful/xresources.lua
+share/awesome/lib/gears/cache.lua
share/awesome/lib/gears/color.lua
share/awesome/lib/gears/debug.lua
+share/awesome/lib/gears/filesystem.lua
+share/awesome/lib/gears/geometry.lua
share/awesome/lib/gears/init.lua
+share/awesome/lib/gears/math.lua
+share/awesome/lib/gears/matrix.lua
share/awesome/lib/gears/object.lua
-share/awesome/lib/gears/sort.lua
+share/awesome/lib/gears/object/properties.lua
+share/awesome/lib/gears/protected_call.lua
+share/awesome/lib/gears/shape.lua
+share/awesome/lib/gears/string.lua
share/awesome/lib/gears/surface.lua
+share/awesome/lib/gears/table.lua
+share/awesome/lib/gears/timer.lua
share/awesome/lib/gears/wallpaper.lua
+share/awesome/lib/menubar/icon_theme.lua
+share/awesome/lib/menubar/index_theme.lua
share/awesome/lib/menubar/init.lua
share/awesome/lib/menubar/menu_gen.lua
share/awesome/lib/menubar/utils.lua
share/awesome/lib/naughty.lua
+share/awesome/lib/naughty/core.lua
+share/awesome/lib/naughty/dbus.lua
+share/awesome/lib/naughty/init.lua
+share/awesome/lib/wibox/container/arcchart.lua
+share/awesome/lib/wibox/container/background.lua
+share/awesome/lib/wibox/container/constraint.lua
+share/awesome/lib/wibox/container/init.lua
+share/awesome/lib/wibox/container/margin.lua
+share/awesome/lib/wibox/container/mirror.lua
+share/awesome/lib/wibox/container/place.lua
+share/awesome/lib/wibox/container/radialprogressbar.lua
+share/awesome/lib/wibox/container/rotate.lua
+share/awesome/lib/wibox/container/scroll.lua
share/awesome/lib/wibox/drawable.lua
+share/awesome/lib/wibox/hierarchy.lua
share/awesome/lib/wibox/init.lua
share/awesome/lib/wibox/layout/align.lua
-share/awesome/lib/wibox/layout/base.lua
share/awesome/lib/wibox/layout/constraint.lua
share/awesome/lib/wibox/layout/fixed.lua
share/awesome/lib/wibox/layout/flex.lua
+share/awesome/lib/wibox/layout/grid.lua
share/awesome/lib/wibox/layout/init.lua
+share/awesome/lib/wibox/layout/manual.lua
share/awesome/lib/wibox/layout/margin.lua
share/awesome/lib/wibox/layout/mirror.lua
+share/awesome/lib/wibox/layout/ratio.lua
share/awesome/lib/wibox/layout/rotate.lua
+share/awesome/lib/wibox/layout/scroll.lua
+share/awesome/lib/wibox/layout/stack.lua
share/awesome/lib/wibox/widget/background.lua
share/awesome/lib/wibox/widget/base.lua
+share/awesome/lib/wibox/widget/calendar.lua
+share/awesome/lib/wibox/widget/checkbox.lua
+share/awesome/lib/wibox/widget/graph.lua
share/awesome/lib/wibox/widget/imagebox.lua
share/awesome/lib/wibox/widget/init.lua
+share/awesome/lib/wibox/widget/piechart.lua
+share/awesome/lib/wibox/widget/progressbar.lua
+share/awesome/lib/wibox/widget/slider.lua
share/awesome/lib/wibox/widget/systray.lua
share/awesome/lib/wibox/widget/textbox.lua
+share/awesome/lib/wibox/widget/textclock.lua
share/awesome/themes/default/README
share/awesome/themes/default/background.png
share/awesome/themes/default/background_white.png
+share/awesome/themes/default/layouts/cornerne.png
+share/awesome/themes/default/layouts/cornernew.png
+share/awesome/themes/default/layouts/cornernw.png
+share/awesome/themes/default/layouts/cornernww.png
+share/awesome/themes/default/layouts/cornerse.png
+share/awesome/themes/default/layouts/cornersew.png
+share/awesome/themes/default/layouts/cornersw.png
+share/awesome/themes/default/layouts/cornersww.png
share/awesome/themes/default/layouts/dwindle.png
share/awesome/themes/default/layouts/dwindlew.png
share/awesome/themes/default/layouts/fairh.png
@@ -135,6 +185,8 @@
share/awesome/themes/default/titlebar/maximized_focus_inactive.png
share/awesome/themes/default/titlebar/maximized_normal_active.png
share/awesome/themes/default/titlebar/maximized_normal_inactive.png
+share/awesome/themes/default/titlebar/minimize_focus.png
+share/awesome/themes/default/titlebar/minimize_normal.png
share/awesome/themes/default/titlebar/ontop_focus_active.png
share/awesome/themes/default/titlebar/ontop_focus_inactive.png
share/awesome/themes/default/titlebar/ontop_normal_active.png
@@ -144,6 +196,10 @@
share/awesome/themes/default/titlebar/sticky_normal_active.png
share/awesome/themes/default/titlebar/sticky_normal_inactive.png
share/awesome/themes/sky/awesome-icon.png
+share/awesome/themes/sky/layouts/cornerne.png
+share/awesome/themes/sky/layouts/cornernw.png
+share/awesome/themes/sky/layouts/cornerse.png
+share/awesome/themes/sky/layouts/cornersw.png
share/awesome/themes/sky/layouts/dwindle.png
share/awesome/themes/sky/layouts/fairh.png
share/awesome/themes/sky/layouts/fairv.png
@@ -158,7 +214,13 @@
share/awesome/themes/sky/layouts/tiletop.png
share/awesome/themes/sky/sky-background.png
share/awesome/themes/sky/theme.lua
+share/awesome/themes/xresources/assets.lua
Home |
Main Index |
Thread Index |
Old Index