summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/Manifest.gzbin9627 -> 9622 bytes
-rw-r--r--x11-wm/awesome/Manifest2
-rw-r--r--x11-wm/awesome/awesome-9999.ebuild2
-rw-r--r--x11-wm/spectrwm/Manifest4
-rw-r--r--x11-wm/spectrwm/metadata.xml5
-rw-r--r--x11-wm/spectrwm/spectrwm-3.3.0.ebuild47
-rw-r--r--x11-wm/windowmaker/Manifest3
-rw-r--r--x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch70
-rw-r--r--x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild4
9 files changed, 131 insertions, 6 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 0c26adb2d9bc..c2d4657d2b3e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
Binary files differ
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 434877a57d50..ee8cfa7387b6 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -16,5 +16,5 @@ DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9
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-9999.ebuild 3553 BLAKE2B a7e553c4fbfd59f10e4e9bd09e581181e8582a01b8fb749cc2b07cda06c4a1cdae2ace297020e89f500658fb0d0fd83bed2bd6570c2127de03d11ca800a227ce SHA512 4f09c03a4ff27c78837f462b9ff27e25f9747f04474de9a1f2080ddaaf52eb268cf8969d3ae4299c4df422a88416ad93fdf001c214db7d0d410a4887d9067fea
+EBUILD awesome-9999.ebuild 3560 BLAKE2B 1a494b8f424039019f8e53e726f630ee300588aefd38dbd8160fb8710c4a5e9b474635c9a44bba99e11098b4d48af2e11b74e0a09a6dac942bf4766a503d2422 SHA512 03fddc4915ff4e585719af1b1bc291e19f5fcd28759d15f22d9030777f62ab5464030b16a1efe6fdbd5d996c1c0254b1a8ed58067455555c4aa84ebb5b1a4b0f
MISC metadata.xml 331 BLAKE2B 177b7ac838fb250b847c6a596c17e7a998715672112462c6c438ec15442b32d2402d87da6d4578e2b78d7bd2a16671a7df7974bebb645e0892bb3f785f95937a SHA512 14550c266d8de65db614c3f0893da85487656bef5166a2829e8a2bc636c50bbd1a505ff7972bc6c5ca553bdcb35caeb1dc4697171d4810ec9fe73420f880ebea
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index f5e97387e3c1..3bb2df137b3a 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -68,7 +68,7 @@ src_configure() {
local mycmakeargs=(
-DSYSCONFDIR="${EPREFIX}"/etc
-DCOMPRESS_MANPAGES=OFF
- -DWITH_DBUS=$(usex dbus)
+ -DWITH_DBUS=$(usex dbus ON OFF)
-DGENERATE_DOC=$(usex doc)
-DAWESOME_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
)
diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 536b6dd9952a..e77e4d3d6b1a 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -2,6 +2,8 @@ AUX spectrwm-3.1.0-Makefile.patch 977 BLAKE2B 1f76bc331ee1d048387ab82900b44339e0
AUX spectrwm-3.2.0-gentoo.patch 1571 BLAKE2B b100631f6c47f45789c4931fcfd38c380404f38610cf91a3dbe5d857c2bf3ff31f7b14fd8f9f787f0fb3068aff50eaf1e51dcef5cfa88d062bf923d64b0c23ac SHA512 996c9f6dc9ac3cedf1178d0d2c9b678d3019d420e59e538233a0739e39dc33d08d7bdaab15d2e43aeddbedaf7df5d762829b1fe8c8f1c64f023bd2337d479b82
DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac3b9852722646058ffb92914ca49581f3f95884c8a6bab2cb6475c4c3b475ff7ed3ea0ff125e76f202696dfd2bd SHA512 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039
+DIST spectrwm-3.3.0.tar.gz 161806 BLAKE2B 07470511486c7b5c61e65eb33e5a9ec7fbfec97390057311fab27bd5608d428b3a53c379fe6c5436000b4847769db9d175154e696b39d3175175bae173e8e68e SHA512 743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc
EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
EBUILD spectrwm-3.2.0.ebuild 1023 BLAKE2B 2d02912e17bdc158ad118ff656c7e6236688dd14f574d3eea156f0a3668ce4c335d30edb5f422e3a6e0c6afb3b94a96be9264deb8216c75719e9b4092b174354 SHA512 4ecc03f075519c803ff011efb5362b35f0e1d49d70dccf4240f5e97c14218dcdcd7e80cbd5b09290e1180cd22fb199b03b5998f6cb954de2acfad6466a57817d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD spectrwm-3.3.0.ebuild 1085 BLAKE2B 097f81cf09d4a1e8ca5911bca2e2854af55a37714c3d43f28ad12751c18a994204652aebfb1e51bbaed180f6f877f7328f0aae4804278d7d4f314016a0f9521f SHA512 3d887d222dd6db150f84b2b2bf07fc2578ebf2f88cc60c935e42983cb18861bfbeac20481ecaba204b8f77a471f3247e772a5791e7ea78c276333e21be099fa7
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/metadata.xml b/x11-wm/spectrwm/metadata.xml
index 6f49eba8f496..c67d4dcaca5b 100644
--- a/x11-wm/spectrwm/metadata.xml
+++ b/x11-wm/spectrwm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>bkohler@gentoo.org</email>
+ <name>Ben Kohler</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-wm/spectrwm/spectrwm-3.3.0.ebuild b/x11-wm/spectrwm/spectrwm-3.3.0.ebuild
new file mode 100644
index 000000000000..6d5151356784
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop multilib toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://github.com/conformal/spectrwm"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ !x11-wm/scrotwm
+ x11-misc/dmenu
+"
+DEPEND="
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXrandr
+ x11-libs/libXt
+ x11-libs/xcb-util
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.0-gentoo.patch
+)
+S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
+
+src_prepare() {
+ sed -i -e '/LICENSE.md/d' linux/Makefile || die
+ default
+}
+
+src_compile() {
+ tc-export CC PKG_CONFIG
+ emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" \
+ SYSCONFDIR="${EROOT}/etc" DOCDIR="${EROOT}/usr/share/doc/${P}" \
+ DESTDIR="${D}" install
+
+ dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh
+}
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index fbd297285f9f..2fb5d127094e 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,9 +1,10 @@
+AUX windowmaker-0.95.8-configure_default_search_paths.patch 2599 BLAKE2B 1b76e547a955e45571860e5a5d87ba6bc0de565cb38355d08019a791965170eb0b5d6f215cd1bcb673f93addfde86485847cc7af987a72bfc02324dd56142f4d SHA512 9c12516dd0a2c3e81f7236e2e0f2f8137710e7f1a54ae84d279850d65afb52cb46cada6e84a0ba1f2c92fdfa8d7a0b4630f703e5a5e24664e0fec5ee718f83ae
AUX windowmaker-0.95.8-imagemagick7.patch 1340 BLAKE2B d3ba22b324a405cba0d0d266e2d25b0b6e41ece01cc42e18d3746c46d9e6f38f3048abe928ade603ec9f90206e19e285445e1de7775b18527602a0557d86aae1 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d
AUX wmaker.desktop 206 BLAKE2B 62fe60afde032c1f37c5c818bc37a97d70605e041e539e922f18d56a7582fffd1689762f600fa3c69c5b62dd399867c8c1208d393060e734b38a84540143bf79 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b
DIST WindowMaker-0.95.7.tar.gz 3238325 BLAKE2B 68a26e8b1281a4ff387fa87517efb46995e5339e2e6e7f71303d3e3e0d75316740d2458067dc4159f23bf1e1b4e1e0bfc22b1428ee4933e4d474a79a147baaf7 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f
DIST WindowMaker-0.95.8.tar.gz 3253515 BLAKE2B 225dae9eb10f913931e129fdf78860123a14406ad8e61ba42fe4eadcf5d3f03c88040a2b982e74abaf79088f4a063291ccfb7b7d42f1bf211adb7b02c765a664 SHA512 6ab16ed4304aba20f0f3a4083adf63a47fa674ade7bc39aaa8aa6466c7842e3f10ab73af96e2afce0842b11c57a35eb69f43183a4044d8cd95d4e2a4d2c079a2
DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
EBUILD windowmaker-0.95.7.ebuild 2906 BLAKE2B 3c3dca2fc0da68c5aae707a4d3f40229cf9c43c31d4024cc554326980ef09d1f51ad3db1234d95499c5d637df31c45bda2ac604677697e468114cf7e99ad8eae SHA512 bf3dbc0929d6b1d9ea277f9d7696e988cb729f1069e7d0306d22e25a5821bc05477f82abfc38fb6905b51eb60585353320c872765626cb6e946e999681a9c61c
-EBUILD windowmaker-0.95.8-r1.ebuild 3051 BLAKE2B 95b286c13bfa641d77ffe4f11580a1c0115566492877867bf530276b652d50e22255bc38adffe4cf24ee0304029bddf2bb5af369c268bb90e8c900b27ff573df SHA512 150bb225f35a683c86da1a57e808d29d7ec00acc6acb7609a7adfce0c7769e75d114166746b918d186440692839aedfd11caa2b64c4c83444cffcfcf585ffd28
+EBUILD windowmaker-0.95.8-r1.ebuild 3117 BLAKE2B 4ee4ad78ad07aac3a7b92d20e449da54a0809d51ef4fbaea95543c2466defaee9cf670c8eaa7e66a46cc72c5c042c4969938af4d8111fb12ab5129503b46eebc SHA512 0239d60827760e0752ea45b3bcb4ad284c1b1bf4f66201d72bd0ff0d3312119f5fd8310bdeb4738ff9156f3c37bb1372dd8479f46c7972f5cdfec4ae8de1b4ab
EBUILD windowmaker-9999.ebuild 2842 BLAKE2B 894de4cc8296ff22ba90d5bf89e00edd82aa256adbabde31861d9f6d1a85c50e32d3c47485c39ff5d20ce7c55da80835fb63626850790823a4d550894f354fdc SHA512 298b72229d0a354ac9b174610add21c4624ae23ccbe9ce850519f93478489fdeb6e1cd40b2f368733c4d89fb93af91181107e554e4c2af81447fa324b5e6c65c
MISC metadata.xml 490 BLAKE2B a74e46dfe5b90558720726c3a18b9c9cf2752fb90ade60450ae568547c52b807e9dee74d1deb842c11cc3e6f564c0793adc5f8e24686893138808669f6fc9766 SHA512 ae731acb1fe00cfbda949fc9cafad9f861b83fb37103a699157256840c67e4a2cd0023114d30eab0b25f6dcb154c00e2a659a4feffaabad97e8ed7aa2a03e3ca
diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch b/x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch
new file mode 100644
index 000000000000..fa323b775d0a
--- /dev/null
+++ b/x11-wm/windowmaker/files/windowmaker-0.95.8-configure_default_search_paths.patch
@@ -0,0 +1,70 @@
+From: David Michael <fedo...@gmail.com>
+To: wmaker-dev@googlegroups.com
+Subject: [PATCH] configure: Allow changing default search paths
+Date: Thu, 16 Jan 2020 14:59:33 -0500
+
+This changes the behavior of the --with-{inc,lib}s-from arguments
+to replace the default paths instead of adding to them. This is
+required when cross-compiling in a sysroot, since the default paths
+will include files from the host system which can have an
+incompatible architecture.
+---
+1. What happened: could not compile
+
+2. Detailed description of what happened:
+Cross-compiling in a sysroot searches for development files on the
+host. The build fails when building between two very different
+architectures.
+
+3. How to reproduce the bug, if known:
+Cross-compile in a sysroot (from x86_64 to ppc with Gentoo in my case).
+
+6. The error occurred during: compilation
+
+8. Error messages output:
+There are about two megabytes of errors about float128 not being defined
+for the architecture, from including the x86_64 headers in /usr/include
+for the ppc compiler.
+
+9. Fix, if known:
+This commit makes it build when passing --with-{inc,lib}s-from= and it
+shouldn't be a big behavior change for most cases.
+
+10. Other Notes:
+I didn't dig into the history of those search variables, but a better
+fix might be to just remove them entirely. It doesn't seem to do any
+good to redundantly add the default search paths, or if includedir or
+libdir were changed, the usual CPPFLAGS and LDFLAGS environment
+variables could set the search paths.
+
+ configure.ac | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a19acce5..0129f4e7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -284,18 +284,14 @@ _bindir=`eval echo $_bindir`
+ _libdir=`eval echo $libdir`
+ _libdir=`eval echo $_libdir`
+
+-lib_search_path='-L${libdir}'
+-
+-inc_search_path='-I${includedir}'
+-
+ dnl ===============================================
+ dnl Specify paths to look for libraries and headers
+ dnl ===============================================
+ AC_ARG_WITH(libs-from, AS_HELP_STRING([--with-libs-from], [pass compiler flags to look for libraries]),
+- [lib_search_path="$withval $lib_search_path"])
++ [lib_search_path="$withval"], [lib_search_path='-L${libdir}'])
+
+ AC_ARG_WITH(incs-from, AS_HELP_STRING([--with-incs-from], [pass compiler flags to look for header files]),
+- [inc_search_path="$withval $inc_search_path"])
++ [inc_search_path="$withval"], [inc_search_path='-I${includedir}'])
+
+
+ dnl Features Configuration
+--
+2.21.1
+
diff --git a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
index 18e442e79398..7fd9518848a6 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -33,6 +33,8 @@ RDEPEND="${DEPEND}
S=${WORKDIR}/${P/windowm/WindowM}
+PATCHES=( "${FILESDIR}"/${P}-configure_default_search_paths.patch )
+
src_prepare() {
# Fix some paths
for file in WindowMaker/*menu* util/wmgenmenu.c; do