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 | |
| parent | 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff) | |
gentoo new year resync : 01.01.2021
Diffstat (limited to 'x11-wm')
31 files changed, 425 insertions, 1181 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 353072475c28..0dbf405fc8d6 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz 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 *); + diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest index 1ebc18642c91..b8453d9180e9 100644 --- a/x11-wm/blackbox/Manifest +++ b/x11-wm/blackbox/Manifest @@ -1,11 +1,4 @@ -AUX blackbox-0.70.1-asneeded.patch 1239 BLAKE2B bdf9c60d9060737fdd7439e7cdf80efae6950d92d23c44d5676f1700454ecefbd93535310ed875ff710682a71d16609f4c1e6a6de1b0ab29bbc8fa394c4bfaca SHA512 3cfed71b9fe9baaa490d752230687b67f5f36563425c8b4a155819a26d2842c2c4fe26d649db3b1ac791b59ba6486a93342c635e5b169d03aacb11fa3861f8b7 -AUX blackbox-0.70.1-gcc-4.3.patch 3274 BLAKE2B 0c29f4a2e97e4339cdd436c4bc18ba9ba5859825aee58ba4f749668183ca314eee22a84c741c0e3be16478a7aa1c7a5ed3f6910b763a6802a2d08e82332bcb63 SHA512 3a728a453fd8d982f25ade14d5a3225dc64e13f85070e2d7f577e76982f491c4a0f679918f5bc61faaa5956b077ead7921566b991220fb09a357659bc9b5f6e8 -AUX blackbox-0.70.1-no-LDFLAGS-pc.patch 615 BLAKE2B a0b40fc2b0ad66731387224a653485c5b6bf7b7de204bd9e58dca0b09fb1856c6acaabb0bcfced71f4b934eae5eeb54fda4fec26c64a3b98feee2c96c73ce178 SHA512 5728aad146c8d32d55d72e696c21b5d4381859ecdf38fad064e41c25c9516d91ff965137bf1f9fea0028115b7f08b7d38d5e7760837c009b91e2942598f97c87 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d -DIST blackbox-0.70.1.tar.bz2 492399 BLAKE2B d6faed388d2a1fbfbf10baf2b848f78fc5d99bc4e5fb2daf28df7ec9732d9ad5de9dfa87763cea9a954ed72b23207563dda65c92bb37ba2136e8f6e6049e0ab7 SHA512 6e8cf6fd04030a5f97ffd8dbe97aaa0f683f776e7237cdd46f2b93265cd8de665cffce5a352624a2235aa6c42628be13f98d565af765b3f06e95bff404fb0ccb -DIST blackbox-0.75.tar.gz 394605 BLAKE2B 6e1338f946fe1d211d88f060178a17c452ca2b5f700d8ab73c62e2f01fd7bc81a52d06dcb42941c133528b144a6707c6ecc4711cb10630ce2921214d0b699669 SHA512 64d1ec45f9cb143dc5e3688a490acb3e20e303c57f778656dda227215b2fa13ca2db753aebc7b1ea9605a9d66c69ff8cfdf8010dc2f37ddc4609d9d3865ec068 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa -EBUILD blackbox-0.70.1-r1.ebuild 1325 BLAKE2B 559c5f4066395f86e3e6699c48f66d54da0336768c733b4677b31a9a6027d5b8508cb4d871da392ac10385fae67e95b0bccc687f127e84eda342b5d5d112d6ca SHA512 e3f4e61fc05b16c08f6d394635adf4571456f3bc2697755d60ca8a5e965606ff9d7052075c5d7a7a0c92c0077929e7d0053ff7a4cfd4c9bf3a59149112e290df -EBUILD blackbox-0.75.ebuild 1169 BLAKE2B 91ba3978e000215681f8561a2a88eaa8f59593b696a3d69a54c854dced333ffbb3ca7da7baadf4f1998ed4b0f57b7aeed416624fdcc736ba6ec5fda85939b3d6 SHA512 63ee8335f5d3d7a46a14e79738f091d1b3e6da27331420f4d4c7a1c68b5410cd0b2dd940ed99abb5d3faa65a0cbec314ddf0aff6319286820620ad9dc267197e -EBUILD blackbox-0.76.ebuild 1162 BLAKE2B 277b053a5ec98ed842128fa6e5f2fbb274435c07899889a93445762a8c3ffe90424c4354b0f4e5a8120ff4a8b2b6f1e2d3a94294ac8e0054de1a92e9592ae5b2 SHA512 4edc1b8e2c76e0d92d90645ec975262b9f5b9dc0ae10cf71e0dc3f8b940eba4cb2115f0bbd0fbe926f8d532c7dd966a1f9a37e65e8e9dca2914abec271e9d86b +EBUILD blackbox-0.76.ebuild 1163 BLAKE2B bdd113e78a785fd76f4aa1e98e0a4903053f010901cba52d53b262902842c54851178bd16fb7928abd87962e65565e47d9af493c8216d29144fbaf6e0537259f SHA512 e7b56ba2fed6111fb004f4b87cd5f9db97081a92f6487bde567b43660376157e5d497984ff35dd59e6eb16dc06ea0ec447c5c8bafaacbac5627a54c546ef656b MISC metadata.xml 572 BLAKE2B 3b4a1463dc3c3d78c92f1b983b66f3b7eebde350932374e9cdee846566f53c7a4bbdfb97006c8fd4bad8e945b0b4f70893853b8ae3d634c3ad3b9d6bd00e7860 SHA512 e4862cf23928cd2fe0db5b6d70caee609139cc48e1e5d2f5551142165c9c839c8c34ad3e8dbf2fb2e027ce4eef759a6d985063a3e7cc0332a72708262f1c8213 diff --git a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild b/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild deleted file mode 100644 index 967d5117112d..000000000000 --- a/x11-wm/blackbox/blackbox-0.70.1-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils ltprune - -DESCRIPTION="A small, fast, full-featured window manager for X" -HOMEPAGE="https://github.com/bbidulock/blackboxwm" -SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" -IUSE="nls truetype debug" - -RDEPEND="x11-libs/libXft - x11-libs/libXt - nls? ( sys-devel/gettext ) - truetype? ( media-libs/freetype )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc-4.3.patch \ - "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-no-LDFLAGS-pc.patch - - sed -i -e "s/_XUTIL_H_/_X11&/" lib/Util.hh || die #348556 - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - - eautoreconf -} - -src_configure() { - econf \ - --sysconfdir=/etc/X11/${PN} \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable truetype xft) -} - -src_install() { - dodir /etc/X11/Sessions - echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}" - fperms a+x /etc/X11/Sessions/${PN} - - insinto /usr/share/xsessions - doins "${FILESDIR}/${PN}.desktop" - - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO - - prune_libtool_files --all -} diff --git a/x11-wm/blackbox/blackbox-0.75.ebuild b/x11-wm/blackbox/blackbox-0.75.ebuild deleted file mode 100644 index fdc90e086fc0..000000000000 --- a/x11-wm/blackbox/blackbox-0.75.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A small, fast, full-featured window manager for X" -HOMEPAGE="https://github.com/bbidulock/blackboxwm" -SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="nls truetype debug" - -RDEPEND="x11-libs/libXft - x11-libs/libXt - nls? ( >=sys-devel/gettext-0.20 ) - truetype? ( media-libs/freetype )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/blackboxwm-${PV} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --sysconfdir=/etc/X11/${PN} \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable truetype xft) -} - -src_install() { - dodir /etc/X11/Sessions - echo "/usr/bin/blackbox" > "${D}/etc/X11/Sessions/${PN}" - fperms a+x /etc/X11/Sessions/${PN} - - insinto /usr/share/xsessions - doins "${FILESDIR}/${PN}.desktop" - - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog* COMPLIANCE README* TODO - - find "${D}" -name '*.la' -delete || die -} diff --git a/x11-wm/blackbox/blackbox-0.76.ebuild b/x11-wm/blackbox/blackbox-0.76.ebuild index e516d6f34119..14ccc52ea527 100644 --- a/x11-wm/blackbox/blackbox-0.76.ebuild +++ b/x11-wm/blackbox/blackbox-0.76.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.ta LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="nls truetype debug" RDEPEND="x11-libs/libXft diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch b/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch deleted file mode 100644 index a6b1e22e62b5..000000000000 --- a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch +++ /dev/null @@ -1,49 +0,0 @@ -Fixing build with as-needed. Enabling shared libs. - -http://bugs.gentoo.org/show_bug.cgi?id=248549 - ---- src/Makefile.am -+++ src/Makefile.am -@@ -22,7 +22,7 @@ - - DEFAULT_MENU = $(pkgdatadir)/menu - DEFAULT_STYLE = $(pkgdatadir)/styles/Gray --CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ -+AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \ - -DLOCALEPATH=\"$(pkgdatadir)/nls\" \ - -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ - -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ ---- lib/Makefile.am -+++ lib/Makefile.am -@@ -62,7 +62,8 @@ - Util.hh \ - XDG.hh - --libbt_la_LIBADD = @ICONV@ @LOCALE@ -+libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@ -+libbt_la_CFLAGS = @xft_CFLAGS@ - - pkgconfigdir = $(libdir)/pkgconfig - nodist_pkgconfig_DATA = libbt.pc ---- util/Makefile.am -+++ util/Makefile.am -@@ -21,7 +21,7 @@ - # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - # DEALINGS IN THE SOFTWARE. - --CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \ -+AM_CPPFLAGS = @DEBUG@ @NLS@ \ - -I$(top_srcdir)/lib - - bin_SCRIPTS = bsetbg ---- configure.ac -+++ configure.ac -@@ -29,7 +29,7 @@ - AC_PROG_INSTALL - - dnl libbt shouldn't be shared by default (yet) --AC_DISABLE_SHARED -+dnl AC_DISABLE_SHARED - AC_PROG_LIBTOOL - AC_SUBST(LIBTOOL_DEPS) - diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch b/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch deleted file mode 100644 index 1026bd5c80ee..000000000000 --- a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc ---- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200 -+++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100 -@@ -42,8 +42,9 @@ - - #include <assert.h> - #include <math.h> --#include <stdio.h> --#include <stdlib.h> -+#include <cstdio> -+#include <cstdlib> -+#include <cstring> - - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG -diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc ---- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200 -+++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100 -@@ -28,7 +28,8 @@ - #include <X11/Xlib.h> - #include <X11/Xresource.h> - --#include <stdio.h> -+#include <cstdio> -+#include <cstring> - - - bt::Resource::Resource(void) -diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc ---- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200 -+++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100 -@@ -25,7 +25,8 @@ - #include "Util.hh" - #include "XDG.hh" - --#include <stdlib.h> -+#include <cstdlib> -+#include <algorithm> - - - // make sure directory names end with a slash -diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc ---- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200 -+++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100 -@@ -33,6 +33,8 @@ - #include <X11/Xutil.h> - #include <X11/cursorfont.h> - -+#include <cstring> -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc ---- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100 -+++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100 -@@ -34,7 +34,8 @@ - #include "blackbox.hh" - #include "../version.h" - --#include <stdio.h> -+#include <cstdio> -+#include <cstring> - - - static void showHelp(int exitval) { -diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc ---- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200 -+++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100 -@@ -45,8 +45,9 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <assert.h> --#include <ctype.h> - #include <dirent.h> -+#include <cctype> -+#include <cstring> - - - static bool running = true; -diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc ---- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200 -+++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100 -@@ -33,6 +33,8 @@ - - #include <assert.h> - -+#include <cstring> -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc ---- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100 -+++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100 -@@ -30,7 +30,9 @@ - #include <cctype> - - #include <X11/Xatom.h> --#include <stdio.h> -+#include <cstdio> -+#include <cstdlib> -+#include <cstring> - - - // ignore all X errors diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch b/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch deleted file mode 100644 index e907b588b158..000000000000 --- a/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix LDFGAS leak to .pc file: -> * QA Notice: pkg-config files with wrong LDFLAGS detected: -> * /usr/lib64/pkgconfig/libbt.pc:Libs: -L${libdir} -lbt -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -L/usr/lib -L/usr/local/lib -diff --git a/lib/libbt.pc.in b/lib/libbt.pc.in -index a2a8869..8246cb0 100644 ---- a/lib/libbt.pc.in -+++ b/lib/libbt.pc.in -@@ -7,5 +7,5 @@ Name: Blackbox Toolbox - Description: Utility class library for writing small applications - Requires: @XFT_PKGCONFIG@ - Version: @VERSION@ --Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@ -+Libs: -L${libdir} -lbt @ICONV@ @LOCALE@ - Cflags: -I${includedir}/bt diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest index 8feb8570ab36..ea387e11a4da 100644 --- a/x11-wm/jwm/Manifest +++ b/x11-wm/jwm/Manifest @@ -1,6 +1,6 @@ AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b DIST jwm-2.3.2.tar.xz 325648 BLAKE2B 93654116b0dedff4ad03c7981a9978530a1989edf4766591f083c3b10fefb128acc85e93b888a7700cb59e0bd85e1e7f7e118a22327f79ddcc1d380887764028 SHA512 34b9d482815e8b269203e1f5bf02d3e13f3186153755c9e74094e4a8af376f35b8bef4553056e83c20ba0c532e6d2606633d71272e186fe45dfed9e4ea836a27 DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc -EBUILD jwm-2.3.2.ebuild 1413 BLAKE2B 26d6d5d28a0d5264cfa8325db447291ff2debf34ec1913a07547497dc7bb7687dd314127def500b91a72951b2fc084cd381914eec0ecf3da34be5d3a35d7feb1 SHA512 0e5259114cd399fd451c3079ae6b5d242072074b8c9d25e6250a0ff3fac2a25aa996bfde284e97e07a127b9dde95181c90e77d8c7c94ad966ab0ff70ea08cc03 +EBUILD jwm-2.3.2.ebuild 1414 BLAKE2B 138b7134ca5e1a280df2f53be75f6e2929d5a105a6ee0c8f3d6936257d06759c0649cb78c2514abbdd0135b187819d4e2f3b4ebed683a82a552af6556f9f67cf SHA512 10bc3b2dd084436fc0e03b388269f905f995e358d5fe3811257154b10feb04987782f3720e3eaae15f95c80bf599a625361e50563ce2774d814d88f7b91f457a EBUILD jwm-2.3.7.ebuild 1822 BLAKE2B 9622c3e7cd73aa5d0a4c664fd9c38d96ac20319dc22e437bffc20be8613efc71f0ac4b758f24e8ebb522013610566b889d9df5fa32173a12bbd9ba4aa5cd0e16 SHA512 1830ce3972fe1454cf999633f01550a3aa412c63a1eb5039467c4d7a0dcef317da47eaa7b166ffc7fe0c9ba192d7ebab51213513df68d4f1bd2d2d89083dfe17 MISC metadata.xml 973 BLAKE2B 396dc5d70f98f46e0a2698b893b127cad189762b28a1be2272b560ea4bd174a637cb4a9a01783a69c14797605d74442d221a55d3b5ca4128f343d7e602333096 SHA512 11ce10dace193af664e4939f506adc8311db83c7caa00959ebc7b57ed3084cd1e6ca8dcd8ff141e9ddbb823c485d45696ca3653d2ba9e252401704077dd932f0 diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild index f36dc844c028..7f6d666ef0c8 100644 --- a/x11-wm/jwm/jwm-2.3.2.ebuild +++ b/x11-wm/jwm/jwm-2.3.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 hppa ppc x86" +KEYWORDS="amd64 ~hppa ppc x86" IUSE="bidi debug jpeg png truetype xinerama xpm" RDEPEND="xpm? ( x11-libs/libXpm ) diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 897744d8ab39..667cbdc9a341 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,7 +1,3 @@ -AUX muffin-4.4-gir-fixes.patch 2133 BLAKE2B 07635927daaa45e5f83c419e27efc9863b43b23591b908fbaa94c7b951c9bd6626ea8df6682f8a16cd4e18192486d84ec6d3d431e91cc20488546077c2450683 SHA512 01fe330ba2dc2bb965b5870ba22bb11c1d31d8d318457bc5a1035d49386a117e605aa0edbabd1ad2d34b6c4ab3cf347936b13d6a2f6f4dea94db8d0aac82f7fd -AUX muffin-4.4-gobject-introspection-fixes.patch 16907 BLAKE2B 02cc9f22053580f046eb9f5ea2d9ca55364330e729f7f2e765c7c7f100077e81d33f47e4097e24ac95ab901447a1c4eccf0dd09d85b5af93f91daccbfba3eb5a SHA512 181007af23aa61c0d9422a6c7fe1cdc7cc4ee5e506d789ffc12b5a799171a34aa4eaba995c00cf04512d81549d6e675ec8259fc7440a21d97c19a2148a9e7a46 -DIST muffin-4.4.3.tar.gz 5194631 BLAKE2B 10221560daed72f776f6543b8d044442fe8f501ec42cc2f6ce15f0d00f26fe74d3dbe763145c48ecf18d0f821277753a71a607e8c705e6dc624c16d7f17b9785 SHA512 a11418f9ab6f6dee0f4df45f06ec6df5666490effec7468fd4c1e9cb6b537448f1aaf0fe743b208194488b86de0b269ffdc442ee677b45940761bbdfa4fafed3 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5 -EBUILD muffin-4.4.3.ebuild 2129 BLAKE2B 2666ee555fdd226e7ca873369b8d698241ff9660734575a49a6f04fe6222f97af97b11adb3ab20893da2d0979ebb08d3cd407d2dc89f0e8a8b224e29ff8097e3 SHA512 d3f3c37d8788824f1a2ad7e88d636b8067340ccf254a46216981b62752740c5ed6fdf9dd3042ed4db30ce27a71ee5caada99ec5ae2fbbb65105c047bcc19f810 -EBUILD muffin-4.6.3.ebuild 2229 BLAKE2B b46d8fc2d6f01e567cfe275b098cb912763156a3cee02585fc6aefdfa0d66e2576ca1aef6e24212410895770c4ecbd7bb35adfb2bfdc93f0fbcfcc166d12166d SHA512 9ca12c33d48a135e31996c050507b0fecfbce32fd742306c66658caab611e13f44b242e67a8a51ec5b78bc3bc2f58cf06e19de546226b66a474f5326579d3489 +EBUILD muffin-4.6.3.ebuild 2228 BLAKE2B 52fe08aab371bee6718c09a155b11b5e28e8bf1ea30f257b869aac12e78622039f5fac45dde5b60c947d99ff03eb6a58a1561471ef7be31ce7aa7a591afaeaef SHA512 132480d8432ea77c23c2b97dc8f7febe4ce93f4b90e166642999700b65265e92f7c926752cfd0e708823f5e1221c50335707d79aa273eca4ca4fd5c1a9d6c847 MISC metadata.xml 455 BLAKE2B d4584f37c17ed7f43e3200c5b4cf5db9d73634ec2634575d0667a2b6de278f746839cb52b037f9239aa1a570a056fa6ff3990bd26a1cde3975a391ef44360660 SHA512 e21ad4e3cab168c13fd6b34335e1d615a548160f78c558655def493f1632ac6cac170892b781a020f8e6a877526d320051154aa0cfcf986d3e76dcc89e61bf21 diff --git a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch deleted file mode 100644 index 46613194be15..000000000000 --- a/x11-wm/muffin/files/muffin-4.4-gir-fixes.patch +++ /dev/null @@ -1,65 +0,0 @@ -From eaacd664855b03517a0406024b18eb9f5a597a9d Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Tue, 14 Jan 2020 12:12:13 -0500 -Subject: [PATCH] display.c: Remove meta_display_get_atom() - it is unused, and - breaks the build when g-ir-scanner (with gobject-introspection ~1.62) - -ref: -https://gitlab.gnome.org/GNOME/mutter/commit/edeac1de09473809debc4d0b8c416f79dde8f500 ---- - src/core/display.c | 14 -------------- - src/meta/display.h | 9 --------- - 2 files changed, 23 deletions(-) - -diff --git a/src/core/display.c b/src/core/display.c -index 6c186e87..6baf2cc2 100644 ---- a/src/core/display.c -+++ b/src/core/display.c -@@ -5640,20 +5640,6 @@ meta_display_get_shape_event_base (MetaDisplay *display) - } - #endif - --/** -- * meta_display_get_atom: (skip) -- * -- * Gets up an X atom that Muffin prefetched at startup. -- * -- * Return value: the X atom corresponding to the given atom enumeration -- */ --Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom) --{ -- Atom *atoms = & display->atom_WM_PROTOCOLS; -- -- return atoms[meta_atom - 1]; --} -- - /** - * meta_display_get_leader_window: - * @display: a #MetaDisplay -diff --git a/src/meta/display.h b/src/meta/display.h -index 3f82c32b..434296f1 100644 ---- a/src/meta/display.h -+++ b/src/meta/display.h -@@ -56,14 +56,6 @@ GType meta_display_get_type (void) G_GNUC_CONST; - - #define meta_XFree(p) do { if ((p)) XFree ((p)); } while (0) - --typedef enum --{ -- META_ATOM_FIRST = 0, --#define item(x) META_ATOM_##x, --#include "atomnames.h" --#undef item --}MetaAtom; -- - typedef enum { - META_LIST_DEFAULT = 0, /* normal windows */ - META_LIST_INCLUDE_OVERRIDE_REDIRECT = 1 << 0, /* normal and O-R */ -@@ -90,7 +82,6 @@ gboolean meta_display_xwindow_is_a_no_focus_window (MetaDisplay *display, - - int meta_display_get_damage_event_base (MetaDisplay *display); - int meta_display_get_shape_event_base (MetaDisplay *display); --Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom); - - gboolean meta_display_xserver_time_is_before (MetaDisplay *display, - guint32 time1, diff --git a/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch b/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch deleted file mode 100644 index 053319d5c42f..000000000000 --- a/x11-wm/muffin/files/muffin-4.4-gobject-introspection-fixes.patch +++ /dev/null @@ -1,529 +0,0 @@ -From a452ec976f22b1ffba51e934f2d771d0680f6cca Mon Sep 17 00:00:00 2001 -From: Michael Webster <miketwebster@gmail.com> -Date: Tue, 14 Jan 2020 11:29:54 -0500 -Subject: [PATCH] muffin: Use glib for gettext - -This was also breaking the build under gobject-introspection ~1.62 - -ref: -https://gitlab.gnome.org/GNOME/mutter/commit/6ceddd626a20f5c3d92ddd9318338626f4be4a4d -https://gitlab.gnome.org/GNOME/mutter/commit/5298a834efef5eeacaea24a9752468277782cb04 ---- - ChangeLog | 2 +- - src/Makefile.am | 3 ++- - src/compositor/compositor.c | 1 + - src/compositor/meta-background.c | 1 + - src/compositor/plugins/default.c | 8 +++---- - src/core/core.c | 1 + - src/core/delete.c | 2 +- - src/core/display.c | 4 ++-- - src/core/keybindings.c | 2 +- - src/core/main.c | 2 +- - src/core/muffin.c | 1 + - src/core/prefs.c | 2 +- - src/core/screen.c | 2 +- - src/core/session.c | 1 + - src/core/stack.c | 2 +- - src/core/util-private.h | 36 ++++++++++++++++++++++++++++++++ - src/core/util.c | 2 +- - src/core/window-props.c | 1 + - src/core/window.c | 2 +- - src/core/xprops.c | 2 +- - src/meta/common.h | 2 +- - src/meta/util.h | 5 ----- - src/ui/frames.c | 24 ++++++++++----------- - src/ui/menu.c | 2 +- - src/ui/metaaccellabel.c | 2 +- - src/ui/resizepopup.c | 2 +- - src/ui/theme-parser.c | 2 +- - src/ui/theme.c | 2 +- - 28 files changed, 77 insertions(+), 41 deletions(-) - create mode 100644 src/core/util-private.h - -diff --git a/ChangeLog b/ChangeLog -index e68822de..7123e9cf 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -13015,7 +13015,7 @@ Mon Jun 3 15:12:11 2002 HideToshi Tajima <hidetoshi.tajima@sun.com> - - Patch from Erwann Chenede for raise_or_lower keybinding - -- * src/display.c, src/common.h: POINT_IN_RECT moved to a common -+ * src/display.c, src/common.h: META_POINT_IN_RECT moved to a common - location, removed from here - (meta_rectangle_intersect): move here and make it public - -diff --git a/src/Makefile.am b/src/Makefile.am -index cbb5b3af..9cb3af14 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -142,6 +142,7 @@ libmuffin_la_SOURCES = \ - core/stack-tracker.h \ - core/util.c \ - meta/util.h \ -+ meta/util-private.h \ - core/window-props.c \ - core/window-props.h \ - core/window.c \ -@@ -281,7 +282,7 @@ Meta-$(api_version).gir: libmuffin.la - muffin-enum-types.h \ - $(libmuffininclude_base_headers) \ - $(filter %.c,$(libmuffin_la_SOURCES)) --@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error -+@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error --identifier-prefix=Meta - - endif - -diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c -index 0556f743..a8bc6db8 100644 ---- a/src/compositor/compositor.c -+++ b/src/compositor/compositor.c -@@ -74,6 +74,7 @@ - #include "meta-background-actor-private.h" - #include "window-private.h" /* to check window->hidden */ - #include "display-private.h" /* for meta_display_lookup_x_window() */ -+#include "util-private.h" - #include <X11/extensions/shape.h> - #include <X11/extensions/Xcomposite.h> - #include "meta-sync-ring.h" -diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c -index 95917429..33bce084 100644 ---- a/src/compositor/meta-background.c -+++ b/src/compositor/meta-background.c -@@ -28,6 +28,7 @@ - #include <clutter/clutter.h> - #include "cogl-utils.h" - #include <meta/errors.h> -+// #include "util-private.h" - #include "meta-background-actor-private.h" - - struct _MetaBackgroundPrivate -diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c -index 1d223465..f69563bc 100644 ---- a/src/compositor/plugins/default.c -+++ b/src/compositor/plugins/default.c -@@ -20,14 +20,12 @@ - * Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA - * 02110-1335, USA. - */ -- -+#include <config.h> - #include <meta/meta-plugin.h> - #include <meta/window.h> - --#include <libintl.h> --#define _(x) dgettext (GETTEXT_PACKAGE, x) --#define N_(x) x -- -+#include <meta/util.h> -+#include <glib/gi18n-lib.h> - #include <clutter/clutter.h> - #include <gmodule.h> - #include <string.h> -diff --git a/src/core/core.c b/src/core/core.c -index 43962825..77228aac 100644 ---- a/src/core/core.c -+++ b/src/core/core.c -@@ -29,6 +29,7 @@ - #include "workspace-private.h" - #include <meta/prefs.h> - #include <meta/errors.h> -+#include "util-private.h" - - /* Looks up the MetaWindow representing the frame of the given X window. - * Used as a helper function by a bunch of the functions below. -diff --git a/src/core/delete.c b/src/core/delete.c -index 5c1e4bb6..5ef767c2 100644 ---- a/src/core/delete.c -+++ b/src/core/delete.c -@@ -25,7 +25,7 @@ - #define _XOPEN_SOURCE /* for kill() */ - - #include <config.h> --#include <meta/util.h> -+#include "util-private.h" - #include "window-private.h" - #include <meta/errors.h> - #include <meta/workspace.h> -diff --git a/src/core/display.c b/src/core/display.c -index 691a8ed1..6c186e87 100644 ---- a/src/core/display.c -+++ b/src/core/display.c -@@ -1568,8 +1568,8 @@ window_raise_with_delay_callback (void *data) - meta_error_trap_pop (window->display); - - point_in_window = -- (window->frame && POINT_IN_RECT (root_x, root_y, window->frame->rect)) || -- (window->frame == NULL && POINT_IN_RECT (root_x, root_y, window->rect)); -+ (window->frame && META_POINT_IN_RECT (root_x, root_y, window->frame->rect)) || -+ (window->frame == NULL && META_POINT_IN_RECT (root_x, root_y, window->rect)); - if (same_screen && point_in_window) - meta_window_raise (window); - #ifdef WITH_VERBOSE_MODE -diff --git a/src/core/keybindings.c b/src/core/keybindings.c -index 6b1c1cdf..50658880 100644 ---- a/src/core/keybindings.c -+++ b/src/core/keybindings.c -@@ -44,7 +44,7 @@ - #include "frame.h" - #include "place.h" - #include <meta/prefs.h> --#include <meta/util.h> -+#include "util-private.h" - - #include <X11/keysym.h> - #include <string.h> -diff --git a/src/core/main.c b/src/core/main.c -index 71c78526..a16bee1e 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -49,7 +49,7 @@ - - #include <config.h> - #include <meta/main.h> --#include <meta/util.h> -+#include "util-private.h" - #include "display-private.h" - #include <meta/errors.h> - #include "ui.h" -diff --git a/src/core/muffin.c b/src/core/muffin.c -index 26d98f02..8665797a 100644 ---- a/src/core/muffin.c -+++ b/src/core/muffin.c -@@ -26,6 +26,7 @@ - #include <meta/main.h> - #include <meta/util.h> - #include "meta-plugin-manager.h" -+#include <glib/gi18n-lib.h> - - #include <glib.h> - -diff --git a/src/core/prefs.c b/src/core/prefs.c -index d146902d..d92826a1 100644 ---- a/src/core/prefs.c -+++ b/src/core/prefs.c -@@ -33,7 +33,7 @@ - #include <config.h> - #include <meta/prefs.h> - #include "ui.h" --#include <meta/util.h> -+#include "util-private.h" - #include "meta-plugin-manager.h" - #include <glib.h> - #include <gio/gio.h> -diff --git a/src/core/screen.c b/src/core/screen.c -index 8ba26a06..cdcbcab9 100644 ---- a/src/core/screen.c -+++ b/src/core/screen.c -@@ -33,7 +33,7 @@ - #include <config.h> - #include "screen-private.h" - #include <meta/main.h> --#include <meta/util.h> -+#include "util-private.h" - #include <meta/errors.h> - #include "window-private.h" - #include "frame.h" -diff --git a/src/core/session.c b/src/core/session.c -index 8e0ded3a..f45e1a63 100644 ---- a/src/core/session.c -+++ b/src/core/session.c -@@ -25,6 +25,7 @@ - - #include <config.h> - -+#include "util-private.h" - #include "session.h" - #include <X11/Xatom.h> - -diff --git a/src/core/stack.c b/src/core/stack.c -index 7404a59e..49ff24b4 100644 ---- a/src/core/stack.c -+++ b/src/core/stack.c -@@ -1424,7 +1424,7 @@ window_contains_point (MetaWindow *window, - - meta_window_get_outer_rect (window, &rect); - -- return POINT_IN_RECT (root_x, root_y, rect); -+ return META_POINT_IN_RECT (root_x, root_y, rect); - } - - static MetaWindow* -diff --git a/src/core/util-private.h b/src/core/util-private.h -new file mode 100644 -index 00000000..8e51b42f ---- /dev/null -+++ b/src/core/util-private.h -@@ -0,0 +1,36 @@ -+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ -+ -+/* Mutter utilities */ -+ -+/* -+ * Copyright (C) 2001 Havoc Pennington -+ * Copyright (C) 2005 Elijah Newren -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ * 02111-1307, USA. -+ */ -+ -+#ifndef META_UTIL_PRIVATE_H -+#define META_UTIL_PRIVATE_H -+ -+#include <meta/util.h> -+#include <glib/gi18n-lib.h> -+ -+void meta_set_verbose (gboolean setting); -+void meta_set_debugging (gboolean setting); -+void meta_set_syncing (gboolean setting); -+void meta_set_replace_current_wm (gboolean setting); -+ -+#endif -diff --git a/src/core/util.c b/src/core/util.c -index c1d84520..896c7195 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -35,7 +35,7 @@ - - #include <config.h> - #include <meta/common.h> --#include <meta/util.h> -+#include "util-private.h" - #include <meta/main.h> - - #include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */ -diff --git a/src/core/window-props.c b/src/core/window-props.c -index 911b9a10..e5306838 100644 ---- a/src/core/window-props.c -+++ b/src/core/window-props.c -@@ -50,6 +50,7 @@ - #include <X11/Xatom.h> - #include <unistd.h> - #include <string.h> -+#include "util-private.h" - #ifndef HOST_NAME_MAX - /* Solaris headers apparently don't define this so do so manually; #326745 */ - #define HOST_NAME_MAX 255 -diff --git a/src/core/window.c b/src/core/window.c -index 500eaac0..1a080887 100644 ---- a/src/core/window.c -+++ b/src/core/window.c -@@ -32,7 +32,7 @@ - #include "window-private.h" - #include "boxes-private.h" - #include "edge-resistance.h" --#include <meta/util.h> -+#include "util-private.h" - #include "frame.h" - #include <meta/errors.h> - #include "workspace-private.h" -diff --git a/src/core/xprops.c b/src/core/xprops.c -index 01df70a6..bcf11f21 100644 ---- a/src/core/xprops.c -+++ b/src/core/xprops.c -@@ -83,7 +83,7 @@ from The Open Group. - #include <config.h> - #include "xprops.h" - #include <meta/errors.h> --#include <meta/util.h> -+#include "util-private.h" - #include "async-getprop.h" - #include "ui.h" - #include "muffin-Xatomtype.h" -diff --git a/src/meta/common.h b/src/meta/common.h -index 46bf3461..55426589 100644 ---- a/src/meta/common.h -+++ b/src/meta/common.h -@@ -398,7 +398,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self); - - /************************************************************/ - --#define POINT_IN_RECT(xcoord, ycoord, rect) \ -+#define META_POINT_IN_RECT(xcoord, ycoord, rect) \ - ((xcoord) >= (rect).x && \ - (xcoord) < ((rect).x + (rect).width) && \ - (ycoord) >= (rect).y && \ -diff --git a/src/meta/util.h b/src/meta/util.h -index cce79ed5..ea10f16a 100644 ---- a/src/meta/util.h -+++ b/src/meta/util.h -@@ -31,12 +31,8 @@ - #include <meta/common.h> - - gboolean meta_is_verbose (void); --void meta_set_verbose (gboolean setting); - gboolean meta_is_debugging (void); --void meta_set_debugging (gboolean setting); - gboolean meta_is_syncing (void); --void meta_set_syncing (gboolean setting); --void meta_set_replace_current_wm (gboolean setting); - - void meta_debug_spew_real (const char *format, - ...) G_GNUC_PRINTF (1, 2); -@@ -97,7 +93,6 @@ const char* meta_gravity_to_string (int gravity); - - #include <libintl.h> - #define _(x) dgettext (GETTEXT_PACKAGE, x) --#define N_(x) x - - char* meta_g_utf8_strndup (const gchar *src, gsize n); - -diff --git a/src/ui/frames.c b/src/ui/frames.c -index c1ae7a1d..be075134 100644 ---- a/src/ui/frames.c -+++ b/src/ui/frames.c -@@ -2495,16 +2495,16 @@ get_control (MetaFrames *frames, - meta_frames_calc_geometry (frames, frame, &fgeom); - get_client_rect (&fgeom, fgeom.width, fgeom.height, &client); - -- if (POINT_IN_RECT (x, y, client)) -+ if (META_POINT_IN_RECT (x, y, client)) - return META_FRAME_CONTROL_CLIENT_AREA; - -- if (POINT_IN_RECT (x, y, fgeom.close_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.close_rect.clickable)) - return META_FRAME_CONTROL_DELETE; - -- if (POINT_IN_RECT (x, y, fgeom.min_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.min_rect.clickable)) - return META_FRAME_CONTROL_MINIMIZE; - -- if (POINT_IN_RECT (x, y, fgeom.menu_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.menu_rect.clickable)) - return META_FRAME_CONTROL_MENU; - - meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -@@ -2521,7 +2521,7 @@ get_control (MetaFrames *frames, - has_right = (flags & META_FRAME_ALLOWS_RIGHT_RESIZE) != 0; - has_bottom = (flags & META_FRAME_ALLOWS_BOTTOM_RESIZE) != 0; - -- if (POINT_IN_RECT (x, y, fgeom.title_rect)) -+ if (META_POINT_IN_RECT (x, y, fgeom.title_rect)) - { - if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize) - return META_FRAME_CONTROL_RESIZE_N; -@@ -2529,7 +2529,7 @@ get_control (MetaFrames *frames, - return META_FRAME_CONTROL_TITLE; - } - -- if (POINT_IN_RECT (x, y, fgeom.max_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.max_rect.clickable)) - { - if (flags & META_FRAME_MAXIMIZED && - (META_WINDOW_TILED_TOP (window) || -@@ -2542,32 +2542,32 @@ get_control (MetaFrames *frames, - return META_FRAME_CONTROL_MAXIMIZE; - } - -- if (POINT_IN_RECT (x, y, fgeom.shade_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.shade_rect.clickable)) - { - return META_FRAME_CONTROL_SHADE; - } - -- if (POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.unshade_rect.clickable)) - { - return META_FRAME_CONTROL_UNSHADE; - } - -- if (POINT_IN_RECT (x, y, fgeom.above_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.above_rect.clickable)) - { - return META_FRAME_CONTROL_ABOVE; - } - -- if (POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.unabove_rect.clickable)) - { - return META_FRAME_CONTROL_UNABOVE; - } - -- if (POINT_IN_RECT (x, y, fgeom.stick_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.stick_rect.clickable)) - { - return META_FRAME_CONTROL_STICK; - } - -- if (POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable)) -+ if (META_POINT_IN_RECT (x, y, fgeom.unstick_rect.clickable)) - { - return META_FRAME_CONTROL_UNSTICK; - } -diff --git a/src/ui/menu.c b/src/ui/menu.c -index c0b94a1e..5d1155e7 100644 ---- a/src/ui/menu.c -+++ b/src/ui/menu.c -@@ -28,7 +28,7 @@ - #include <string.h> - #include "menu.h" - #include <meta/main.h> --#include <meta/util.h> -+#include "util-private.h" - #include "core.h" - #include "metaaccellabel.h" - #include "ui.h" -diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c -index fd5c6e6c..097b45b4 100644 ---- a/src/ui/metaaccellabel.c -+++ b/src/ui/metaaccellabel.c -@@ -35,7 +35,7 @@ - #include "metaaccellabel.h" - #include <gtk/gtk.h> - #include <string.h> --#include <meta/util.h> -+#include "util-private.h" - - static void meta_accel_label_destroy (GtkWidget *object); - static void meta_accel_label_finalize (GObject *object); -diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c -index 18c395d2..56742fd7 100644 ---- a/src/ui/resizepopup.c -+++ b/src/ui/resizepopup.c -@@ -23,7 +23,7 @@ - - #include <config.h> - #include "resizepopup.h" --#include <meta/util.h> -+#include "util-private.h" - #include <gtk/gtk.h> - #include <gdk/gdkx.h> - -diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c -index 0151f362..628bf73e 100644 ---- a/src/ui/theme-parser.c -+++ b/src/ui/theme-parser.c -@@ -23,7 +23,7 @@ - - #include <config.h> - #include "theme-private.h" --#include <meta/util.h> -+#include "util-private.h" - #include <meta/prefs.h> - #include <string.h> - #include <stdlib.h> -diff --git a/src/ui/theme.c b/src/ui/theme.c -index cb717bbb..99ea519c 100644 ---- a/src/ui/theme.c -+++ b/src/ui/theme.c -@@ -55,7 +55,7 @@ - - #include <config.h> - #include "theme-private.h" --#include <meta/util.h> -+#include "util-private.h" - #include <meta/gradient.h> - #include <meta/prefs.h> - #include <gtk/gtk.h> diff --git a/x11-wm/muffin/muffin-4.4.3.ebuild b/x11-wm/muffin/muffin-4.4.3.ebuild deleted file mode 100644 index b77326d58632..000000000000 --- a/x11-wm/muffin/muffin-4.4.3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils gnome2 - -DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/" -SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+introspection test xinerama" -KEYWORDS="~amd64 ~x86" - -RESTRICT="test" - -COMMON_DEPEND=" - >=x11-libs/pango-1.2[X,introspection?] - >=x11-libs/cairo-1.14:=[X] - x11-libs/gdk-pixbuf:2[introspection?] - >=x11-libs/gtk+-3.9.12:3[X,introspection?] - >=dev-libs/glib-2.37.3:2[dbus] - >=dev-libs/json-glib-1.0 - >=gnome-extra/cinnamon-desktop-4.4:0= - >=media-libs/libcanberra-0.26[gtk3] - >=x11-libs/libXcomposite-0.3 - >=x11-libs/startup-notification-0.7:= - - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libxkbcommon - virtual/opengl - - gnome-extra/zenity - - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - xinerama? ( x11-libs/libXinerama ) -" -# needs gtk-doc, not just -am, for gtk-doc.make -DEPEND="${COMMON_DEPEND} - ${PYTHON_DEPS} - dev-util/glib-utils - >=app-text/gnome-doc-utils-0.8 - sys-devel/gettext - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - virtual/pkgconfig - x11-base/xorg-proto - test? ( app-text/docbook-xml-dtd:4.5 ) -" -RDEPEND="${COMMON_DEPEND} - !x11-misc/expocity -" - -src_prepare() { - # Fixes from 4.6.0. - eapply "${FILESDIR}"/muffin-4.4-{gobject-introspection,gir}-fixes.patch - - eautoreconf - gnome2_src_prepare -} - -# Wayland is not supported upstream. Disabled by default in 4.6.0. -src_configure() { - DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* *.txt doc/*.txt" - gnome2_src_configure \ - --disable-static \ - --disable-wayland-egl-server \ - --enable-shape \ - --enable-sm \ - --enable-startup-notification \ - --enable-xsync \ - --enable-verbose-mode \ - --with-libcanberra \ - $(use_enable introspection) \ - $(use_enable xinerama) -} diff --git a/x11-wm/muffin/muffin-4.6.3.ebuild b/x11-wm/muffin/muffin-4.6.3.ebuild index 773dbebcd2d5..f6297dbb2262 100644 --- a/x11-wm/muffin/muffin-4.6.3.ebuild +++ b/x11-wm/muffin/muffin-4.6.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-2+" SLOT="0" IUSE="+introspection test xinerama" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" RESTRICT="test" RDEPEND=" diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest index ac7826a7eb6d..a637bb52efec 100644 --- a/x11-wm/openbox/Manifest +++ b/x11-wm/openbox/Manifest @@ -2,6 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e -EBUILD openbox-3.6.1-r3.ebuild 2730 BLAKE2B b1be9672b17b2567551398ff87b21d4ae763f8ca4d69b763a791ed734345ca6785d0c478f0d521bfa16cbb0b5abc656226f28b786db8650e7f630567bc8e7771 SHA512 5cbe020ce5824fb79a7a82be4bccd16d983c21d49f7df9df7d689891416d5519fc4a36472087ff7c6e11f337633296cefe3ce9049d143e584cdb4927e5798e20 +EBUILD openbox-3.6.1-r3.ebuild 2731 BLAKE2B 491e58ef431fd7c027737550c589cd73a04e08308c333247eb00765ffd3b7077edd9178f17d1fafcd4d1d09778e62eb77172cc497c6379e83b27968b1279e2e1 SHA512 a7949e5c1eb82556e70eb69be5cdee5c7543b3f05ab3cf24e546a2094a6855530d469e167f4c103378f5fcd1a2f0f497a50785c58d7b7491dc701eccd9026ae1 EBUILD openbox-9999.ebuild 2738 BLAKE2B 49e801f54ac09734cd974cd39ecb8314252b17d62642c4b83fb93846f59386e655cd8b93fef65d090e7eee3ce2c2bef41af07fdb5b6f44e802e2e7171dfbd880 SHA512 b809f5e7a3e127a863d911cf757baa08a6c2879bc015444d6a1695beaa0c4e6384e8654ba2207a47b15a4d12da9a1ba166d0e72242149801acce0d813acb9ccb MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207 diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild index 55a0b32061e7..8e5bdf75418b 100644 --- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild +++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://git.openbox.org/dana/openbox" else SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-linux" fi SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest index 8f34c0bc2674..8aa0095377ec 100644 --- a/x11-wm/sawfish/Manifest +++ b/x11-wm/sawfish/Manifest @@ -3,4 +3,4 @@ AUX sawfish-1.12.0-desktop.patch 839 BLAKE2B cbc68895b979d5d0eb794f95a6e002f4807 AUX sawfish-1.12.0-fno-common.patch 987 BLAKE2B 9f5a94a226453b831efab89b46dc0022585712af26153ba87187da629ffb662f89eeee9529322ab810809fa352bba0eaca314e1cfef507d8735086075b9c29bd SHA512 89d2f547b6fe100815763c4b1ab9fcb2cb67613c35bdda6de7d6be297c2871909c70c6d352debea04fa4627aca6e195ea44a1d402a4cd01137d80ff96b5040be DIST sawfish_1.12.90.tar.xz 2602372 BLAKE2B 180d3ed1081fffa0fe6c60c15b96a4b530be1349e162d0b6e7553e753e0462aea89caf7bfe379b1993f883e544e27bb553d259d0348fcceb53619dc54536cc47 SHA512 444cdc21b368d9ffb89e1ccd0377d9ce9d9b42f9bd93aa85ca29763781f90cb393a0c9c8da47ff0a161bf5e3881e6d6895a7c5749761ccc7b4b5a1ed8438c93d EBUILD sawfish-1.12.90-r1.ebuild 2240 BLAKE2B 3db5195071521570c91ccf44ab00d39989692861f193530c9b7242610d3ff98beec964105df4b47155adad1b13d972ca68189076ba901b177ec163ea162b0c27 SHA512 d5bac3996e9bfa0cac5b4c295036d9ed76b5a195b6030a457915b43da2e6cbaa1edbc9e84f8106318575c0083bf6e68f076e8fc017a217075c65a8a8c14c6f24 -MISC metadata.xml 357 BLAKE2B 7ff08550d41c65ecf933abf4a3c1932a06f9462016ea8cff09145c713e7017dd68dd5e6473845eac654e0ae1fdded17e6b92b36a4f97db539524dfb67b5aec4f SHA512 ab28ed64d52513cf76bea32b2f289dedab2420e91592ba31d2917efc2d7868a4bf949067562594254a601e62885cf530d7ec00404cf62dd4705b7ac1a892ba9b +MISC metadata.xml 435 BLAKE2B de60328aaf226209271f875971dc4061e350c1bb882980522aa5335addcb0cd8721624bdd8a378927212db79056307795368becbafa6024486e95a87fb267b9f SHA512 ecc1b031b97b12870bd327a10d2b1247e2d3a739cc93e23ce7833d88ebaf0c287de650eb903a2133bd3c9bf0520388216635e551303eb68909ca26827f478044 diff --git a/x11-wm/sawfish/metadata.xml b/x11-wm/sawfish/metadata.xml index d305b1f6a31c..8b8f008e788f 100644 --- a/x11-wm/sawfish/metadata.xml +++ b/x11-wm/sawfish/metadata.xml @@ -2,6 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> +<!-- uncomment the following block when there is a new primary maintainer <maintainer type="project"> <email>gnu-emacs@gentoo.org</email> <description> @@ -9,4 +10,5 @@ Do not assign for anything else. </description> </maintainer> +--> </pkgmetadata> diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest index 5510cd94591c..ca1461bd7467 100644 --- a/x11-wm/twm/Manifest +++ b/x11-wm/twm/Manifest @@ -1,3 +1,3 @@ DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d -EBUILD twm-1.0.11.ebuild 568 BLAKE2B 53b3ecdbcaf1164d984527b1a23e8ed9e3eb417bba0edcdbd8de2a679d6edcceb58f7613986edea76ced23cea596571bbcf5600972e3e79b1b0e47d8cd7a4eb4 SHA512 800b025ebcc9524492e83a9ccd880e5ae2e3b2413b743707cc37b7791b52483e354fe5d40468d2d466d8c2ad40cad6558e867372726a34143437145ebbacd147 +EBUILD twm-1.0.11.ebuild 569 BLAKE2B e40b6420780c063098107e9ff78324dcfe1f099f29f183fe3f8bf306b487c8259fc2c7d22e31b7ca0020fd6c128a52ee40aec0632fff4964c88d1ad628e58283 SHA512 96b7be5a456f6736cce5e4b6009f505502a233fb54ff9e1903d3e35cbaff4301c57d5cf2f5e1f397adfd082f93ac0b36a251751e45b6063c508e8e25156bdb28 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild index e53ee26c3372..a103fd8d83c4 100644 --- a/x11-wm/twm/twm-1.0.11.ebuild +++ b/x11-wm/twm/twm-1.0.11.ebuild @@ -9,7 +9,7 @@ inherit xorg-3 DESCRIPTION="X.Org Tab Window Manager" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" COMMON_DEPEND=" diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 547748a0d627..8988f4158366 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -4,7 +4,7 @@ AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922 DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2 DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf18db1f28fb4cb290d86db1ded9ffdab0cf51b451e28475bc51ee2735cb71c7fd2b01fa7472f5f0f4f1a1e00e1509339 SHA512 ca3ddc863f5b5b782e90f38c0019fe14d1109d6b11d0a3d5d6c728ddc1817747eea92e22e36933d445e72c70661e039ee56efa70f2654657c8980269fd5b4584 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 -EBUILD windowmaker-0.95.8-r1.ebuild 3128 BLAKE2B 0a74d0b9ece181745ee2ca58bcd683991f061c5f31287b7d1e6c01eb560f809ab09b4d53312c38d2541a9a35394a0ac76cdea0f759ecd902c9e0f5bd688534ba SHA512 5acf9dfc7ecc4d1f53ad81357a3be4e0f0f52059a2777e205edbcc499a27103dab6836be3ea039c08d31dce04669ba8fb9d1fcf3ecec92d31b3f238d79a0401f +EBUILD windowmaker-0.95.8-r1.ebuild 3129 BLAKE2B d13ae66f5e57a63da8634571057afe5f0a56aa15904a20571219101767cca8e6d1a9ba376d08157d42ae497380df6d48b81f5018f1ded3b9a59404f58eb90627 SHA512 c478f446122ce9e798675be0c11f6897444fa6337759d92903429e3cf9c700ae474f5cfc85e7154acc6c9f7993cb857d79f098a842f5d8721f08bc75c63da977 EBUILD windowmaker-0.95.9-r1.ebuild 3090 BLAKE2B 370be7bc17a2577ad8ee1e30b2d9883bfdb3ef5da51b7255a1e53af9db9a0ddf91434dca33f0f656ea132ea4d6b8c9627c629cbcfac03ed3e3be4779d96d1bd3 SHA512 4ef74f85931d2d2ea4b217bb05ee2d4d4a8967806d0a5724d07edfbcb1ed1df1cfe10788bbf517fe2e9e9fc3796febc405276a33676d0b5e4b221f19f7ac8bb5 EBUILD windowmaker-9999.ebuild 2906 BLAKE2B 2c34ae03201ba0ffce81ec94b337536aee7ffc6a165ca0c49068d2389fd12a20c54c46d28810798ab523c3b2843e90fadd0212e5f7a7592f51d0c910eb56ca60 SHA512 f7db50510fb3b9f6fc34f1bb84cc00a2928cf9af9fd7aad88aa4dab211f5586395f84c9c75ddde80def0ac0d4ad521c29850f81e948e2442f169ea683d5ae771 MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild index 940075ca05ae..8e1a62e09497 100644 --- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz SLOT="0" LICENSE="GPL-2" IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="~alpha amd64 arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" DEPEND="media-libs/fontconfig >=x11-libs/libXft-2.1.0 diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index 2c14aec15a06..422d68181ddc 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -6,7 +6,9 @@ AUX xpra-4.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681 DIST xpra-4.0.4.tar.xz 2792512 BLAKE2B e16c47e82cf9f8712521c8f9c436b7bb819d9469fc0135ade1f2c9fc6f2a8a0fecf417caae87a1eca9c4b6daec1a82add5d6547208caee1a1d681ebc7b3d3d3b SHA512 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c +DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193 SHA512 d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92 EBUILD xpra-3.0.2-r1.ebuild 3989 BLAKE2B 32811ece71f24899d5a133946044ba54587fa2817da62205211fb4bf67184b44c51297f7c4c44853d39aee3709d1c75d07cb8376c5dcfbc3981b7e77e49dd2ce SHA512 ceb14272f61547d15def0d22c2440748ea144a832d89e7e9086d0dde8b394dc29041945c32a9a38fdca14d53a3f0545e6b74086c1ba60c771135dfcf4ecf3e9a EBUILD xpra-3.0.5-r2.ebuild 3843 BLAKE2B 9be5685148f89315a8b715034a00a4c83947ce561ea08cf43af02352aa1c6f057fe71aa4000500421a41edac3a6f190179de1d325c50e92c9a19c3752db49ce3 SHA512 15ca9c77547f7e0c0388e3217aa908e000b8a2b3c0360ec32c54c8a2d2a31344f6940c9496b66624c96a2e4328ca0fc281291452f61b6cf9c20c0d63de33d6e4 EBUILD xpra-4.0.4.ebuild 3664 BLAKE2B ba0a5c10d9ad9333045b4b40d1e0d068386b43645b5aab3b132fe980be7fa41c3f9b20520701d01646dbd53c69c70735afd3fcf2ccef8fc50a5add38f9b4e028 SHA512 3c08b19f7ccd12ccefae3d516132fa079980e9bc18fc7f30562ce2ce9f2fbd324f4cd59638d52c76a48e8cd50d55a1e2fb40c404099f8523eaae87cefa6581cb +EBUILD xpra-4.0.5.ebuild 3797 BLAKE2B 322c682c2ae128daea027289932ef37f31288888f75ee4eda53cf71a4ba71a3ed624234202462e46d8f563ec2c2d56e283dbabf5d0d2e2a4fcd4e747f734338f SHA512 ab99366ab8802d5feb9cbef14f7bfb817524e233db651ce37f87ccf5a55002a6dd4e79931484cb84179ccbe90df294999ad6bf203f0da3a438b396d80e2414cc MISC metadata.xml 1245 BLAKE2B afa173eb082c199aae4f79ba9687c1162678a3a80cca8b19f140a210f0d029f3fa3f857e02e6fa1daa96794b586d1e0e9c1f03cddd8a8b10987ac1a96a9f292d SHA512 bcde5f696375a6294e668adae79607c0313414906d8bd647e99a38898a48d360ccdeaf4236da2aba1486e8a3f7783b8bb92c7da5b71fc31906d7ec932820d1bd diff --git a/x11-wm/xpra/xpra-4.0.5.ebuild b/x11-wm/xpra/xpra-4.0.5.ebuild new file mode 100644 index 000000000000..49c1939400aa --- /dev/null +++ b/x11-wm/xpra/xpra-4.0.5.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no +inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix + +DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" +HOMEPAGE="http://xpra.org/ http://xpra.org/src/" +SRC_URI="http://xpra.org/src/${P}.tar.xz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( client server ) + cups? ( dbus ) + opengl? ( client ) +" + +COMMON_DEPEND="${PYTHON_DEPS} + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + x11-libs/gtk+:3[introspection] + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/libxkbfile + brotli? ( app-arch/brotli ) + csc? ( >=media-video/ffmpeg-1.2.2:0= ) + ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] ) + jpeg? ( media-libs/libjpeg-turbo ) + opengl? ( dev-python/pyopengl ) + pulseaudio? ( + media-sound/pulseaudio + media-plugins/gst-plugins-pulse:1.0 + ) + sound? ( media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + dev-python/gst-python:1.0 ) + vpx? ( media-libs/libvpx media-video/ffmpeg ) + webp? ( media-libs/libwebp ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/xpra + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/rencode[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,${PYTHON_USEDEP}] + virtual/ssh + x11-apps/xmodmap + cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) + lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) + opengl? ( + client? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + ) + server? ( x11-base/xorg-server[-minimal,xvfb] + x11-drivers/xf86-input-void + ) + webcam? ( dev-python/numpy[${PYTHON_USEDEP}] + media-libs/opencv[python] + dev-python/pyinotify[${PYTHON_USEDEP}] )" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + >=dev-python/cython-0.16[${PYTHON_USEDEP}]" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch + "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch + "${FILESDIR}"/${PN}-4.0.3-suid-warning.patch +) + +pkg_postinst() { + tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf + + xdg_pkg_postinst +} + +python_prepare_all() { + hprefixify -w '/os.path/' setup.py + hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \ + xpra/platform{/xposix,}/paths.py xpra/scripts/server.py + + if use minimal; then + sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \ + -i setup.py || die + fi + + distutils-r1_python_prepare_all +} + +python_configure_all() { + sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ + -i setup.py || die + + mydistutilsargs=( + --without-PIC + --without-Xdummy + $(use_with client) + $(use_with clipboard) + $(use_with csc csc_swscale) + --without-csc_libyuv + --without-cuda_rebuild + --without-cuda_kernels + $(use_with cups printing) + --without-debug + $(use_with dbus) + $(use_with ffmpeg dec_avcodec2) + $(use_with ffmpeg enc_ffmpeg) + $(use_with ffmpeg enc_x264) + $(use_with ffmpeg enc_x265) + --with-gtk3 + --without-html5 + $(use_with jpeg jpeg_encoder) + $(use_with jpeg jpeg_decoder) + --without-mdns + --without-minify + $(use_with opengl) + $(use_with server shadow) + $(use_with server) + $(use_with sound) + --with-strict + $(use_with vpx) + --with-warn + $(use_with webcam) + $(use_with webp) + --with-x11 + ) + + # see https://www.xpra.org/trac/ticket/1080 + # and http://trac.cython.org/ticket/395 + append-cflags -fno-strict-aliasing + + export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" +} |