Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/skippy/, x11-misc/skippy/files/
Date: Fri, 31 Jan 2020 12:06:03
Message-Id: 1580472352.f70b4555e107db4c8311c6cf0a15919a6cf82273.jer@gentoo
1 commit: f70b4555e107db4c8311c6cf0a15919a6cf82273
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 31 12:05:34 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 31 12:05:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70b4555
7
8 x11-misc/skippy: Fix CFLAGS=-fno-common
9
10 Package-Manager: Portage-2.3.86, Repoman-2.3.20
11 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707490
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 .../skippy/files/skippy-0.5.0-fno-common.patch | 60 ++++++++++++++++++++++
15 x11-misc/skippy/skippy-0.5.0-r1.ebuild | 8 +--
16 2 files changed, 65 insertions(+), 3 deletions(-)
17
18 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
19 new file mode 100644
20 index 00000000000..3275ff2439a
21 --- /dev/null
22 +++ b/x11-misc/skippy/files/skippy-0.5.0-fno-common.patch
23 @@ -0,0 +1,60 @@
24 +--- a/wm.h
25 ++++ b/wm.h
26 +@@ -20,7 +20,7 @@
27 + #ifndef SKIPPY_WM_H
28 + #define SKIPPY_WM_H
29 +
30 +-Atom
31 ++extern Atom
32 + /* Generic atoms */
33 + XA_WM_STATE,
34 + WM_CLIENT_LEADER,
35 +--- a/wm.c
36 ++++ b/wm.c
37 +@@ -43,6 +43,46 @@
38 + #define WIN_STATE_FIXED_POSITION (1<<8) /*window is fixed in position even*/
39 + #define WIN_STATE_ARRANGE_IGNORE (1<<9) /*ignore for auto arranging*/
40 +
41 ++Atom
42 ++ /* Generic atoms */
43 ++ XA_WM_STATE,
44 ++ WM_CLIENT_LEADER,
45 ++ XA_UTF8_STRING,
46 ++
47 ++ /* Root pixmap / wallpaper atoms */
48 ++ _XROOTPMAP_ID,
49 ++ ESETROOT_PMAP_ID,
50 ++
51 ++ /* NetWM atoms */
52 ++ _NET_SUPPORTING_WM_CHECK,
53 ++ _NET_SUPPORTED,
54 ++ _NET_NUMBER_OF_DESKTOPS,
55 ++ _NET_CLIENT_LIST,
56 ++ _NET_CLIENT_LIST_STACKING,
57 ++ _NET_CURRENT_DESKTOP,
58 ++ _NET_WM_DESKTOP,
59 ++ _NET_WM_STATE,
60 ++ _NET_WM_STATE_HIDDEN,
61 ++ _NET_WM_STATE_SKIP_TASKBAR,
62 ++ _NET_WM_STATE_SKIP_PAGER,
63 ++ _NET_WM_STATE_FULLSCREEN,
64 ++ _NET_WM_STATE_SHADED,
65 ++ _NET_WM_STATE_ABOVE,
66 ++ _NET_WM_STATE_STICKY,
67 ++ _NET_WM_WINDOW_TYPE,
68 ++ _NET_WM_WINDOW_TYPE_DESKTOP,
69 ++ _NET_WM_WINDOW_TYPE_DOCK,
70 ++ _NET_WM_VISIBLE_NAME,
71 ++ _NET_WM_NAME,
72 ++
73 ++ /* Old gnome atoms */
74 ++ _WIN_SUPPORTING_WM_CHECK,
75 ++ _WIN_WORKSPACE,
76 ++ _WIN_WORKSPACE_COUNT,
77 ++ _WIN_PROTOCOLS,
78 ++ _WIN_CLIENT_LIST,
79 ++ _WIN_STATE,
80 ++ _WIN_HINTS;
81 +
82 + static int WM_PERSONALITY = WM_PERSONALITY_NETWM,
83 + NETWM_HAS_FULLSCREEN = 0,
84
85 diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
86 index 1b63a8fe60e..d8db07312cf 100644
87 --- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild
88 +++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
89 @@ -1,7 +1,7 @@
90 -# Copyright 1999-2018 Gentoo Foundation
91 +# Copyright 1999-2020 Gentoo Authors
92 # Distributed under the terms of the GNU General Public License v2
93
94 -EAPI=6
95 +EAPI=7
96 inherit toolchain-funcs
97
98 DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality"
99 @@ -23,8 +23,10 @@ DEPEND="${RDEPEND}
100 x11-base/xorg-proto
101 virtual/pkgconfig"
102
103 -PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch
104 +PATCHES=(
105 + "${FILESDIR}"/${PN}-pointer-size.patch
106 "${FILESDIR}"/${P}-Makefile.patch
107 + "${FILESDIR}"/${P}-fno-common.patch
108 )
109
110 DOCS=( CHANGELOG skippyrc-default )