From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- x11-wm/wm2/Manifest | 6 ++ x11-wm/wm2/files/wm2-4-gentoo.patch | 146 ++++++++++++++++++++++++++++++++++++ x11-wm/wm2/metadata.xml | 5 ++ x11-wm/wm2/wm2-4-r1.ebuild | 56 ++++++++++++++ 4 files changed, 213 insertions(+) create mode 100644 x11-wm/wm2/Manifest create mode 100644 x11-wm/wm2/files/wm2-4-gentoo.patch create mode 100644 x11-wm/wm2/metadata.xml create mode 100644 x11-wm/wm2/wm2-4-r1.ebuild (limited to 'x11-wm/wm2') diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest new file mode 100644 index 000000000000..29e0ee64ec65 --- /dev/null +++ b/x11-wm/wm2/Manifest @@ -0,0 +1,6 @@ +AUX wm2-4-gentoo.patch 4265 SHA256 32d592a74f7f4f0f4f255eb2e735f2804278bea76e54e08da82a579463586875 SHA512 f3772d107c29e4c3a3f14459e80e130122d9be9cf7a1edcff507d1ed53efa67c42e9ba63ea08d1d846bc864507f48231a2c9e903bf9d46b085a75a478efa87df WHIRLPOOL 324af727ad71f1c4964cd30a8ff6855aa5c09f3849d5524bc855cacec1005080d80a2490b0be49d4379d249e28524add252049bd62628be3b03e3464b62444b8 +DIST wm2-4.tar.gz 32807 SHA256 a6c3352390f958c5033408ce73e1abd9677372a7c8c5949e39a62fda433b054d SHA512 9151267e5a6bf39587b15dc3e55b4acc05aa1b14a7a9bcb4e1ed25d474af8b0e7699343117f184c745645deb404d6f6e230809b88d9b7bb5c1f67ba0fbde72e9 WHIRLPOOL a2b8e77969fd21176db97d75be0b7e0136075b62d1f838fa08a774b7be0c28a781f5baace77518ee1a6a53167c8e0aa90c4f159dd3c2ad847d536bf78429591d +EBUILD wm2-4-r1.ebuild 1387 SHA256 5da5e4539d80ba2bddd2ab0456dea88c4778fda00cf8fc576d5fe1df0fb59c3d SHA512 c1a4b09618177932826ac0d135eed89fbfa4bd97c7c1df22c1aca80235d7fe7c5349f844c4ab889901459b34c181a15f8cfe437bf77c157ce04fc4c11a98f7df WHIRLPOOL 343f1da33b61766020d2ae8dac471ac175763a80c9fbff37dccee666a741a225a9fd7e78295b3d2d42d7d74bc8f5e58cd6c61c2da644a1f7398897de1e83fc15 +MISC ChangeLog 2533 SHA256 1ab88259ff765dc05649c817f7427a7c8b6de79d471da51f11e0fe9ba66037ed SHA512 015c66ead49966aa804d8d77bfffa0e4636475b1521290da377a1e008f41143a50a5c6d99e2531674a94badd9b20c6203db552ce7ba72dd246164f796ac2ad89 WHIRLPOOL 2ff1cd3f2a8b3c67441b20445f30f909166a1757d16fc7572930cf52ce1d47b919f4875ed05ae9c295ddad680e24db5e97dd2a5427209e6637179f2ba46fb953 +MISC ChangeLog-2015 2016 SHA256 c564c1ed36b5bbd6fbdccc94817a65c1ddde85f367365b8139cc2922fa2dfe8e SHA512 03e93687ff48c5b0f938a42df500b5714ba3a404011046d1cb72f047cc42a47294819a27c78781b656b35229df757604721a5372469b50f51de3ed816377b667 WHIRLPOOL 0e16bbbbe859a50bf238c312081f3cf59ba7d41bdc0bce0027118828b998b7c855bfcbabc96be97fc5899dbe3a12fb008f679534d34aa15c588b87547cad277a +MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968 diff --git a/x11-wm/wm2/files/wm2-4-gentoo.patch b/x11-wm/wm2/files/wm2-4-gentoo.patch new file mode 100644 index 000000000000..88c78080c542 --- /dev/null +++ b/x11-wm/wm2/files/wm2-4-gentoo.patch @@ -0,0 +1,146 @@ +diff -ur wm2-4/Border.C wm2-4.new/Border.C +--- wm2-4/Border.C 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Border.C 2007-06-30 16:56:10.000000000 +0200 +@@ -183,7 +183,7 @@ + + if (m_label) free(m_label); + m_label = m_client->iconName() ? +- NewString(m_client->iconName()) : NewString("incognito"); ++ NewString(m_client->iconName()) : NewString(CONFIG_INCOGNITO); + + int len = strlen(m_label); + m_tabHeight = XRotTextWidth(m_tabFont, m_label, len) + 6 + m_tabWidth; +diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C +--- wm2-4/Buttons.C 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Buttons.C 2007-06-30 16:56:10.000000000 +0200 +@@ -139,7 +139,11 @@ + (allowExit && ((n) > clients.count())) ? "[Exit wm2]" \ + : clients.item((n)-1)->label()) + ++#ifdef CONFIG_MENU_REVERSE ++ for (i = m_hiddenClients.count() - 1; i>=0; --i) { ++#else + for (i = 0; i < m_hiddenClients.count(); ++i) { ++#endif + clients.append(m_hiddenClients.item(i)); + } + int nh = clients.count() + 1; +diff -ur wm2-4/Client.C wm2-4.new/Client.C +--- wm2-4/Client.C 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Client.C 2007-06-30 16:56:10.000000000 +0200 +@@ -4,7 +4,7 @@ + + #include + +-const char *const Client::m_defaultLabel = "incognito"; ++const char *const Client::m_defaultLabel = CONFIG_INCOGNITO; + + + +@@ -400,7 +400,7 @@ + } + + +-int Client::getAtomProperty(Atom a, Atom type) ++uintptr_t Client::getAtomProperty(Atom a, Atom type) + { + char **p, *x; + if (getProperty_aux(display(), m_window, a, type, 1L, +@@ -410,7 +410,7 @@ + + x = *p; + XFree((void *)p); +- return (int)x; ++ return (uintptr_t)x; + } + + +diff -ur wm2-4/Client.h wm2-4.new/Client.h +--- wm2-4/Client.h 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Client.h 2007-06-30 16:56:10.000000000 +0200 +@@ -2,6 +2,8 @@ + #ifndef _CLIENT_H_ + #define _CLIENT_H_ + ++#include ++ + #include "General.h" + #include "Manager.h" + #include "Border.h" +@@ -125,7 +127,7 @@ + WindowManager *const m_windowManager; + + char *getProperty(Atom); +- int getAtomProperty(Atom, Atom); ++ uintptr_t getAtomProperty(Atom, Atom); + int getIntegerProperty(Atom); + + // accessors +diff -ur wm2-4/Config.h wm2-4.new/Config.h +--- wm2-4/Config.h 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Config.h 2007-06-30 16:56:10.000000000 +0200 +@@ -39,6 +39,9 @@ + + #define CONFIG_FRAME_THICKNESS 7 + ++#define CONFIG_INCOGNITO "incognito" ++#define CONFIG_MENU_REVERSE ++ + // If CONFIG_PROD_SHAPE is True, all frame element shapes will be + // recalculated afresh every time their focus changes. This will + // probably slow things down hideously, but has been reported as +@@ -46,4 +49,3 @@ + #define CONFIG_PROD_SHAPE False + + #endif +- +diff -ur wm2-4/General.h wm2-4.new/General.h +--- wm2-4/General.h 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/General.h 2007-06-30 16:56:10.000000000 +0200 +@@ -32,7 +32,7 @@ + #define NewString(x) (strcpy((char *)malloc(strlen(x)+1),(x))) + + #ifndef SIGNAL_CALLBACK_TYPE +-#define SIGNAL_CALLBACK_TYPE (void (*)(...)) ++#define SIGNAL_CALLBACK_TYPE (void (*)(int)) + #endif + + #define signal(x,y) \ +diff -ur wm2-4/Makefile wm2-4.new/Makefile +--- wm2-4/Makefile 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Makefile 2007-06-30 16:56:10.000000000 +0200 +@@ -1,8 +1,8 @@ + +-LIBS = -L/usr/X11/lib -lXext -lX11 -lXmu -lm ++LIBS = -L/usr/X11R6/lib -lXext -lX11 -lXmu -lm + + CC = gcc +-CCC = gcc ++CCC = g++ + CFLAGS = -O2 + OBJECTS = Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o + +diff -ur wm2-4/Manager.C wm2-4.new/Manager.C +--- wm2-4/Manager.C 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Manager.C 2007-06-30 16:56:10.000000000 +0200 +@@ -368,7 +368,7 @@ + return m_currentTime; + } + +-void WindowManager::sigHandler() ++void WindowManager::sigHandler(int n) + { + m_signalled = True; + } +diff -ur wm2-4/Manager.h wm2-4.new/Manager.h +--- wm2-4/Manager.h 1997-03-21 12:12:30.000000000 +0100 ++++ wm2-4.new/Manager.h 2007-06-30 16:56:10.000000000 +0200 +@@ -85,7 +85,7 @@ + + static Boolean m_initialising; + static int errorHandler(Display *, XErrorEvent *); +- static void sigHandler(); ++ static void sigHandler(int); + static int m_signalled; + + void initialiseScreen(); diff --git a/x11-wm/wm2/metadata.xml b/x11-wm/wm2/metadata.xml new file mode 100644 index 000000000000..6f49eba8f496 --- /dev/null +++ b/x11-wm/wm2/metadata.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild new file mode 100644 index 000000000000..1d023d08d20a --- /dev/null +++ b/x11-wm/wm2/wm2-4-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils toolchain-funcs + +DESCRIPTION="Small, unconfigurable window manager" +HOMEPAGE="http://www.all-day-breakfast.com/wm2/" +SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz" + +SLOT="0" +LICENSE="freedist" +KEYWORDS="amd64 ppc x86" +IUSE="" + +RDEPEND="x11-libs/libXmu" +DEPEND="${RDEPEND} + x11-proto/xextproto" + +src_prepare() { + epatch "${FILESDIR}/${P}-gentoo.patch" + sed -e "s/CFLAGS/CXXFLAGS/" \ + -e "s/\$(CCC) -o/\$(CCC) \$(LDFLAGS) -o/" \ + -i Makefile || die #334681 + + sed 's/^#//' Config.h > wm2.conf + if [ -e "/etc/wm2.conf" ]; then + echo "#undef _CONFIG_H_" >> Config.h + awk '/^[^/]/{print "#" $0}' /etc/wm2.conf >> Config.h + fi +} + +src_compile() { + emake \ + CXXFLAGS="${CXXFLAGS}" \ + CCC="$(tc-getCXX)" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin wm2 + insinto /etc + doins wm2.conf + dodoc README +} + +pkg_postinst() { + echo + elog "wm2 is unconfigurable after you have installed. If you want to" + elog "change settings of wm2, please have a look at /etc/wm2.conf" + elog "and rewrite it, then emerge wm2 again (wm2 ebuild uses settings" + elog "from that file automatically). If you think wm2 lacks some important" + elog "features that you want to use (such as background pixmaps)," + elog "consider using wmx, written by the same author." + echo +} -- cgit v1.2.3