From 3bbdf2d8412e2f7c366ffc968b908633ba76571e Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 24 Dec 2017 13:08:59 +0100 Subject: [PATCH] Removed old version of ebuilds for windowmaker --- ...windowmaker-0.95.7-window_head_cycle.patch | 246 ------------------ x11-wm/windowmaker/files/wmaker.desktop | 7 - .../windowmaker/windowmaker-0.95.7-r10.ebuild | 106 -------- x11-wm/windowmaker/windowmaker-9999.ebuild | 111 -------- 4 files changed, 470 deletions(-) delete mode 100644 x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch delete mode 100644 x11-wm/windowmaker/files/wmaker.desktop delete mode 100644 x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild delete mode 100644 x11-wm/windowmaker/windowmaker-9999.ebuild diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch b/x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch deleted file mode 100644 index 535ae3e..0000000 --- a/x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch +++ /dev/null @@ -1,246 +0,0 @@ -diff --git a/src/actions.c b/src/actions.c -index 5adfab4..f6bb009 100644 ---- a/src/actions.c -+++ b/src/actions.c -@@ -354,7 +354,7 @@ void update_saved_geometry(WWindow *wwin) - save_old_geometry(wwin, SAVE_GEOMETRY_X); - } - --void wMaximizeWindow(WWindow *wwin, int directions) -+void wMaximizeWindow(WWindow *wwin, int directions, int head) - { - unsigned int new_width, new_height, half_scr_width, half_scr_height; - int new_x = 0; -@@ -388,20 +388,7 @@ void wMaximizeWindow(WWindow *wwin, int directions) - totalArea.y2 = scr->scr_height; - totalArea.x1 = 0; - totalArea.y1 = 0; -- usableArea = totalArea; -- -- if (!(directions & MAX_IGNORE_XINERAMA)) { -- WScreen *scr = wwin->screen_ptr; -- int head; -- -- if (directions & MAX_KEYBOARD) -- head = wGetHeadForWindow(wwin); -- else -- head = wGetHeadForPointerLocation(scr); -- -- usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True); -- } -- -+ usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True); - - /* Only save directions, not kbd or xinerama hints */ - directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS); -@@ -497,13 +484,38 @@ void handleMaximize(WWindow *wwin, int directions) - int requested = directions & (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS); - int effective = requested ^ current; - int flags = directions & ~requested; -+ int head = wGetHeadForWindow(wwin); -+ WMPoint p; - - if (!effective) { - /* allow wMaximizeWindow to restore the Maximusized size */ - if ((wwin->flags.old_maximized & MAX_MAXIMUS) && - !(requested & MAX_MAXIMUS)) -- wMaximizeWindow(wwin, MAX_MAXIMUS | flags); -- else -+ wMaximizeWindow(wwin, MAX_MAXIMUS | flags, head); -+ else if (requested & MAX_LEFTHALF && current & MAX_LEFTHALF) { -+ p.x = wwin->frame_x - 100; -+ p.y = 0; -+ -+ if (p.x > 0) { -+ head = wGetHeadForPointOrNegative(wwin->screen_ptr, p); -+ if (head != -1) { -+ effective |= MAX_RIGHTHALF; -+ effective |= MAX_VERTICAL; -+ effective &= ~(MAX_HORIZONTAL | MAX_LEFTHALF); -+ wMaximizeWindow(wwin, effective | flags, head); -+ } -+ } -+ } else if (requested & MAX_RIGHTHALF && current & MAX_RIGHTHALF) { -+ p.x = wwin->frame_x + wwin->frame->core->width + 100; -+ p.y = 0; -+ head = wGetHeadForPointOrNegative(wwin->screen_ptr, p); -+ if (head != -1) { -+ effective |= MAX_LEFTHALF; -+ effective |= MAX_VERTICAL; -+ effective &= ~(MAX_HORIZONTAL | MAX_RIGHTHALF); -+ wMaximizeWindow(wwin, effective | flags, head); -+ } -+ } else - wUnmaximizeWindow(wwin); - /* these alone mean vertical|horizontal toggle */ - } else if ((effective == MAX_LEFTHALF) || -@@ -511,6 +523,10 @@ void handleMaximize(WWindow *wwin, int directions) - (effective == MAX_TOPHALF) || - (effective == MAX_BOTTOMHALF)) - wUnmaximizeWindow(wwin); -+ else if (requested & MAX_LEFTHALF && current & MAX_RIGHTHALF) -+ wMaximizeWindow(wwin, (MAX_HORIZONTAL|MAX_VERTICAL), head); -+ else if (requested & MAX_RIGHTHALF && current & MAX_LEFTHALF) -+ wMaximizeWindow(wwin, (MAX_HORIZONTAL|MAX_VERTICAL), head); - else { - if ((requested == (MAX_HORIZONTAL | MAX_VERTICAL)) || - (requested == MAX_MAXIMUS)) -@@ -552,7 +568,7 @@ void handleMaximize(WWindow *wwin, int directions) - effective &= ~(MAX_TOPHALF | MAX_BOTTOMHALF); - effective &= ~MAX_MAXIMUS; - } -- wMaximizeWindow(wwin, effective | flags); -+ wMaximizeWindow(wwin, effective | flags, head); - } - } - -diff --git a/src/actions.h b/src/actions.h -index 8390e49..a15cf48 100644 ---- a/src/actions.h -+++ b/src/actions.h -@@ -57,7 +57,7 @@ void wSelectWindows(WScreen *scr, XEvent *ev); - void wSelectWindow(WWindow *wwin, Bool flag); - void wUnselectWindows(WScreen *scr); - --void wMaximizeWindow(WWindow *wwin, int directions); -+void wMaximizeWindow(WWindow *wwin, int directions, int head); - void wUnmaximizeWindow(WWindow *wwin); - void handleMaximize(WWindow *wwin, int directions); - -diff --git a/src/event.c b/src/event.c -index e7ee074..54c191f 100644 ---- a/src/event.c -+++ b/src/event.c -@@ -632,7 +632,8 @@ static void handleMapRequest(XEvent * ev) - if (wwin) { - wClientSetState(wwin, NormalState, None); - if (wwin->flags.maximized) { -- wMaximizeWindow(wwin, wwin->flags.maximized); -+ wMaximizeWindow(wwin, wwin->flags.maximized, -+ wGetHeadForWindow(wwin)); - } - if (wwin->flags.shaded) { - wwin->flags.shaded = 0; -diff --git a/src/window.c b/src/window.c -index 532670c..8945a54 100644 ---- a/src/window.c -+++ b/src/window.c -@@ -2855,7 +2855,7 @@ static void titlebarDblClick(WCoreWindow *sender, void *data, XEvent *event) - int ndir = dir ^ wwin->flags.maximized; - - if (ndir != 0) -- wMaximizeWindow(wwin, ndir); -+ wMaximizeWindow(wwin, ndir, wGetHeadForWindow(wwin)); - else - wUnmaximizeWindow(wwin); - } -diff --git a/src/winmenu.c b/src/winmenu.c -index c7da09d..fc63fc6 100644 ---- a/src/winmenu.c -+++ b/src/winmenu.c -@@ -169,7 +169,7 @@ static void execWindowOptionCommand(WMenu * menu, WMenuEntry * entry) - static void execMaximizeCommand(WMenu * menu, WMenuEntry * entry) - { - WWindow *wwin = (WWindow *) entry->clientdata; -- -+ - /* Parameter not used, but tell the compiler that it is ok */ - (void) menu; - -@@ -277,7 +277,8 @@ static void execMenuCommand(WMenu * menu, WMenuEntry * entry) - if (wwin->flags.maximized) - wUnmaximizeWindow(wwin); - else -- wMaximizeWindow(wwin, MAX_VERTICAL | MAX_HORIZONTAL); -+ wMaximizeWindow(wwin, MAX_VERTICAL | MAX_HORIZONTAL, -+ wGetHeadForWindow(wwin)); - break; - - case MC_SHADE: -diff --git a/src/wmspec.c b/src/wmspec.c -index 9b56f96..96ba984 100644 ---- a/src/wmspec.c -+++ b/src/wmspec.c -@@ -1120,9 +1120,11 @@ static void doStateAtom(WWindow *wwin, Atom state, int set, Bool init) - wwin->flags.maximized |= (set ? MAX_VERTICAL : 0); - } else { - if (set) -- wMaximizeWindow(wwin, wwin->flags.maximized | MAX_VERTICAL); -+ wMaximizeWindow(wwin, wwin->flags.maximized | MAX_VERTICAL, -+ wGetHeadForWindow(wwin)); - else -- wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_VERTICAL); -+ wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_VERTICAL, -+ wGetHeadForWindow(wwin)); - } - } else if (state == net_wm_state_maximized_horz) { - if (set == _NET_WM_STATE_TOGGLE) -@@ -1132,9 +1134,11 @@ static void doStateAtom(WWindow *wwin, Atom state, int set, Bool init) - wwin->flags.maximized |= (set ? MAX_HORIZONTAL : 0); - } else { - if (set) -- wMaximizeWindow(wwin, wwin->flags.maximized | MAX_HORIZONTAL); -+ wMaximizeWindow(wwin, wwin->flags.maximized | MAX_HORIZONTAL, -+ wGetHeadForWindow(wwin)); - else -- wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_HORIZONTAL); -+ wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_HORIZONTAL, -+ wGetHeadForWindow(wwin)); - } - } else if (state == net_wm_state_hidden) { - if (set == _NET_WM_STATE_TOGGLE) -@@ -1623,7 +1627,8 @@ Bool wNETWMProcessClientMessage(XClientMessageEvent *event) - wwin->flags.maximized = maximized; - wUnmaximizeWindow(wwin); - } else { -- wMaximizeWindow(wwin, wwin->flags.maximized); -+ wMaximizeWindow(wwin, wwin->flags.maximized, -+ wGetHeadForWindow(wwin)); - } - } - updateStateHint(wwin, False, False); -diff --git a/src/xinerama.c b/src/xinerama.c -index 3d26139..4acbc3e 100644 ---- a/src/xinerama.c -+++ b/src/xinerama.c -@@ -236,7 +236,7 @@ int wGetHeadForWindow(WWindow * wwin) - return wGetHeadForRect(wwin->screen_ptr, rect); - } - --int wGetHeadForPoint(WScreen * scr, WMPoint point) -+int wGetHeadForPointOrNegative(WScreen * scr, WMPoint point) - { - int i; - -@@ -247,7 +247,17 @@ int wGetHeadForPoint(WScreen * scr, WMPoint point) - (unsigned)(point.y - rect->pos.y) < rect->size.height) - return i; - } -- return scr->xine_info.primary_head; -+ return -1; -+} -+ -+int wGetHeadForPoint(WScreen * scr, WMPoint point) -+{ -+ int head = wGetHeadForPointOrNegative(scr, point); -+ -+ if (head < 0) -+ return scr->xine_info.primary_head; -+ -+ return head; - } - - int wGetHeadForPointerLocation(WScreen * scr) -diff --git a/src/xinerama.h b/src/xinerama.h -index fd1d469..88a3580 100644 ---- a/src/xinerama.h -+++ b/src/xinerama.h -@@ -41,6 +41,8 @@ int wGetHeadForRect(WScreen *scr, WMRect rect); - - int wGetHeadForWindow(WWindow *wwin); - -+int wGetHeadForPointOrNegative(WScreen * scr, WMPoint point); -+ - int wGetHeadForPoint(WScreen *scr, WMPoint point); - - int wGetHeadForPointerLocation(WScreen *scr); diff --git a/x11-wm/windowmaker/files/wmaker.desktop b/x11-wm/windowmaker/files/wmaker.desktop deleted file mode 100644 index fd24a0b..0000000 --- a/x11-wm/windowmaker/files/wmaker.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -# The names/descriptions should really be better -Name=GNUStep WindowMaker -Comment=Use this session to run WindowMaker as your desktop environment -Exec=/usr/bin/wmaker -Icon= -Type=Application diff --git a/x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild deleted file mode 100644 index 5bef284..0000000 --- a/x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.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-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( media-gfx/imagemagick ) - jpeg? ( virtual/jpeg:0= ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - webp? ( media-libs/libwebp ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - fi; - done; - epatch "${FILESDIR}/windowmaker-0.95.7-window_head_cycle.patch" -} - -src_configure() { - local myconf - - # image format types - myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --localedir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild deleted file mode 100644 index e59d529..0000000 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit autotools eutils git-2 - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" -EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git" -EGIT_MASTER="next" - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama xrandr" -KEYWORDS="~amd64 ~x86" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - imagemagick? ( media-gfx/imagemagick ) - jpeg? ( virtual/jpeg ) - png? ( media-libs/libpng:0= ) - tiff? ( media-libs/tiff:0 ) - webp? ( media-libs/libwebp ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -src_unpack() { - # wm-extras - unpack ${A} - - git-2_src_unpack -} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die - fi; - done; - - eautoreconf -} - -src_configure() { - local myconf - - # image format types - # xpm is provided by X itself - myconf="--enable-xpm $(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --localedir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions -}