mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 22:16:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update x11-apps.

Browse Source 
We have a number of outdated X tools; let's update them in one swoop since
it's backwards compatible anyway.

Change-Id: I35f6f3f7688fcb26730688588d2dbb4de9d77600
Reviewed-on: https://gerrit.chromium.org/gerrit/14829
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
This commit is contained in:
Stéphane Marchesin 2012-01-25 15:23:10 -08:00 committed by Gerrit
parent 533a47283d
commit c20e28fa76
7 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild → sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.6.ebuild vendored
View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.5.ebuild,v 1.9 2011/02/14 23:41:01 xarthisius Exp $ # $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.6.ebuild,v 1.8 2011/08/20 15:45:11 jer Exp $
EAPI=3 EAPI=4
inherit xorg-2 inherit xorg-2
@ -18,5 +18,8 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
pkg_setup() { pkg_setup() {
CONFIGURE_OPTIONS="$(use_enable ipv6)" XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
)
xorg-2_pkg_setup
} }

10
sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild → sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild vendored
View File

@ -1,13 +1,12 @@
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild,v 1.7 2011/04/16 17:54:58 armin76 Exp $ # $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.3.0.ebuild,v 1.5 2011/12/27 20:53:50 maekke Exp $
EAPI=3
EAPI=4
inherit xorg-2 inherit xorg-2
DESCRIPTION="Display information utility for X" DESCRIPTION="Display information utility for X"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt" KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
IUSE="dga dmx xinerama" IUSE="dga dmx xinerama"
RDEPEND=" RDEPEND="
@ -18,6 +17,7 @@ RDEPEND="
x11-libs/libXrender x11-libs/libXrender
x11-libs/libXtst x11-libs/libXtst
x11-libs/libXxf86vm x11-libs/libXxf86vm
x11-libs/libxcb
dga? ( x11-libs/libXxf86dga ) dga? ( x11-libs/libXxf86dga )
dmx? ( x11-libs/libdmx ) dmx? ( x11-libs/libdmx )
xinerama? ( x11-libs/libXinerama ) xinerama? ( x11-libs/libXinerama )
@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
" "
pkg_setup() { pkg_setup() {
CONFIGURE_OPTIONS="--without-xf86misc XORG_CONFIGURE_OPTIONS="--without-xf86misc
$(use_with dga) $(use_with dga)
$(use_with dmx) $(use_with dmx)
$(use_with xinerama) $(use_with xinerama)

15
sdk_container/src/third_party/portage-stable/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild vendored Normal file
View File

@ -0,0 +1,15 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.2.3.ebuild,v 1.7 2011/10/03 17:56:28 josejx Exp $
EAPI=4
inherit xorg-2
DESCRIPTION="compile XKB keyboard description"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="x11-libs/libX11
x11-libs/libxkbfile"
DEPEND="${RDEPEND}
sys-devel/bison"

11
sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild → sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.1.ebuild vendored
View File

@ -1,15 +1,16 @@
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.2.0.ebuild,v 1.9 2011/02/14 18:54:49 xarthisius Exp $ # $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.2.1.ebuild,v 1.9 2011/10/03 17:57:35 josejx Exp $
EAPI=3
EAPI=4
inherit xorg-2 inherit xorg-2
DESCRIPTION="property displayer for X" DESCRIPTION="property displayer for X"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="" IUSE=""
RDEPEND="x11-libs/libX11" RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}
>=x11-proto/xproto-7.0.17
"

6
sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild → sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.5.ebuild vendored
View File

@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.4.ebuild,v 1.9 2011/02/14 23:41:03 xarthisius Exp $ # $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.5.ebuild,v 1.7 2011/10/03 17:58:09 josejx Exp $
EAPI=3 EAPI=4
inherit xorg-2 inherit xorg-2
@ -18,5 +18,5 @@ DEPEND="${RDEPEND}"
src_install() { src_install() {
xorg-2_src_install xorg-2_src_install
rm -f "${ED}"/usr/bin/xkeystone rm -f "${ED}"/usr/bin/xkeystone || die
} }

15
sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.1-r1.ebuild → sdk_container/src/third_party/portage-stable/x11-apps/xset/xset-1.2.2.ebuild vendored
View File

@ -1,15 +1,14 @@
# Copyright 1999-2011 Gentoo Foundation # Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-1.2.1-r1.ebuild,v 1.7 # $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-1.2.2.ebuild,v 1.9 2011/10/03 17:58:43 josejx Exp $
# 2011/04/16 17:57:06 armin76 Exp $
EAPI=3 EAPI=4
inherit xorg-2 inherit xorg-2
DESCRIPTION="X.Org xset application" DESCRIPTION="X.Org xset application"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="" IUSE=""
RDEPEND=" RDEPEND="
@ -18,7 +17,7 @@ RDEPEND="
x11-libs/libXext" x11-libs/libXext"
DEPEND="${RDEPEND}" DEPEND="${RDEPEND}"
pkg_setup() { XORG_CONFIGURE_OPTIONS=(
CONFIGURE_OPTIONS="--without-xf86misc --without-fontcache" --without-xf86misc
xorg-2_pkg_setup --without-fontcache
} )

25
sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.2.ebuild vendored Normal file
View File

@ -0,0 +1,25 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.2.ebuild,v 1.8 2011/10/03 17:59:17 josejx Exp $
EAPI=4
inherit xorg-2 flag-o-matic
DESCRIPTION="window information utility for X"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND=">=x11-libs/libxcb-1.6"
DEPEND="${RDEPEND}
x11-libs/libX11
>=x11-proto/xproto-7.0.17"
pkg_setup() {
# interix has a _very_ old iconv in libc, however, including
# iconv.h redefines those symbols to libiconv_*, which then
# are unresolved, as the configure check is old and dumb.
[[ ${CHOST} == *-interix* ]] &&
append-libs -liconv
}