commit: f70b4555e107db4c8311c6cf0a15919a6cf82273 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Fri Jan 31 12:05:34 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Fri Jan 31 12:05:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70b4555
x11-misc/skippy: Fix CFLAGS=-fno-common Package-Manager: Portage-2.3.86, Repoman-2.3.20 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707490 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../skippy/files/skippy-0.5.0-fno-common.patch | 60 ++++++++++++++++++++++ x11-misc/skippy/skippy-0.5.0-r1.ebuild | 8 +-- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch b/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch new file mode 100644 index 00000000000..3275ff2439a --- /dev/null +++ b/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch @@ -0,0 +1,60 @@ +--- a/wm.h ++++ b/wm.h +@@ -20,7 +20,7 @@ + #ifndef SKIPPY_WM_H + #define SKIPPY_WM_H + +-Atom ++extern Atom + /* Generic atoms */ + XA_WM_STATE, + WM_CLIENT_LEADER, +--- a/wm.c ++++ b/wm.c +@@ -43,6 +43,46 @@ + #define WIN_STATE_FIXED_POSITION (1<<8) /*window is fixed in position even*/ + #define WIN_STATE_ARRANGE_IGNORE (1<<9) /*ignore for auto arranging*/ + ++Atom ++ /* Generic atoms */ ++ XA_WM_STATE, ++ WM_CLIENT_LEADER, ++ XA_UTF8_STRING, ++ ++ /* Root pixmap / wallpaper atoms */ ++ _XROOTPMAP_ID, ++ ESETROOT_PMAP_ID, ++ ++ /* NetWM atoms */ ++ _NET_SUPPORTING_WM_CHECK, ++ _NET_SUPPORTED, ++ _NET_NUMBER_OF_DESKTOPS, ++ _NET_CLIENT_LIST, ++ _NET_CLIENT_LIST_STACKING, ++ _NET_CURRENT_DESKTOP, ++ _NET_WM_DESKTOP, ++ _NET_WM_STATE, ++ _NET_WM_STATE_HIDDEN, ++ _NET_WM_STATE_SKIP_TASKBAR, ++ _NET_WM_STATE_SKIP_PAGER, ++ _NET_WM_STATE_FULLSCREEN, ++ _NET_WM_STATE_SHADED, ++ _NET_WM_STATE_ABOVE, ++ _NET_WM_STATE_STICKY, ++ _NET_WM_WINDOW_TYPE, ++ _NET_WM_WINDOW_TYPE_DESKTOP, ++ _NET_WM_WINDOW_TYPE_DOCK, ++ _NET_WM_VISIBLE_NAME, ++ _NET_WM_NAME, ++ ++ /* Old gnome atoms */ ++ _WIN_SUPPORTING_WM_CHECK, ++ _WIN_WORKSPACE, ++ _WIN_WORKSPACE_COUNT, ++ _WIN_PROTOCOLS, ++ _WIN_CLIENT_LIST, ++ _WIN_STATE, ++ _WIN_HINTS; + + static int WM_PERSONALITY = WM_PERSONALITY_NETWM, + NETWM_HAS_FULLSCREEN = 0, diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild index 1b63a8fe60e..d8db07312cf 100644 --- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild +++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality" @@ -23,8 +23,10 @@ DEPEND="${RDEPEND} x11-base/xorg-proto virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch +PATCHES=( + "${FILESDIR}"/${PN}-pointer-size.patch "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-fno-common.patch ) DOCS=( CHANGELOG skippyrc-default )
