diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-01 21:06:00 +0000 |
commit | 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch) | |
tree | 53bf797418ac5e9b99c41ca0382c87b82421e5de /x11-wm/awesome | |
parent | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff) |
gentoo new year resync : 01.01.2021
Diffstat (limited to 'x11-wm/awesome')
-rw-r--r-- | x11-wm/awesome/Manifest | 9 | ||||
-rw-r--r-- | x11-wm/awesome/awesome-3.5.9-r3.ebuild | 131 | ||||
-rw-r--r-- | x11-wm/awesome/awesome-4.3-r100.ebuild | 11 | ||||
-rw-r--r-- | x11-wm/awesome/awesome-4.3-r2.ebuild (renamed from x11-wm/awesome/awesome-4.3-r1.ebuild) | 68 | ||||
-rw-r--r-- | x11-wm/awesome/awesome-9999.ebuild | 65 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-4.3-fno-common.patch | 179 |
6 files changed, 264 insertions, 199 deletions
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest index 827446952a40..e1593db1c640 100644 --- a/x11-wm/awesome/Manifest +++ b/x11-wm/awesome/Manifest @@ -4,18 +4,17 @@ AUX awesome-3.5.9-slotted-lua.patch 1982 BLAKE2B 03665832ee2e65b40754c6989c1f5ea AUX awesome-3.5_rc1-convert-path.patch 539 BLAKE2B 4904c47c165384dadf6229c1d92cbc313df1e70566b894b9b325d24d457b99d53544e885f6c086073c903aca6f2b365eb2384145c85194f1ab91740dee5142b6 SHA512 b5b8f42ddd21bf851e13fe0a0d844b055795979ae701a418780a2e0282cedd1ae745f00c13e5a0f5b9ac48a70c2ffbf7d9b7dd2856783a4b0434b09683947150 AUX awesome-4.0-cflag-cleanup.patch 395 BLAKE2B 02865c0e99fc81e00e501758d95eb47ebb3960575258c42550f1530d97aff14256911b8107eac606261ee427399934d877d9f116a624216dfee143fd9eb4a8f4 SHA512 e9ffe2b66046e0ebbc0bb3c0b8f9bd67bd7d8d351792e299730abfbd8f284dd0631e87b27a8ba22587e9059b13d13381902efb4b9423348b735021eaee779e9c AUX awesome-4.0-convert-path.patch 257 BLAKE2B 7f4504273e155c6ae70fc8aefa067513af32fa6fc38efeab1a642e8594910bbbb559dbfad33c703420b0fa64e3aef9289750f92a41aa5d76e29161f32a1cb6a3 SHA512 3eadbc1d14a18e3d669bb8ecf3769ff888d4b30328f0167166c8632498ad50bf21f004098960507a1b96c5bd5f76a4fcdc74022d820d2d809175ec2829a26f5d +AUX awesome-4.3-fno-common.patch 4337 BLAKE2B 69f4e21b1fdceef56b65ed605704f0abd367e8cd78cd246387672ea64a450d94a882482e72dbfed80482e0eb2e8ec5bd8d8309e0505ae59c78679334ffa64f45 SHA512 48960ee3ca16c69f698c383ad7ad1f0fb33e79ba614b0fdb2f9e67fe00bc882ef4b257d9beb9829ed3938cf5e8f1c7f5d140066b18aca4b3159e8ccb1e0c2186 AUX awesome-gnome-3.session 93 BLAKE2B 0af3b5369b269f698af4b375d1e7725789592ce35302d5afa4ae3441317816dbdd442b51f616ef8a8c81d87d4d28ad37859280d769b725825e5f4b909fb79dff SHA512 0530d7c1f5239cad9cd32bbb37bab449fe79fe6d658037a31d4ab29936dc119a41f8de66bb321a3fbd5fd300b378930466073624d7a30f089dda9c0ad3897829 AUX awesome-gnome-xsession.desktop 179 BLAKE2B c8755013d73f31fb9c613654521ce5a027120860bfcbfc8a5c03169f671a01442f10096a8296399ca4c7f533f64c150bd9740ee5db346c9cc7afdb8139638619 SHA512 873c70a499bd44874b3399a58f42c69740023b43c17e6548e0c30a54cf64ab37a0ffec240e06dff4a6950b50f7010d48fdd036448f145fed3ac3095d4caf508c AUX awesome-gnome.desktop 191 BLAKE2B 8076b398c42443f48dc83f0cd12e56ff342713c9378639aa33e3eba47a6d6b7b84b1b805a2b777ef4e98d7890e04a46773f78e0cb414addb7d570d0a11701f3f SHA512 50570e0bd7c7ef3dc39bcf0dfdbc35d44b67316da7574aaea26dedb89726b40d04e4d509fb798b36c49930f247f0293fdeff2bdc32e6b3067e4f568b30f99fae AUX awesome-gnome.session 220 BLAKE2B ea84c3a24feb5c9921940dedd6f3fa05a6987b6aab96b2113be6215b0bd94d9bb73524ebaea8ad76a05b1ece0d76265aab82930048acd05912c9e127b0cdb868 SHA512 86246ddd9db41007c23735d0773b5c6d37eeda33318d9e3e33f57fb46befdd32380aaf9fb6bf539a9080e5f2400ccf5d7de55842c420c458b8e8d62a5edae09b AUX awesome-session 1999 BLAKE2B c7c784fba884ff0e579eb60cb049e695022be162a535065a172c461ec60d369415faa26be7cd60645e671ae8b2861b192ff962b803473746b567ef874bc706e9 SHA512 b6e7cc0813569b448b030cb8516d0272ebcf60b96f680b7de43dc4374e6e2d85b9bd841c6f1ab62caca52120c303332653e3de38eca0fe6a813b9bc5b68ac8b7 AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5abf5f8fa7467694226bdcd1441bd5c601f0f27e7d2c8656bb4c75cb364cd6d8d641a648611ed2658b27cd389 SHA512 1d19f3ac5e9f8fd1084fd5e092d52ffbabb06fc3dc94f6f8e62834a3a03bd5bcb04adc698ac3a022c5446a07a847be35e3f3003e8bc9e7d35c6c82350517233d -DIST awesome-3.5.9.tar.xz 723084 BLAKE2B 96f4c5df98147399f28d1b1455ac53800f2222969599486c2f79b73ba36cfa237270cd5972d4e10e0a4f774a54dfa92948bba5d2e0438687d36739e12c3f5ecc SHA512 6a4c679b293e8cd85d1f7e13f6dea704cbb267e42b9260496a54b657a66d6148aae51521d802d61baaeb23df0d4a8ad0b28d9dc922ea5da2a347b4251cce5e25 DIST awesome-4.2.tar.xz 987024 BLAKE2B b2aaa993bafa83121d165d21083dfcac825e373be9547490f8b93b8e8b0f90470395a0238affaf9990f719b8bd2f36a255f6468b6422406787a3c96946c4e831 SHA512 134dd3625c86243861b3d0701cc8bfd8c00986d7027f0832016c3f5e59e6b9a1ef2f677bb0d1d66ece63449533e4b13d8d7388e96e6f9014212030a79f163e09 DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 -EBUILD awesome-3.5.9-r3.ebuild 3179 BLAKE2B d7b5a660e5f32bb5bfed3f177aac14dbd1b1c879cb4a6ae9c57cb9676e1e4e17ac327e846d263ef88ee7297c1fa43a11450aadf557a107fb9e592e57a757b066 SHA512 547fb63ae5779f4046b3e3cc1a84d052a71d74a70aa4b9d42c595dd443c7f56f74d3f2121596b0a312dce98b26247ca967d45f236f73deae2879827dd9d121c5 EBUILD awesome-4.2-r3.ebuild 3947 BLAKE2B 30c377ec58fd84c01929d4bdb04fd3d65757a67336af701421dcd98a4853ff40bc57d443a809cd13fb4c2c93d3f203357c208b0ee150ace42116d3dbda9a99ba SHA512 81b79af79fe5dbff19bb708a98233dfc72f40057300f5dbb1608e6dc9de79662116d3d52ecbcf962c2b852884bed8db1da35dd444fbdbb64bb949c207bee4c60 -EBUILD awesome-4.3-r1.ebuild 3596 BLAKE2B 60a3a026cef8d75ea7feff3154821e09c849f394d26b1a55d8280cec0b43628d4c870748537cba9ef66db76a433b30c7d8637843d2972225fe621efdf03ec4e1 SHA512 f4b0e1ae8980ce71204a72bf37b730cb080532595d568310d8fabd830f21c48d6c4a00ff6ed382f27ef7c9203cc8697f9a8ec912cff013682286e92bc4d30b72 -EBUILD awesome-4.3-r100.ebuild 3686 BLAKE2B 34a092c1333c1a6e05488141e278acab83ebf0a0c81fae08cd9e8ee75eeb2f6bd7e3af7711b6cdc611f31d51d318636611c55cc7c8e62e6a9d66dd9d8ad0b29f SHA512 742ecb30a5b78e844201d25d9cb5ad419e3372ae60813ca227da5085f9142c7023bb3655b5b16a42d22a72df8f003349a077f725e3be563ea9a4e8aff31ddb5b -EBUILD awesome-9999.ebuild 3648 BLAKE2B 0e83667767a33e68bb84940682f89d0e1c36b8d80e769b244c8cd78d5b87ffa591e15d4fdf793f25ceb6587948109d434f3e882b4cd665f33ff5f68b88681742 SHA512 c6b74266d83b42df45d5c9ecea4604fb9ce372e243013ee896bc5f34dbc377ee115221fc9276e5f23b0c946bd6022b782ae363c3720842ce1f50256c57f97208 +EBUILD awesome-4.3-r100.ebuild 4023 BLAKE2B ca7557098a8076be2d2328d6ac49bf1ff2c401678b25a51c0ab19471740135f9ae96ff25d44dd20c2d4daf60c8e67e80bb4569dccaec8121c1bb76441770dfcd SHA512 1c53f85c2800260732db600d066ea5a02d2957d77ec3962c8fbf97706958e8d2e3d1e99a7fb16c786527fad698d949d804ce996337f570f64ab8ab82d0821c37 +EBUILD awesome-4.3-r2.ebuild 3654 BLAKE2B 1a047847e731604f4080bd86668504434db4caa68eec9e4567bedb7395d861c81fe80bfab3539bc5a968a9d9adc7a25b4842d29103da6774829dc545c6f900d0 SHA512 b3ea15c1fc8df4a08b8db393f4042f7cfb6c39f890db10cac25f3270366505c942a72ea404951d82d491228349f8c2445e6629ddd43142b2d34b4eacde8ba87e +EBUILD awesome-9999.ebuild 3988 BLAKE2B 57c1555b20b642de88b7f50ac4c995993b95c9417160a0dbc8a8297228ca3fdbf2fe1453f1e38d9eedb6727b550c21beb3d920369cc71a1f038d50057d68b761 SHA512 42548e6ab10bbe52ce089c5281d5a27a8d5c6d4312b88a7e906700d38ada1cb018d014fdd18dc99f17636434ce680408dba477fda60f0379bdbc0707c205b902 MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea diff --git a/x11-wm/awesome/awesome-3.5.9-r3.ebuild b/x11-wm/awesome/awesome-3.5.9-r3.ebuild deleted file mode 100644 index 58e6c35ff041..000000000000 --- a/x11-wm/awesome/awesome-3.5.9-r3.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit cmake-utils eutils - -DESCRIPTION="A dynamic floating and tiling window manager" -HOMEPAGE="http://awesome.naquadah.org/" -SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 x86" -IUSE="dbus doc gnome" - -COMMON_DEPEND=" - || ( >=dev-lang/lua-5.1:0 dev-lang/lua:5.1 ) - dev-libs/glib:2 - >=dev-libs/libxdg-basedir-1 - >=dev-lua/lgi-0.7 - x11-libs/cairo[X,xcb(+)] - x11-libs/gdk-pixbuf:2 - >=x11-libs/libxcb-1.6 - >=x11-libs/pango-1.19.3[introspection] - >=x11-libs/startup-notification-0.10_p20110426 - >=x11-libs/xcb-util-0.3.8 - x11-libs/xcb-util-cursor - x11-libs/libXcursor - >=x11-libs/libX11-1.3.99.901 - dbus? ( >=sys-apps/dbus-1 )" - -# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 -DEPEND="${COMMON_DEPEND} - >=app-text/asciidoc-8.4.5 - app-text/xmlto - dev-util/gperf - virtual/pkgconfig - media-gfx/imagemagick[png] - >=x11-base/xcb-proto-1.5 - x11-base/xorg-proto - doc? ( - app-doc/doxygen - media-gfx/graphviz - )" - -RDEPEND="${COMMON_DEPEND}" - -DOCS="AUTHORS BUGS PATCHES README STYLE" - -PATCHES=( - "${FILESDIR}/${PN}-3.5_rc1-convert-path.patch" - "${FILESDIR}/${PN}-xsession.patch" - "${FILESDIR}/${PN}-3.5.5-util.lua-xdg-icons-fix.patch" - "${FILESDIR}/${PN}-3.5.5-cflag-cleanup.patch" - "${FILESDIR}/${PN}-3.5.9-slotted-lua.patch" -) - -src_configure() { - has_version 'dev-lang/lua:5.1' \ - && LUA=lua5.1 \ - || LUA=lua - mycmakeargs=( - -DSYSCONFDIR="${EPREFIX}"/etc - $(cmake-utils_use_with dbus DBUS) - $(cmake-utils_use doc GENERATE_DOC) - -DLUA_EXECUTABLE="${EPREFIX}"/usr/bin/${LUA} - ) - - cmake-utils_src_configure -} - -src_compile() { - local myargs="all" - - if use doc ; then - myargs="${myargs} doc" - fi - cmake-utils_src_make ${myargs} -} - -src_install() { - cmake-utils_src_install - - if use doc ; then - ( - cd "${CMAKE_BUILD_DIR}"/doc - mv html doxygen - dohtml -r doxygen - ) - fi - rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed" - - exeinto /etc/X11/Sessions - newexe "${FILESDIR}"/${PN}-session ${PN} || die - - # GNOME-based awesome - if use gnome ; then - # GNOME session - insinto /usr/share/gnome-session/sessions - newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" - # Application launcher - domenu "${FILESDIR}/${PN}-gnome.desktop" || die - # X Session - insinto /usr/share/xsessions/ - doins "${FILESDIR}/${PN}-gnome-xsession.desktop" - fi -} - -pkg_postinst() { - # bug #447308 - if use gnome; then - elog - elog "You have enabled the gnome USE flag." - elog "Please note that quitting awesome won't kill your gnome session." - elog "To really quit the session, you should bind your quit key" - elog "to the following command:" - elog " gnome-session-quit --logout" - elog "For more info visit" - elog " https://bugs.gentoo.org/show_bug.cgi?id=447308" - fi - - # bug #440724 - elog - elog "If you are having issues with Java application windows being" - elog "completely blank, try installing" - elog " x11-misc/wmname" - elog "and setting the WM name to LG3D." - elog "For more info visit" - elog " https://bugs.gentoo.org/show_bug.cgi?id=440724" - elog -} diff --git a/x11-wm/awesome/awesome-4.3-r100.ebuild b/x11-wm/awesome/awesome-4.3-r100.ebuild index 56bd122ae470..b0898a645c68 100644 --- a/x11-wm/awesome/awesome-4.3-r100.ebuild +++ b/x11-wm/awesome/awesome-4.3-r100.ebuild @@ -25,7 +25,7 @@ RDEPEND="${LUA_DEPS} >=dev-libs/libxdg-basedir-1 $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') x11-libs/cairo[X,xcb(+)] - x11-libs/gdk-pixbuf:2 + x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/libxcb-1.6[xkb] >=x11-libs/pango-1.19.3[introspection] >=x11-libs/startup-notification-0.10_p20110426 @@ -41,7 +41,11 @@ RDEPEND="${LUA_DEPS} " # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 -# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP +# ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP. +# On the other hand, it means that we should explicitly depend on a version +# migrated to Lua eclasses so that during the upgrade from unslotted +# to slotted dev-lang/lua, the package manager knows to emerge migrated +# ldoc before migrated awesome. DEPEND="${RDEPEND} >=app-text/asciidoc-8.4.5 app-text/xmlto @@ -50,7 +54,7 @@ DEPEND="${RDEPEND} media-gfx/imagemagick[png] >=x11-base/xcb-proto-1.5 x11-base/xorg-proto - doc? ( dev-lua/ldoc ) + doc? ( >=dev-lua/ldoc-1.4.6-r100 ) test? ( app-shells/zsh x11-base/xorg-server[xvfb] @@ -67,6 +71,7 @@ PATCHES=( "${FILESDIR}/${PN}-4.0-convert-path.patch" # bug #408025 "${FILESDIR}/${PN}-xsession.patch" # bug #408025 "${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658 + "${FILESDIR}/${PN}-4.3-fno-common.patch" # bug #707262 ) src_configure() { diff --git a/x11-wm/awesome/awesome-4.3-r1.ebuild b/x11-wm/awesome/awesome-4.3-r2.ebuild index 64d00a31b10f..206d64b0eb27 100644 --- a/x11-wm/awesome/awesome-4.3-r1.ebuild +++ b/x11-wm/awesome/awesome-4.3-r2.ebuild @@ -3,64 +3,70 @@ EAPI=7 -inherit cmake-utils desktop pax-utils +inherit cmake desktop pax-utils + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" +else + SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +fi DESCRIPTION="A dynamic floating and tiling window manager" HOMEPAGE="https://awesomewm.org/" -SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="dbus doc gnome luajit test" -RESTRICT="test" +RESTRICT="test" # https://bugs.gentoo.org/654084 RDEPEND=" - >=dev-lang/lua-5.1:0 - luajit? ( dev-lang/luajit:2 ) + dev-lang/lua:0 dev-libs/glib:2 - >=dev-libs/libxdg-basedir-1 - >=dev-lua/lgi-0.8 + dev-libs/libxdg-basedir + dev-lua/lgi x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 - >=x11-libs/libxcb-1.6[xkb] - >=x11-libs/pango-1.19.3[introspection] - >=x11-libs/startup-notification-0.10_p20110426 - >=x11-libs/xcb-util-0.3.8 + x11-libs/libxcb[xkb] + x11-libs/pango[introspection] + x11-libs/startup-notification + x11-libs/xcb-util x11-libs/xcb-util-cursor - >=x11-libs/xcb-util-keysyms-0.3.4 - >=x11-libs/xcb-util-wm-0.3.8 - >=x11-libs/xcb-util-xrm-1.0 + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] - >=x11-libs/libX11-1.3.99.901 - dbus? ( >=sys-apps/dbus-1 ) + x11-libs/libX11 + dbus? ( sys-apps/dbus ) + luajit? ( dev-lang/luajit:2 ) " # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 DEPEND="${RDEPEND} - >=app-text/asciidoc-8.4.5 - app-text/xmlto - dev-util/gperf - virtual/pkgconfig - media-gfx/imagemagick[png] - >=x11-base/xcb-proto-1.5 + x11-base/xcb-proto x11-base/xorg-proto - doc? ( dev-lua/ldoc ) test? ( - app-shells/zsh x11-base/xorg-server[xvfb] dev-lua/busted dev-lua/luacheck ) " +BDEPEND=" + app-text/asciidoc + media-gfx/imagemagick[png] + virtual/pkgconfig + doc? ( dev-lua/ldoc ) + test? ( app-shells/zsh )" # Skip installation of README.md by einstalldocs, which leads to broken symlink DOCS=() PATCHES=( - "${FILESDIR}/${PN}-4.0-convert-path.patch" # bug #408025 - "${FILESDIR}/${PN}-xsession.patch" # bug #408025 - "${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658 + "${FILESDIR}"/${PN}-4.0-convert-path.patch # bug #408025 + "${FILESDIR}"/${PN}-xsession.patch # bug #408025 + "${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658 + "${FILESDIR}"/${P}-fno-common.patch # bug #707262 ) src_configure() { @@ -76,16 +82,16 @@ src_configure() { mycmakeargs+=("-DLUA_INCLUDE_DIR=${EPREFIX}/usr/include/luajit-2.0") mycmakeargs+=("-DLUA_LIBRARY=${EPREFIX}/usr/$(get_libdir)/libluajit-5.1.so") fi - cmake-utils_src_configure + cmake_src_configure } src_test() { # awesome's test suite starts Xvfb by itself, no need for virtualx eclass - HEADLESS=1 cmake-utils_src_make check -j1 + HEADLESS=1 cmake_build check -j1 } src_install() { - cmake-utils_src_install + cmake_src_install rm "${ED}"/usr/share/doc/${PF}/LICENSE || die pax-mark m "${ED}"/usr/bin/awesome diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild index e418a13243ae..9c4176a67a08 100644 --- a/x11-wm/awesome/awesome-9999.ebuild +++ b/x11-wm/awesome/awesome-9999.ebuild @@ -5,68 +5,75 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} luajit ) -inherit cmake desktop git-r3 lua-single pax-utils +inherit cmake desktop lua-single pax-utils + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" +else + SRC_URI="https://github.com/awesomeWM/awesome-releases/raw/master/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +fi DESCRIPTION="A dynamic floating and tiling window manager" HOMEPAGE="https://awesomewm.org/" -EGIT_REPO_URI="https://github.com/awesomeWM/${PN}.git" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="dbus doc gnome test" REQUIRED_USE="${LUA_REQUIRED_USE}" -RESTRICT="test" +RESTRICT="test" # https://bugs.gentoo.org/654084 RDEPEND="${LUA_DEPS} dev-libs/glib:2 - >=dev-libs/libxdg-basedir-1 + dev-libs/libxdg-basedir $(lua_gen_cond_dep 'dev-lua/lgi[${LUA_USEDEP}]') x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 - >=x11-libs/libxcb-1.6[xkb] - >=x11-libs/pango-1.19.3[introspection] - >=x11-libs/startup-notification-0.10_p20110426 - >=x11-libs/xcb-util-0.3.8 + x11-libs/libxcb[xkb] + x11-libs/pango[introspection] + x11-libs/startup-notification + x11-libs/xcb-util x11-libs/xcb-util-cursor - >=x11-libs/xcb-util-keysyms-0.3.4 - >=x11-libs/xcb-util-wm-0.3.8 - >=x11-libs/xcb-util-xrm-1.0 + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + x11-libs/xcb-util-xrm x11-libs/libXcursor x11-libs/libxkbcommon[X] - >=x11-libs/libX11-1.3.99.901 - dbus? ( >=sys-apps/dbus-1 ) -" + x11-libs/libX11 + dbus? ( sys-apps/dbus )" # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 # ldoc is used by invoking its executable, hence no need for LUA_SINGLE_USEDEP +# On the other hand, it means that we should explicitly depend on a version +# migrated to Lua eclasses so that during the upgrade from unslotted +# to slotted dev-lang/lua, the package manager knows to emerge migrated +# ldoc before migrated awesome. DEPEND="${RDEPEND} - >=app-text/asciidoc-8.4.5 - app-text/xmlto - dev-util/gperf - virtual/pkgconfig - media-gfx/imagemagick[png] - >=x11-base/xcb-proto-1.5 + x11-base/xcb-proto x11-base/xorg-proto - doc? ( dev-lua/ldoc ) test? ( - app-shells/zsh x11-base/xorg-server[xvfb] $(lua_gen_cond_dep ' dev-lua/busted[${LUA_USEDEP}] dev-lua/luacheck[${LUA_USEDEP}] ') - ) -" + )" +BDEPEND=" + app-text/asciidoc + media-gfx/imagemagick[png] + virtual/pkgconfig + doc? ( >=dev-lua/ldoc-1.4.6-r100 ) + test? ( app-shells/zsh )" # Skip installation of README.md by einstalldocs, which leads to broken symlink DOCS=() PATCHES=( - "${FILESDIR}/${PN}-4.0-convert-path.patch" # bug #408025 - "${FILESDIR}/${PN}-xsession.patch" # bug #408025 - "${FILESDIR}/${PN}-4.0-cflag-cleanup.patch" # bug #509658 + "${FILESDIR}"/${PN}-4.0-convert-path.patch # bug #408025 + "${FILESDIR}"/${PN}-xsession.patch # bug #408025 + "${FILESDIR}"/${PN}-4.0-cflag-cleanup.patch # bug #509658 ) src_configure() { @@ -85,7 +92,7 @@ src_configure() { src_test() { # awesome's test suite starts Xvfb by itself, no need for virtualx eclass - HEADLESS=1 cmake_src_make check -j1 + HEADLESS=1 cmake_build check -j1 } src_install() { diff --git a/x11-wm/awesome/files/awesome-4.3-fno-common.patch b/x11-wm/awesome/files/awesome-4.3-fno-common.patch new file mode 100644 index 000000000000..c75a8afd5e68 --- /dev/null +++ b/x11-wm/awesome/files/awesome-4.3-fno-common.patch @@ -0,0 +1,179 @@ +Taken from: https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0 +Author: Reiner Herrmann <reiner@reiner-h.de> +Rebased by Eddie Chapman <maracay@ehuk.net> + +--- a/common/lualib.c ++++ b/common/lualib.c +@@ -20,6 +20,8 @@ + #include "common/lualib.h" + #include "luaa.h" + ++lua_CFunction lualib_dofunction_on_error; ++ + void luaA_checkfunction(lua_State *L, int idx) + { + if(!lua_isfunction(L, idx)) +--- a/common/lualib.h ++++ b/common/lualib.h +@@ -28,7 +28,7 @@ + #include "common/util.h" + + /** Lua function to call on dofunction() error */ +-lua_CFunction lualib_dofunction_on_error; ++extern lua_CFunction lualib_dofunction_on_error; + + void luaA_checkfunction(lua_State *, int); + void luaA_checktable(lua_State *, int); +--- a/luaa.c ++++ b/luaa.c +@@ -91,6 +91,8 @@ extern const struct luaL_Reg awesome_mouse_meta[]; + extern const struct luaL_Reg awesome_root_methods[]; + extern const struct luaL_Reg awesome_root_meta[]; + ++signal_array_t global_signals; ++ + /** A call into the Lua code aborted with an error. + * + * This signal is used in the example configuration, @{05-awesomerc.md}, +--- a/luaa.h ++++ b/luaa.h +@@ -317,7 +317,7 @@ const char *luaA_find_config(xdgHandle *, const char *, luaA_config_callback *); + bool luaA_parserc(xdgHandle *, const char *); + + /** Global signals */ +-signal_array_t global_signals; ++extern signal_array_t global_signals; + + int luaA_class_index_miss_property(lua_State *, lua_object_t *); + int luaA_class_newindex_miss_property(lua_State *, lua_object_t *); +--- a/objects/button.c ++++ b/objects/button.c +@@ -35,6 +35,8 @@ + + #include "button.h" + ++lua_class_t button_class; ++ + /** Button object. + * + * @tfield int button The mouse button number, or 0 for any button. +--- a/objects/button.h ++++ b/objects/button.h +@@ -39,7 +39,7 @@ typedef struct button_t + xcb_button_t button; + } button_t; + +-lua_class_t button_class; ++extern lua_class_t button_class; + LUA_OBJECT_FUNCS(button_class, button_t, button) + ARRAY_FUNCS(button_t *, button, DO_NOTHING) + +--- a/objects/client.c ++++ b/objects/client.c +@@ -108,6 +108,8 @@ + #include <xcb/shape.h> + #include <cairo-xcb.h> + ++lua_class_t client_class; ++ + /** Client class. + * + * This table allow to add more dynamic properties to the clients. For example, +--- a/objects/client.h ++++ b/objects/client.h +@@ -200,7 +200,7 @@ struct client_t + ARRAY_FUNCS(client_t *, client, DO_NOTHING) + + /** Client class */ +-lua_class_t client_class; ++extern lua_class_t client_class; + + LUA_OBJECT_FUNCS(client_class, client_t, client) + +--- a/objects/drawin.c ++++ b/objects/drawin.c +@@ -46,6 +46,8 @@ + #include <cairo-xcb.h> + #include <xcb/shape.h> + ++lua_class_t drawin_class; ++ + /** Drawin object. + * + * @field border_width Border width. +--- a/objects/drawin.h ++++ b/objects/drawin.h +@@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *); + + void drawin_class_setup(lua_State *); + +-lua_class_t drawin_class; ++extern lua_class_t drawin_class; + + #endif + // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80 +--- a/objects/key.c ++++ b/objects/key.c +@@ -43,6 +43,8 @@ + #include <xkbcommon/xkbcommon.h> + #include <glib.h> + ++lua_class_t key_class; ++ + /** Key object. + * + * @tfield string key The key to trigger an event. +--- a/objects/key.h ++++ b/objects/key.h +@@ -36,7 +36,7 @@ typedef struct keyb_t + xcb_keycode_t keycode; + } keyb_t; + +-lua_class_t key_class; ++extern lua_class_t key_class; + LUA_OBJECT_FUNCS(key_class, keyb_t, key) + DO_ARRAY(keyb_t *, key, DO_NOTHING) + +--- a/objects/tag.c ++++ b/objects/tag.c +@@ -190,6 +190,8 @@ + #include "ewmh.h" + #include "luaa.h" + ++lua_class_t tag_class; ++ + /** + * @signal request::select + */ +--- a/objects/tag.h ++++ b/objects/tag.h +@@ -46,7 +46,7 @@ struct tag + client_array_t clients; + }; + +-lua_class_t tag_class; ++extern lua_class_t tag_class; + LUA_OBJECT_FUNCS(tag_class, tag_t, tag) + + void tag_class_setup(lua_State *); +--- a/objects/window.c ++++ b/objects/window.c +@@ -59,6 +59,7 @@ + #include "property.h" + #include "xwindow.h" + ++lua_class_t window_class; + LUA_CLASS_FUNCS(window, window_class) + + static xcb_window_t +--- a/objects/window.h ++++ b/objects/window.h +@@ -80,7 +80,7 @@ typedef struct + WINDOW_OBJECT_HEADER + } window_t; + +-lua_class_t window_class; ++extern lua_class_t window_class; + + void window_class_setup(lua_State *); + |