* [gentoo-commits] repo/gentoo:master commit in: x11-misc/skippy/, x11-misc/skippy/files/
@ 2017-02-06 22:47 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-02-06 22:47 UTC (permalink / raw
To: gentoo-commits
commit: 8a7e529252283330d888e66f71142ed095641f73
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Feb 6 09:54:37 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 6 22:46:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7e5292
x11-misc/skippy: EAPI bump 2 -> 6, shorten DESCRIPTION
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3841
x11-misc/skippy/files/skippy-0.5.0-Makefile.patch | 4 +--
x11-misc/skippy/files/skippy-pointer-size.patch | 4 +--
...{skippy-0.5.0.ebuild => skippy-0.5.0-r1.ebuild} | 30 ++++++++++------------
x11-misc/skippy/skippy-0.5.0.ebuild | 4 +--
4 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
index 957d3ba..5c8c64b 100644
--- a/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
+++ b/x11-misc/skippy/files/skippy-0.5.0-Makefile.patch
@@ -1,7 +1,7 @@
Don't use LDFLAGS to pass libraries.
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
@@ -1,14 +1,12 @@
-PREFIX = /usr/local
+PREFIX = /usr
diff --git a/x11-misc/skippy/files/skippy-pointer-size.patch b/x11-misc/skippy/files/skippy-pointer-size.patch
index 8a7ee42..7f59711 100644
--- a/x11-misc/skippy/files/skippy-pointer-size.patch
+++ b/x11-misc/skippy/files/skippy-pointer-size.patch
@@ -1,5 +1,5 @@
---- wm.c
-+++ wm.c
+--- a/wm.c
++++ b/wm.c
@@ -258,7 +258,7 @@
return 0;
diff --git a/x11-misc/skippy/skippy-0.5.0.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
similarity index 66%
copy from x11-misc/skippy/skippy-0.5.0.ebuild
copy to x11-misc/skippy/skippy-0.5.0-r1.ebuild
index 1627520..7088be7 100644
--- a/x11-misc/skippy/skippy-0.5.0.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
-DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality with various WMs"
+DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality"
HOMEPAGE="http://thegraveyard.org/skippy.php"
SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
RDEPEND="media-libs/imlib2[X]
@@ -25,25 +25,21 @@ DEPEND="${RDEPEND}
x11-proto/xineramaproto
virtual/pkgconfig"
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-pointer-size.patch \
- "${FILESDIR}"/${P}-Makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-pointer-size.patch
+ "${FILESDIR}"/${P}-Makefile.patch
+)
+
+DOCS=( CHANGELOG skippyrc-default )
src_compile() {
tc-export CC
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc CHANGELOG skippyrc-default
+ default
}
pkg_postinst() {
- echo
+ elog
elog "You should copy skippyrc-default from /usr/share/doc/${PF} to"
elog "~/.skippyrc and edit the keysym used to invoke skippy."
elog "Use x11-apps/xev to find out the keysym."
- echo
+ elog
}
diff --git a/x11-misc/skippy/skippy-0.5.0.ebuild b/x11-misc/skippy/skippy-0.5.0.ebuild
index 1627520..2b01e3e 100644
--- a/x11-misc/skippy/skippy-0.5.0.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=2
inherit eutils toolchain-funcs
-DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality with various WMs"
+DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality"
HOMEPAGE="http://thegraveyard.org/skippy.php"
SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/skippy/, x11-misc/skippy/files/
@ 2020-01-31 12:05 Jeroen Roovers
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers @ 2020-01-31 12:05 UTC (permalink / raw
To: gentoo-commits
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 )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/skippy/, x11-misc/skippy/files/
@ 2022-07-15 12:32 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-07-15 12:32 UTC (permalink / raw
To: gentoo-commits
commit: bb3bdd3212b7973b57cf03f5db36f85050b951de
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 12:32:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 12:32:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3bdd32
x11-misc/skippy: update EAPI 7 -> 8; fix build w/ newer imlib2
Closes: https://bugs.gentoo.org/828943
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/skippy-0.5.0-imlib2-pkg-config.patch | 14 +++++++
x11-misc/skippy/skippy-0.5.0-r2.ebuild | 47 ++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch b/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch
new file mode 100644
index 000000000000..c109b4e31860
--- /dev/null
+++ b/x11-misc/skippy/files/skippy-0.5.0-imlib2-pkg-config.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/828943
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ PREFIX = /usr
+ BINDIR = ${PREFIX}/bin
+
+-CFLAGS += `imlib2-config --cflags` `${PKG_CONFIG} xft --cflags` -pedantic -Wall
+-LDLIBS = -lX11 -lm `imlib2-config --libs` `${PKG_CONFIG} xft --libs`
++CFLAGS += `${PKG_CONFIG} --cflags imlib2` `${PKG_CONFIG} xft --cflags` -pedantic -Wall
++LDLIBS = -lX11 -lm `${PKG_CONFIG} --libs imlib2` `${PKG_CONFIG} xft --libs`
+
+ # Comment these out to disable Xinerama support
+ CFLAGS += -DXINERAMA
diff --git a/x11-misc/skippy/skippy-0.5.0-r2.ebuild b/x11-misc/skippy/skippy-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..51f0174ed446
--- /dev/null
+++ b/x11-misc/skippy/skippy-0.5.0-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A full-screen task-switcher providing Apple Expose-like functionality"
+HOMEPAGE="http://thegraveyard.org/skippy.php"
+SRC_URI="http://thegraveyard.org/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-libs/imlib2[X]
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXinerama
+ x11-libs/libXmu
+ x11-libs/libXft"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-pointer-size.patch
+ "${FILESDIR}"/${P}-Makefile.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-imlib2-pkg-config.patch
+)
+
+DOCS=( CHANGELOG skippyrc-default )
+
+src_compile() {
+ tc-export CC PKG_CONFIG
+
+ default
+}
+
+pkg_postinst() {
+ elog
+ elog "You should copy skippyrc-default from /usr/share/doc/${PF} to"
+ elog "~/.skippyrc and edit the keysym used to invoke skippy."
+ elog "Use x11-apps/xev to find out the keysym."
+ elog
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-15 12:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-15 12:32 [gentoo-commits] repo/gentoo:master commit in: x11-misc/skippy/, x11-misc/skippy/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-01-31 12:05 Jeroen Roovers
2017-02-06 22:47 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox