commit: e51eaf345132b3494c05db6315e8531a359ca68b Author: Daniel Campbell <zlg <AT> gentoo <DOT> org> AuthorDate: Mon Jan 2 10:58:19 2017 +0000 Commit: Daniel Campbell <zlg <AT> gentoo <DOT> org> CommitDate: Mon Jan 2 12:35:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51eaf34
x11-misc/spacefm: include sysmacros.h, bug 603000 Include DEPEND fix to no longer need REQUIRED_USE, build using gtk3 by default per GNOME team's suggestions. Gentoo-Bug: 603000 Gentoo-Bug-URL: https://bugs.gentoo.org/603000 Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../spacefm/files/spacefm-include-sysmacros.patch | 10 ++++++++++ .../{spacefm-9999.ebuild => spacefm-1.0.4-r1.ebuild} | 18 ++++++++++-------- .../{spacefm-9999.ebuild => spacefm-1.0.5-r2.ebuild} | 19 ++++++++++--------- x11-misc/spacefm/spacefm-9999.ebuild | 9 ++++----- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/x11-misc/spacefm/files/spacefm-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-include-sysmacros.patch new file mode 100644 index 00000000..153d7c2 --- /dev/null +++ b/x11-misc/spacefm/files/spacefm-include-sysmacros.patch @@ -0,0 +1,10 @@ +--- a/src/vfs/vfs-volume-nohal.c ++++ b/src/vfs/vfs-volume-nohal.c +@@ -36,6 +36,7 @@ + + #include <signal.h> // kill + #include <linux/kdev_t.h> // MAJOR MINOR ++#include <sys/sysmacros.h> // needed for dev_t + + #ifdef HAVE_STATVFS + #include <sys/statvfs.h> diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild similarity index 87% copy from x11-misc/spacefm/spacefm-9999.ebuild copy to x11-misc/spacefm/spacefm-1.0.4-r1.ebuild index 0ca069b..e147de8 100644 --- a/x11-misc/spacefm/spacefm-9999.ebuild +++ b/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild @@ -1,20 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git" -EGIT_BRANCH="next" - -inherit fdo-mime git-2 gnome2-utils linux-info +inherit fdo-mime gnome2-utils linux-info DESCRIPTION="A multi-panel tabbed file manager" HOMEPAGE="https://ignorantguru.github.com/spacefm/"; +SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails" REQUIRED_USE="gtk2? ( !gtk3 )" @@ -24,7 +22,7 @@ RDEPEND="dev-libs/glib:2 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf - gtk2? ( x11-libs/gtk+:2 ) + gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/libX11 @@ -36,6 +34,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig sys-devel/gettext" +PATCHES=( + "${FILESDIR}"/${PN}-include-sysmacros.patch +) + src_configure() { econf \ --htmldir=/usr/share/doc/${PF}/html \ diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild similarity index 87% copy from x11-misc/spacefm/spacefm-9999.ebuild copy to x11-misc/spacefm/spacefm-1.0.5-r2.ebuild index 0ca069b..45a33f6 100644 --- a/x11-misc/spacefm/spacefm-9999.ebuild +++ b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild @@ -1,22 +1,19 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git" -EGIT_BRANCH="next" - -inherit fdo-mime git-2 gnome2-utils linux-info +inherit fdo-mime gnome2-utils linux-info DESCRIPTION="A multi-panel tabbed file manager" HOMEPAGE="https://ignorantguru.github.com/spacefm/"; +SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails" -REQUIRED_USE="gtk2? ( !gtk3 )" RDEPEND="dev-libs/glib:2 dev-util/desktop-file-utils @@ -24,7 +21,7 @@ RDEPEND="dev-libs/glib:2 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf - gtk2? ( x11-libs/gtk+:2 ) + gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/libX11 @@ -36,6 +33,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig sys-devel/gettext" +PATCHES=( + "${FILESDIR}"/${PN}-include-sysmacros.patch +) + src_configure() { econf \ --htmldir=/usr/share/doc/${PF}/html \ diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild index 0ca069b..444e767 100644 --- a/x11-misc/spacefm/spacefm-9999.ebuild +++ b/x11-misc/spacefm/spacefm-9999.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 EGIT_REPO_URI="git://github.com/IgnorantGuru/${PN}.git" EGIT_BRANCH="next" -inherit fdo-mime git-2 gnome2-utils linux-info +inherit fdo-mime git-r3 gnome2-utils linux-info DESCRIPTION="A multi-panel tabbed file manager" HOMEPAGE="https://ignorantguru.github.com/spacefm/"; @@ -16,7 +16,6 @@ LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="" IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails" -REQUIRED_USE="gtk2? ( !gtk3 )" RDEPEND="dev-libs/glib:2 dev-util/desktop-file-utils @@ -24,7 +23,7 @@ RDEPEND="dev-libs/glib:2 virtual/freedesktop-icon-theme x11-libs/cairo x11-libs/gdk-pixbuf - gtk2? ( x11-libs/gtk+:2 ) + gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk2? ( x11-libs/gtk+:3 ) x11-libs/pango x11-libs/libX11
