diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r149.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r150.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r149.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r150.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 74694ecec7..2213ba44ea 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -53,8 +53,6 @@ RDEPEND="${RDEPEND} coreos-base/cros-testutils =dev-lang/python-2* dev-python/setuptools - dev-db/m17n-contrib - dev-db/m17n-db dev-lang/nasm dev-lang/swig dev-lang/yasm @@ -65,7 +63,6 @@ RDEPEND="${RDEPEND} dev-libs/libgcrypt dev-libs/libxslt dev-libs/libyaml - dev-libs/m17n-lib dev-libs/protobuf dev-python/cherrypy dev-python/ctypesgen diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2 deleted file mode 100644 index 76d634040e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/intel-gpu-tools-1.0.3_pre2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst unpack -DEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0 -DESCRIPTION=intel gpu userland tools -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=debug -KEYWORDS=amd64 x86 -LICENSE=MIT -RDEPEND=>=x11-libs/libdrm-2.4.6 >=x11-libs/libpciaccess-0.10 x11-libs/cairo !<=x11-base/xorg-x11-6.9 -RESTRICT=test -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/app/intel-gpu-tools-1.0.3_pre2.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280 -_md5_=44bf81d69ae01fb36afc31911c34870b diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1 deleted file mode 100644 index 42af699d8c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mesa-progs-7.5.1-r1 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=virtual/glut virtual/opengl virtual/glu -DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo) -HOMEPAGE=http://mesa3d.sourceforge.net/ -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd -LICENSE=LGPL-2 -RDEPEND=virtual/glut virtual/opengl virtual/glu -SLOT=0 -SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaLib-7.5.1.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.5.1/MesaDemos-7.5.1.tar.bz2 -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=d1c64255283116c9e9fddc28b1c62f7c diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22 deleted file mode 100644 index d4d1a8a1d7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-0.0.1-r22 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info prepare setup unpack -DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git -DESCRIPTION=Multitouch Contact Plotter -EAPI=4 -HOMEPAGE=http://src.chromium.org -IUSE=cros_workon_tree_ccfcb72fba4959143cc6e3273301e2be6965ff53 -KEYWORDS=amd64 arm x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/libX11 -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=8be5e1bcd3160cca6ac479709c8e3852 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999 deleted file mode 100644 index fa7fc87b30..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/mtplot-9999 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=info prepare setup unpack -DEPEND=x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git -DESCRIPTION=Multitouch Contact Plotter -EAPI=4 -HOMEPAGE=http://src.chromium.org -IUSE=cros_workon_tree_ -KEYWORDS=~amd64 ~arm ~x86 -LICENSE=GPL-2 -RDEPEND=x11-libs/libX11 -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 cros-workon 5f2f8a42fa8e9e59f25015d9167f93a4 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=f6e2bf580dd4e8030f300bee7fb2a303 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 deleted file mode 100644 index bed91c0a98..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-apps/xinit-1.3.0-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X Window System initializer -EAPI=3 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=+minimal -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd -LICENSE=MIT GPL-2 -PDEPEND=x11-apps/xrdb !minimal? ( x11-apps/xclock x11-apps/xsm x11-terms/xterm x11-wm/twm ) -RDEPEND=!=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) sys-devel/flex >=x11-proto/bigreqsproto-1.1.0 >=x11-proto/compositeproto-0.4 >=x11-proto/damageproto-1.1 >=x11-proto/fixesproto-5.0 >=x11-proto/fontsproto-2.0.2 >=x11-proto/glproto-1.4.14 >=x11-proto/inputproto-2.1.99.3 >=x11-proto/kbproto-1.0.3 >=x11-proto/randrproto-1.2.99.3 >=x11-proto/recordproto-1.13.99.1 >=x11-proto/renderproto-0.11 >=x11-proto/resourceproto-1.0.2 >=x11-proto/scrnsaverproto-1.1 >=x11-proto/trapproto-3.4.3 >=x11-proto/videoproto-2.2.2 >=x11-proto/xcmiscproto-1.2.0 >=x11-proto/xextproto-7.1.99 >=x11-proto/xf86dgaproto-2.0.99.1 >=x11-proto/xf86rushproto-1.1.2 >=x11-proto/xf86vidmodeproto-2.2.99.1 >=x11-proto/xineramaproto-1.1.3 >=x11-proto/xproto-7.0.22 dmx? ( >=x11-proto/dmxproto-2.2.99.1 doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) ) !minimal? ( >=x11-proto/xf86driproto-2.1.0 >=x11-proto/dri2proto-2.6 >=x11-libs/libdrm-2.4.20 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) -DESCRIPTION=X.Org X servers -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=dmx kdrive xnest xorg xvfb broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev static-libs doc -KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd -LICENSE=MIT -PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.12 ) -RDEPEND=>=app-admin/eselect-opengl-1.0.8 dev-libs/openssl media-libs/freetype >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont-1.4.2 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/pixman-0.21.8 >=x11-libs/xtrans-1.2.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-7.8_rc[nptl=] ) tslib? ( >=x11-libs/tslib-1.0 ) udev? ( >=sys-fs/udev-150 ) >=x11-apps/xinit-1.3 selinux? ( sec-policy/selinux-xserver ) -REQUIRED_USE=!minimal? ( || ( dmx kdrive xnest xorg xvfb ) ) -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.12.4.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=cc1937987d75e7653bcd0e616dbc8461 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 deleted file mode 100644 index 770c106e4d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/cairo-1.10.2-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install prepare -DEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=A vector graphics library with cross-device output support -EAPI=3 -HOMEPAGE=http://cairographics.org/ -IUSE=X aqua debug directfb doc drm gallium opengl openvg qt4 static-libs +svg xcb cairo-perf-trace -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=|| ( LGPL-2.1 MPL-1.1 ) -RDEPEND=media-libs/fontconfig media-libs/freetype:2 media-libs/libpng sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) -RESTRICT=test -SLOT=0 -SRC_URI=http://cairographics.org/releases/cairo-1.10.2.tar.gz -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=b5614dee88eda90b8c43e94b9c072d55 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1 deleted file mode 100644 index da4e613211..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/gtk+-2.20.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=configure install postinst prepare setup test -DEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) x86-interix? ( sys-libs/itx-bind ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) -DESCRIPTION=Gimp ToolKit + -EAPI=2 -HOMEPAGE=http://www.gtk.org/ -IUSE=aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama test -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=LGPL-2 -PDEPEND=vim-syntax? ( app-vim/gtk-syntax ) -RDEPEND=!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.2 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.21.3 >=x11-libs/pango-1.20 >=dev-libs/atk-1.13 media-libs/fontconfig x11-misc/shared-mime-info >=media-libs/libpng-1.2.1 cups? ( net-print/cups ) jpeg? ( >=media-libs/jpeg-6b-r2:0 ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.5.7 ) !=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) -DESCRIPTION=X.Org Xfont library -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=ipv6 static-libs doc -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=MIT -RDEPEND=x11-libs/xtrans x11-libs/libfontenc >=media-libs/freetype-2 app-arch/bzip2 x11-proto/xproto x11-proto/fontsproto -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.4.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=db339124932f4f4e0a848e0069d4a361 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1 deleted file mode 100644 index 86ccfde89c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXft-2.2.0-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X.Org Xft library -EAPI=3 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=static-libs -KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt -LICENSE=MIT -RDEPEND=>=x11-libs/libXrender-0.8.2 x11-libs/libX11 x11-libs/libXext media-libs/freetype media-libs/fontconfig x11-proto/xproto -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.2.0.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=367c6899b512349ba82ae0af0eeee0ba diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1 deleted file mode 100644 index 4dbe1c76b4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXi-1.6.0-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) -DESCRIPTION=X.Org Xi library -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=static-libs doc -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt -LICENSE=MIT -RDEPEND=>=x11-libs/libX11-1.4.99.1 >=x11-libs/libXext-1.1 >=x11-proto/inputproto-2.1.99.6 >=x11-proto/xproto-7.0.13 >=x11-proto/xextproto-7.0.3 -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.6.0.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=023590ebd190057dd23a605b6f34afa3 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1 deleted file mode 100644 index 5e793044d2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libXt-1.0.6-r1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst setup unpack -DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto >=x11-misc/util-macros-1.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-1.5 >=sys-devel/m4-1.4 virtual/pkgconfig >=x11-misc/util-macros-1.3.0 -DESCRIPTION=X.Org Xt library -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=debug -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd -LICENSE=MIT -RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-proto/xproto x11-proto/kbproto !<=x11-base/xorg-x11-6.9 -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.6.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 x-modular 9f4ee0c44a3a3b7ecdf52cefc1e10280 -_md5_=a2d9a6d549fb2b552bc5a0318b2384b6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39 deleted file mode 100644 index 4a272921b0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X.Org libdrm library -EAPI=4 -HOMEPAGE=http://dri.freedesktop.org/ -IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=MIT -RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) -RESTRICT=test -SLOT=0 -SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=643307b815fed12113f6105c3491df70 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5 deleted file mode 100644 index 4a272921b0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-2.4.39-r5 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X.Org libdrm library -EAPI=4 -HOMEPAGE=http://dri.freedesktop.org/ -IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=MIT -RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) -RESTRICT=test -SLOT=0 -SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.39.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=643307b815fed12113f6105c3491df70 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39 deleted file mode 100644 index 9cc444cb26..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X.Org libdrm library -EAPI=4 -HOMEPAGE=http://dri.freedesktop.org/ -IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=MIT -RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 -RESTRICT=test -SLOT=0 -SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=a39302dc6251f406fdf336d67ef7a85e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2 deleted file mode 100644 index 9cc444cb26..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libdrm-tests-2.4.39-r2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X.Org libdrm library -EAPI=4 -HOMEPAGE=http://dri.freedesktop.org/ -IUSE=video_cards_exynos video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=MIT -RDEPEND=dev-libs/libpthread-stubs sys-fs/udev video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) ~x11-libs/libdrm-2.4.39 -RESTRICT=test -SLOT=0 -SRC_URI=http://dri.freedesktop.org/libdrm-tests/libdrm-2.4.39.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=a39302dc6251f406fdf336d67ef7a85e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1 deleted file mode 100644 index fbcb0a0af5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libpciaccess-0.12.902-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=Library providing generic access to the PCI bus and devices -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=minimal zlib static-libs -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris -LICENSE=MIT -RDEPEND=!=x11-libs/libva-1.1.0_rc1 !=x11-libs/libdrm-2.4.23[video_cards_intel] virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=HW video decode support for Intel integrated graphics -EAPI=3 -HOMEPAGE=http://www.freedesktop.org/wiki/Software/vaapi -KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux -LICENSE=MIT -RDEPEND=>=x11-libs/libva-1.1.0_rc1 !=x11-libs/libdrm-2.4.23[video_cards_intel] -SLOT=0 -SRC_URI=http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-1.0.19_pre2.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=6f9fe16aace2cab1e655386667acbd39 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1 deleted file mode 100644 index 8eb4c88a81..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxcb-1.8.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs doc? ( app-doc/doxygen ) dev-libs/libxslt >=x11-proto/xcb-proto-1.7.1 >=dev-lang/python-2.5[xml] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X C-language Bindings library -EAPI=3 -HOMEPAGE=http://xcb.freedesktop.org/ -IUSE=doc selinux static-libs -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd -LICENSE=MIT -RDEPEND=x11-libs/libXau x11-libs/libXdmcp dev-libs/libpthread-stubs -SLOT=0 -SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.8.1.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=c6e17d064c8ad5852ef61735d1de6053 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1 deleted file mode 100644 index 547bdee089..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/libxkbcommon-0.0.0_alpha1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 >=dev-util/pkgconfig-0.23 dev-vcs/git -DESCRIPTION=X.Org xkbcommon library -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=static-libs -KEYWORDS=amd64 arm x86 -LICENSE=MIT -RDEPEND=x11-proto/xproto >=x11-proto/kbproto-1.0.5 -SLOT=0 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 git-2 da60d6e85fa94cef4d510cab24e01e36 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=8003ff2c6465aa25e15a598521c3e84e diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4 deleted file mode 100644 index 416d10760c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 -DESCRIPTION=Internationalized text layout and rendering library -EAPI=3 -HOMEPAGE=http://www.pango.org/ -IUSE=X doc introspection test debug -KEYWORDS=amd64 arm x86 -LICENSE=LGPL-2 FTL -RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) -SLOT=0 -SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed -_md5_=e910bba8f04a9558bd3a2d94ea1297c0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3 deleted file mode 100644 index 416d10760c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-libs/pango-1.28.4-r3 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack -DEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 -DESCRIPTION=Internationalized text layout and rendering library -EAPI=3 -HOMEPAGE=http://www.pango.org/ -IUSE=X doc introspection test debug -KEYWORDS=amd64 arm x86 -LICENSE=LGPL-2 FTL -RDEPEND=>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) -SLOT=0 -SRC_URI=mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a fdo-mime 9c46e30acd923ff12e325dbe96bb98b9 gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 e766f648c9d51ea0afabaf25bddb1ad9 gnome2-utils 0067e2e4dc66e2ff223a9c527e329407 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 versionator 865bc8b2fc9fcfb6d520bdf5a110f5ed -_md5_=e910bba8f04a9558bd3a2d94ea1297c0 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7 deleted file mode 100644 index b3d905c232..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/unclutter-8-r7 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=compile install -DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-proto/xproto -DESCRIPTION=Hides mouse pointer while not in use. -HOMEPAGE=http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README -KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 -LICENSE=public-domain -RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi -SLOT=0 -SRC_URI=ftp://ftp.x.org/contrib/utilities/unclutter-8.tar.Z -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=a355a91ecb5832e54d9264a820696f03 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15 deleted file mode 100644 index d862d40473..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-misc/xkeyboard-config-2.4.1-r15 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2 x11-proto/xproto >=dev-util/intltool-0.30 dev-perl/XML-Parser || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X keyboard configuration database -EAPI=4 -HOMEPAGE=http://www.freedesktop.org/wiki/Software/XKeyboardConfig -IUSE=parrot -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 -LICENSE=MIT -RDEPEND=>=x11-apps/xkbcomp-1.2.1 >=x11-libs/libX11-1.4.2 -SLOT=0 -SRC_URI=http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-2.4.1.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=f842bf5aa0be0ffead4745fb313a5ba6 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 deleted file mode 100644 index 6b4e18b2c9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xcb-proto-1.7.1 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=dev-libs/libxml2 >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 -DESCRIPTION=X C-language Bindings protocol headers -EAPI=3 -HOMEPAGE=http://xcb.freedesktop.org/ -KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris -LICENSE=MIT -RDEPEND=>=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) -SLOT=0 -SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.7.1.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d autotools-utils 966fed1f979132a778b0b48c74a16adb base fc89786f3f7e7bcf03334359bd5b639b binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c python 6bbd984910e27780e5d0ea543d83ef84 toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 xorg-2 b83efc910bb3ac2c64f89e2623f181f5 -_md5_=d014d8c7e782e2eb0eb136851b7425a1 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0 deleted file mode 100644 index 5464f418a1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-proto/xextproto-7.2.0 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=!=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.14.0 >=media-fonts/font-util-1.2.0 ) >=dev-util/pkgconfig-0.23 doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) -DESCRIPTION=X.Org XExt protocol headers -EAPI=4 -HOMEPAGE=http://xorg.freedesktop.org/ -IUSE=doc -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt -LICENSE=MIT -RDEPEND=!=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=rxvt clone with xft and unicode support -EAPI=2 -HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html -IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 -SLOT=0 -SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.07.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=a99a8294e901c6dd487d4c21e409f87d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10 deleted file mode 100644 index 366ca4a801..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/rxvt-unicode-9.10 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst prepare -DEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool -DESCRIPTION=rxvt clone with xft and unicode support -EAPI=2 -HOMEPAGE=http://software.schmorp.de/pkg/rxvt-unicode.html -IUSE=minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd -LICENSE=GPL-2 -RDEPEND=x11-libs/libX11 x11-libs/libXft afterimage? ( media-libs/libafterimage ) x11-libs/libXrender perl? ( dev-lang/perl ) >=sys-libs/ncurses-5.7-r3 -SLOT=0 -SRC_URI=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.10.tar.bz2 -_eclasses_=autotools addbdf6cce5024ac93ad2084ad5e1d2d binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 eutils 33ef77a15337022e05342d2c772a7a5a flag-o-matic 01a8b1eb019305bc4b4a8bd0b04e4cd8 libtool 0fd90d183673bf1107465ec45849d1ea multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 user 9e552f935106ff0bc92af16da64b4b29 -_md5_=a99a8294e901c6dd487d4c21e409f87d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255 deleted file mode 100644 index cabb5a8d8a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/x11-terms/xterm-255 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure install setup -DEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d ) x11-proto/xproto -DESCRIPTION=Terminal Emulator for X Windows -EAPI=2 -HOMEPAGE=http://dickey.his.com/xterm/ -IUSE=-toolbar +truetype +unicode -Xaw3d -KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd -LICENSE=MIT -RDEPEND=x11-libs/libX11 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXft x11-libs/libXaw x11-apps/xmessage unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/Xaw3d ) -SLOT=0 -SRC_URI=ftp://invisible-island.net/xterm/xterm-255.tgz -_eclasses_=binutils-funcs 73669d0b20960c1cc54cf381a4b89e77 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs 64fc271a237429f84f36b91c9f4b9912 -_md5_=0e8c765a4b6d83bf496a1cb03122fff8 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/Manifest deleted file mode 100644 index d824c4f5bd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST intel-gpu-tools-1.0.3_pre2.tar.bz2 808375 SHA256 a647fe7b777d5a084f4be9995fc2984239af115fb5a9f19d850880e243118e4a SHA512 da9aede40a378223f9e6a5fa14818a9684da3b1a8a597291b6e2e45b0f088f1aabdf64dc5c5c6a341da5770baadd17d1131197ef78f73e32a1cecc4c1de9dc02 WHIRLPOOL 643b8e02b5e7bed2fcb469aec36e82a0ac8740efd5ca0ef12d104ef5155c7c31d12483f5b4977e0f79e76cf720442ce626055f03d8ab8ea283a2c60e6f15dcac diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild deleted file mode 100644 index 876e3461f3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.3_pre2.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.0.2.ebuild,v 1.3 2009/12/10 18:16:44 fauli Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit x-modular - -DESCRIPTION="intel gpu userland tools" -KEYWORDS="amd64 x86" -IUSE="" -RESTRICT="test" - -DEPEND=" - >=x11-libs/libdrm-2.4.6 - >=x11-libs/libpciaccess-0.10 - x11-libs/cairo" -RDEPEND="${DEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest deleted file mode 100644 index d933de577a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST MesaDemos-7.5.1.tar.bz2 1552059 RMD160 9147d9fba75998fcd344a736995069ec642c8893 SHA1 5bafef98a896f4e5c22d17b435db0d14e981ba6c SHA256 64d6b9b42a93e93b770cd07d944a5fe872752db18b1cd84224198f7a431a1721 -DIST MesaLib-7.5.1.tar.bz2 4382803 RMD160 bccf6f52fce3b3c7ac6525444f907e3c2fe790c2 SHA1 26171fb4de23a21431861d6663203e400df45bf7 SHA256 48f21e5a91a82fa9fb6d0bc5ae72d9d9cc1824429dcfc759cfcc1a44e3e1440a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch deleted file mode 100644 index 2dde569898..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/files/mesa-progs-7.5.1-gold.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru Mesa-7.5.1/progs/xdemos/Makefile Mesa-7.5.1.patched/progs/xdemos/Makefile ---- Mesa-7.5.1/progs/xdemos/Makefile 2010-10-06 10:21:04.000000000 -0700 -+++ Mesa-7.5.1.patched/progs/xdemos/Makefile 2010-10-06 10:20:31.000000000 -0700 -@@ -8,7 +8,7 @@ - - LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) - --LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) -+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) -lX11 -lpthread - - PROGS = \ - corender \ diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild deleted file mode 100644 index 3a2a8c4083..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mesa-progs/mesa-progs-7.5.1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-7.5.1.ebuild,v 1.8 2009/12/16 18:02:52 scarabeus Exp $ - -inherit eutils toolchain-funcs - -MY_PN="${PN/m/M}" -MY_PN="${MY_PN/-progs}" -MY_P="${MY_PN}-${PV/_/-}" -LIB_P="${MY_PN}Lib-${PV/_/-}" -PROG_P="${MY_PN}Demos-${PV/_/-}" -DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)" -HOMEPAGE="http://mesa3d.sourceforge.net/" -if [[ $PV = *_rc* ]]; then - SRC_URI="http://www.mesa3d.org/beta/${LIB_P}.tar.gz - http://www.mesa3d.org/beta/${PROG_P}.tar.gz" -elif [[ $PV = 9999 ]]; then - SRC_URI="" -else - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${LIB_P}.tar.bz2 - ftp://ftp.freedesktop.org/pub/mesa/${PV}/${PROG_P}.tar.bz2" -fi -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="virtual/glut - virtual/opengl - virtual/glu" - -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if [[ ${KERNEL} == "FreeBSD" ]]; then - CONFIG="freebsd" - elif use x86; then - CONFIG="linux-dri-x86" - elif use amd64; then - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - cd "${S}" - - # Kill this; we don't want /usr/X11R6/lib ever to be searched in this - # build. - echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} - - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} - echo "CC = $(tc-getCC)" >> ${HOSTCONF} - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} - echo "LDFLAGS = ${LDFLAGS}" >> ${HOSTCONF} - - # Just executables here, no need to compile with -fPIC - echo "PIC_FLAGS =" >> ${HOSTCONF} - - epatch "${FILESDIR}"/${P}-gold.patch -} - -src_compile() { - cd "${S}"/configs - ln -s ${CONFIG} current - - cd "${S}"/progs/xdemos - - emake glxinfo || die "glxinfo failed" - emake glxgears || die "glxgears failed" -} - -src_install() { - dobin "${S}"/progs/xdemos/{glxgears,glxinfo} || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild deleted file mode 100644 index 74cd16c10a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-0.0.1-r22.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -CROS_WORKON_COMMIT="f0fda739ab48538a97ed784c9cd1f94dc2569555" -CROS_WORKON_TREE="ccfcb72fba4959143cc6e3273301e2be6965ff53" -CROS_WORKON_PROJECT="chromiumos/platform/mtplot" -inherit autotools cros-workon - -DESCRIPTION="Multitouch Contact Plotter" -CROS_WORKON_LOCALNAME="../platform/mtplot" -HOMEPAGE="http://src.chromium.org" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -src_prepare() { - eautoreconf -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild deleted file mode 100644 index c4d7a06afd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/mtplot/mtplot-9999.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -CROS_WORKON_PROJECT="chromiumos/platform/mtplot" -inherit autotools cros-workon - -DESCRIPTION="Multitouch Contact Plotter" -CROS_WORKON_LOCALNAME="../platform/mtplot" -HOMEPAGE="http://src.chromium.org" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -src_prepare() { - eautoreconf -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest deleted file mode 100644 index 4c90f30f7e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch deleted file mode 100644 index a25ef4ba2a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/0001-Gentoo-customizations.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001 -From: Tomas Chvatal -Date: Mon, 1 Nov 2010 16:46:36 +0100 -Subject: [PATCH] Gentoo customizations. - - -Signed-off-by: Tomas Chvatal ---- - xinitrc.cpp | 26 ++++++++++++++++++-------- - 1 files changed, 18 insertions(+), 8 deletions(-) - -diff --git a/xinitrc.cpp b/xinitrc.cpp -index 049a8e4..80c3ad9 100644 ---- a/xinitrc.cpp -+++ b/xinitrc.cpp -@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD - - userresources=$HOME/.Xresources - usermodmap=$HOME/.Xmodmap --sysresources=XINITDIR/.Xresources --sysmodmap=XINITDIR/.Xmodmap -+sysresources=XINITDIR/Xresources -+sysmodmap=XINITDIR/Xmodmap - - XCOMM merge in defaults and keymaps - -@@ -84,15 +84,25 @@ fi - XCOMM This is the fallback case if nothing else is executed above - #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ - -+if [ -n "`/etc/X11/chooser.sh`" ]; then -+ command="`/etc/X11/chooser.sh`" -+else -+ failsafe="yes" -+fi -+ - if [ -d XINITDIR/xinitrc.d ] ; then -- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do -+ for f in XINITDIR/xinitrc.dXSLASHGLOB ; do - [ -x "$f" ] && . "$f" - done - unset f - fi - --TWM & --XCLOCK -geometry 50x50-1+1 & --XTERM -geometry 80x50+494+51 & --XTERM -geometry 80x20+494-0 & --exec XTERM -geometry 80x66+0+0 -name login -+if [ -n "$failsafe" ]; then -+ TWM & -+ XCLOCK -geometry 50x50-1+1 & -+ XTERM -geometry 80x50+494+51 & -+ XTERM -geometry 80x20+494-0 & -+ exec XTERM -geometry 80x66+0+0 -name login -+else -+ exec $command -+fi --- -1.7.3.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession deleted file mode 100644 index c86ccee19f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/Xsession +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $ - -case $# in -1) - case $1 in - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - esac -esac - -# redirect errors to a file in user's home directory if we can -for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" -do - if ( cp /dev/null "$errfile" 2> /dev/null ) - then - chmod 600 "$errfile" - exec > "$errfile" 2>&1 - break - fi -done - -# clean up after xbanner -if which freetemp 2> /dev/null ; then - freetemp -fi - -startup=$HOME/.xsession - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -userxkbmap=$HOME/.Xkbmap - -sysresources=/etc/X11/Xresources -sysmodmap=/etc/X11/Xmodmap -sysxkbmap=/etc/X11/Xkbmap - -rh6sysresources=/etc/X11/xinit/Xresources -rh6sysmodmap=/etc/X11/xinit/Xmodmap - - -# merge in defaults -if [ -f "$rh6sysresources" ]; then - xrdb -merge "$rh6sysresources" -fi - -if [ -f "$sysresources" ]; then - xrdb -merge "$sysresources" -fi - -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi - -# merge in keymaps -if [ -f "$sysxkbmap" ]; then - setxkbmap `cat "$sysxkbmap"` - XKB_IN_USE=yes -fi - -if [ -f "$userxkbmap" ]; then - setxkbmap `cat "$userxkbmap"` - XKB_IN_USE=yes -fi - -# -# Eeek, this seems like too much magic here -# -if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then - if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then - xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config` - if [ -n "$xkbsymbols" ]; then - setxkbmap -symbols "$xkbsymbols" - XKB_IN_USE=yes - fi - fi -fi - -# xkb and xmodmap don't play nice together -if [ -z "$XKB_IN_USE" ]; then - if [ -f "$rh6sysmodmap" ]; then - xmodmap "$rh6sysmodmap" - fi - - if [ -f "$sysmodmap" ]; then - xmodmap "$sysmodmap" - fi - - if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" - fi -fi - -unset XKB_IN_USE - -if [ -x "$startup" ]; then - exec "$startup" -elif [ -x "$HOME/.Xclients" ]; then - exec "$HOME/.Xclients" -elif [ -x /etc/X11/xinit/Xclients ]; then - exec /etc/X11/xinit/Xclients -elif [ -x /etc/X11/Xclients ]; then - exec /etc/X11/Xclients -else - exec xsm -fi diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh deleted file mode 100644 index f24be46dc4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/chooser.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# Author: Martin Schlemmer -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.5 2009/11/14 14:18:43 scarabeus Exp $ - -# Find a match for $XSESSION in /etc/X11/Sessions -GENTOO_SESSION="" -for x in /etc/X11/Sessions/* ; do - if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \ - = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then - GENTOO_SESSION=${x} - break - fi -done - -GENTOO_EXEC="" - -if [ -n "${XSESSION}" ]; then - if [ -f /etc/X11/Sessions/${XSESSION} ]; then - if [ -x /etc/X11/Sessions/${XSESSION} ]; then - GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}" - else - GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}" - fi - elif [ -n "${GENTOO_SESSION}" ]; then - if [ -x "${GENTOO_SESSION}" ]; then - GENTOO_EXEC="${GENTOO_SESSION}" - else - GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}" - fi - else - x="" - y="" - - for x in "${XSESSION}" \ - "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \ - "`echo ${XSESSION} | awk '{ print tolower($1) }'`" - do - # Fall through ... - if [ -x "`which ${x} 2>/dev/null`" ]; then - GENTOO_EXEC="`which ${x} 2>/dev/null`" - break - fi - done - fi -fi - -echo "${GENTOO_EXEC}" - - -# vim:ts=4 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh deleted file mode 100644 index 9775b07ff7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/startDM.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.4 2007/04/05 15:30:19 uberlord Exp $ - -# We need to source /etc/profile for stuff like $LANG to work -# bug #10190. -. /etc/profile - -. /etc/init.d/functions.sh - -# baselayout-1 compat -if ! type get_options >/dev/null 2>/dev/null ; then - [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh -fi - -# Great new Gnome2 feature, AA -# We enable this by default -export GDK_USE_XFT=1 - -export SVCNAME=xdm -EXEC="$(get_options service)" -NAME="$(get_options name)" -PIDFILE="$(get_options pidfile)" - -start-stop-daemon --start --exec ${EXEC} \ -${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \ -eerror "ERROR: could not start the Display Manager" - -# vim:ts=4 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch deleted file mode 100644 index 838171bb67..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/xinit.c b/xinit.c -index 42ff008..2ab817f 100644 ---- a/xinit.c -+++ b/xinit.c -@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group. - #endif - - /* For PRIO_PROCESS and setpriority() */ --#ifdef __DragonFly__ - #include - #include --#endif /* __DragonFly__ */ - - #include diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc deleted file mode 100644 index b4de252874..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/files/xserverrc +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/X -nolisten tcp "$@" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild deleted file mode 100644 index 2845869db2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xinit/xinit-1.3.0-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $ - -EAPI=3 - -inherit xorg-2 - -DESCRIPTION="X Window System initializer" - -LICENSE="${LICENSE} GPL-2" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" -IUSE="+minimal" - -RDEPEND=" - ! /etc/env.d/90xsession" - ewarn " env-update && source /etc/profile" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile deleted file mode 100644 index 9afd0f22d4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -LDLIBS = -lXmuu -lX11 -CFLAGS += -Wall -all: xset -install: - mkdir -p $(DESTDIR)/usr/bin - install -m 755 xset $(DESTDIR)/usr/bin/xset-mini diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c deleted file mode 100644 index 68d25ba1d2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/files/xset.c +++ /dev/null @@ -1,311 +0,0 @@ -/* - -Copyright 1985, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ -/* Modified by Stephen so keyboard rate is set using XKB extensions */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define ON 1 -#define OFF 0 - -#define SERVER_DEFAULT (-1) -#define DONT_CHANGE -2 - -#define ALL -1 - -#define XKBDDELAY_DEFAULT 660 -#define XKBDRATE_DEFAULT (1000/40) - -static char *progName; - -static int error_status = 0; - -static int is_number(char *arg, int maximum); -static void set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold); -static void set_repeat(Display *dpy, int key, int auto_repeat_mode); -static void usage(char *fmt, ...) _X_NORETURN; -static int local_xerror(Display *dpy, XErrorEvent *rep); - -static void xkbset_repeatrate(Display *dpy, int delay, int rate); - -int -main(int argc, char *argv[]) -{ - register char *arg; - register int i; - int acc_num, acc_denom, threshold; - - int key, auto_repeat_mode; - - char *disp = NULL; - Display *dpy; - - int miscpresent = 0; - int xkbpresent = 0; - - int xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion; - int xkbopcode, xkbevent, xkberror; - - progName = argv[0]; - if (argc < 2) { - usage(NULL, NULL); /* replace with window interface */ - } - - dpy = XOpenDisplay(disp); /* Open display and check for success */ - if (dpy == NULL) { - fprintf(stderr, "%s: unable to open display \"%s\"\n", - argv[0], XDisplayName(disp)); - exit(EXIT_FAILURE); - } - XSetErrorHandler(local_xerror); - for (i = 1; i < argc;) { - arg = argv[i++]; -/* Set pointer (mouse) settings: Acceleration and Threshold. */ - if (strcmp(arg, "m") == 0 || strcmp(arg, "mouse") == 0) { - acc_num = SERVER_DEFAULT; /* restore server defaults */ - acc_denom = SERVER_DEFAULT; - threshold = SERVER_DEFAULT; - if (i >= argc) { - set_mouse(dpy, acc_num, acc_denom, threshold); - break; - } - arg = argv[i]; - if (strcmp(arg, "default") == 0) { - i++; - } else if (*arg >= '0' && *arg <= '9') { - acc_denom = 1; - sscanf(arg, "%d/%d", &acc_num, &acc_denom); - i++; - if (i >= argc) { - set_mouse(dpy, acc_num, acc_denom, threshold); - break; - } - arg = argv[i]; - if (*arg >= '0' && *arg <= '9') { - threshold = atoi(arg); /* Set threshold as user specified. */ - i++; - } - } - set_mouse(dpy, acc_num, acc_denom, threshold); - } else if (strcmp(arg, "-r") == 0) { /* Turn off one or - all autorepeats */ - auto_repeat_mode = OFF; - key = ALL; /* None specified */ - arg = argv[i]; - if (i < argc) - if (is_number(arg, 255)) { - key = atoi(arg); - i++; - } - set_repeat(dpy, key, auto_repeat_mode); - } else if (strcmp(arg, "r") == 0) { /* Turn on one or - all autorepeats */ - auto_repeat_mode = ON; - key = ALL; /* None specified */ - arg = argv[i]; - if (i < argc) { - if (strcmp(arg, "on") == 0) { - i++; - } else if (strcmp(arg, "off") == 0) { /* ...except in - this case */ - auto_repeat_mode = OFF; - i++; - } - else if (strcmp(arg, "rate") == 0) { /* ...or this one. */ - int delay = 0, rate = 0; - - if (XkbQueryExtension(dpy, &xkbopcode, &xkbevent, - &xkberror, &xkbmajor, &xkbminor)) { - delay = XKBDDELAY_DEFAULT; - rate = XKBDRATE_DEFAULT; - xkbpresent = 1; - } - if (!xkbpresent && !miscpresent) - fprintf(stderr, - "server does not have extension for \"r rate\" option\n"); - i++; - arg = argv[i]; - if (i < argc) { - if (is_number(arg, 10000) && atoi(arg) > 0) { - delay = atoi(arg); - i++; - arg = argv[i]; - if (i < argc) { - if (is_number(arg, 255) && atoi(arg) > 0) { - rate = atoi(arg); - i++; - } - } - } - } - if (xkbpresent) { - xkbset_repeatrate(dpy, delay, 1000 / rate); - } - } - else if (is_number(arg, 255)) { - key = atoi(arg); - i++; - } - } - set_repeat(dpy, key, auto_repeat_mode); - } else - usage("unknown option %s", arg); - } - - XCloseDisplay(dpy); - - exit(error_status); /* Done. We can go home now. */ -} - -static int -is_number(char *arg, int maximum) -{ - register char *p; - - if (arg[0] == '-' && arg[1] == '1' && arg[2] == '\0') - return (1); - for (p = arg; isdigit(*p); p++) ; - if (*p || atoi(arg) > maximum) - return (0); - return (1); -} - -static void -set_mouse(Display *dpy, int acc_num, int acc_denom, int threshold) -{ - int do_accel = True, do_threshold = True; - - if (acc_num == DONT_CHANGE) /* what an incredible crock... */ - do_accel = False; - if (threshold == DONT_CHANGE) - do_threshold = False; - if (acc_num < 0) /* shouldn't happen */ - acc_num = SERVER_DEFAULT; - if (acc_denom <= 0) /* prevent divide by zero */ - acc_denom = SERVER_DEFAULT; - if (threshold < 0) - threshold = SERVER_DEFAULT; - XChangePointerControl(dpy, do_accel, do_threshold, acc_num, - acc_denom, threshold); - return; -} - -static void -set_repeat(Display *dpy, int key, int auto_repeat_mode) -{ - XKeyboardControl values; - - values.auto_repeat_mode = auto_repeat_mode; - if (key != ALL) { - values.key = key; - XChangeKeyboardControl(dpy, KBKey | KBAutoRepeatMode, &values); - } else { - XChangeKeyboardControl(dpy, KBAutoRepeatMode, &values); - } - return; -} - -static void -xkbset_repeatrate(Display *dpy, int delay, int interval) -{ - XkbDescPtr xkb = XkbAllocKeyboard(); - - if (!xkb) - return; - XkbGetControls(dpy, XkbRepeatKeysMask, xkb); - xkb->ctrls->repeat_delay = delay; - xkb->ctrls->repeat_interval = interval; - XkbSetControls(dpy, XkbRepeatKeysMask, xkb); - XkbFreeKeyboard(xkb, 0, True); -} - -/* This is the usage function */ - -static void -usage(char *fmt, ...) -{ - va_list ap; - - if (fmt) { - fprintf(stderr, "%s: ", progName); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n\n"); - } - - fprintf(stderr, "usage: %s option ...\n", progName); - fprintf(stderr, " To set mouse acceleration and threshold:\n"); - fprintf(stderr, "\t m [acc_mult[/acc_div] [thr]] m default\n"); - fprintf(stderr, " To set pixel colors:\n"); - fprintf(stderr, "\t-r [keycode] r off\n"); - fprintf(stderr, "\t r [keycode] r on\n"); - fprintf(stderr, "\t r rate [delay [rate]]\n"); - exit(EXIT_SUCCESS); -} - -static int -local_xerror(Display *dpy, XErrorEvent *rep) -{ - if (rep->request_code == X_SetFontPath && rep->error_code == BadValue) { - fprintf(stderr, - "%s: bad font path element (#%ld), possible causes are:\n", - progName, rep->resourceid); - fprintf(stderr, - " Directory does not exist or has wrong permissions\n"); - fprintf(stderr, " Directory missing fonts.dir\n"); - fprintf(stderr, " Incorrect font server address or syntax\n"); - } else if (rep->request_code == X_StoreColors) { - switch (rep->error_code) { - case BadAccess: - fprintf(stderr, - "%s: pixel not allocated read/write\n", progName); - break; - case BadValue: - fprintf(stderr, - "%s: cannot store in pixel 0x%lx, invalid pixel number\n", - progName, rep->resourceid); - break; - default: - XmuPrintDefaultErrorMessage(dpy, rep, stderr); - } - } else - XmuPrintDefaultErrorMessage(dpy, rep, stderr); - - error_status = -1; - - return (0); -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild deleted file mode 100644 index 4798900430..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xset-mini/xset-mini-1.2.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.3 2010/12/19 12:21:00 ssuominen Exp $ - -EAPI="4" - -inherit toolchain-funcs - -DESCRIPTION="X.Org xset application stripped down for just 'r' and 'm' commands" -HOMEPAGE="http://xorg.freedesktop.org/" -SRC_URI="" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="+minimal" - -RDEPEND="x11-libs/libXmu - x11-libs/libX11" -DEPEND="${RDEPEND}" - -S=${WORKDIR} - -src_unpack() { - cp "${FILESDIR}"/* ./ || die -} - -src_configure() { - tc-export CC -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/Manifest deleted file mode 100644 index 64fb90e8b0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST _1.0.2.orig.tar.gz 175083 SHA256 04f8c10b256e0914a38242fc4faa96d8ca64d15f546240ab8b3b491ec5e4fe33 SHA512 4d92abb61b1fa15a930bd213ada01d388c3daa603132207663b32c3b39f2137541ab145eae0e9980ce767aba77a332a4eba769ecfba92da15e90f495edf25440 WHIRLPOOL dca6970fd82cd8d3f4698d4e74b831a7ef72283e8d83f914195bb65335479ea0b0fe49f3f62fab15ff8899efecb01e583f2867be7dd8d9a2e98695f95085086c diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch deleted file mode 100644 index 6bb7fe919f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-print-uptime.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 6f41217..ee8f40c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.11 from Makefile.am. -+# Makefile.in generated by automake 1.11.1 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -488,7 +488,8 @@ distdir: $(DISTFILES) - fi; \ - done - -test -n "$(am__skip_mode_fix)" \ -- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ -+ || find "$(distdir)" -type d ! -perm -755 \ -+ -exec chmod u+rwx,go+rx {} \; -o \ - ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -@@ -532,17 +533,17 @@ dist dist-all: distdir - distcheck: dist - case '$(DIST_ARCHIVES)' in \ - *.tar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ -- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ -- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ -+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.xz*) \ - xz -dc $(distdir).tar.xz | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ -+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ - *.zip*) \ - unzip $(distdir).zip ;;\ - esac -diff --git a/configure b/configure -index f25c412..3b328b7 100755 ---- a/configure -+++ b/configure -@@ -4837,6 +4837,54 @@ else - fi - - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5 -+$as_echo_n "checking for clock_gettime in -lrt... " >&6; } -+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lrt $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char clock_gettime (); -+int -+main () -+{ -+return clock_gettime (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_rt_clock_gettime=yes -+else -+ ac_cv_lib_rt_clock_gettime=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 -+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } -+if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBRT 1 -+_ACEOF -+ -+ LIBS="-lrt $LIBS" -+ -+else -+ as_fn_error "Could not find librt" "$LINENO" 5 -+fi -+ -+ - - ac_config_files="$ac_config_files Makefile" - -diff --git a/configure.ac b/configure.ac -index d611b38..583cf97 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,6 +24,8 @@ LIBS="$LIBS -lsocket -lnsl"; break],[AC_MSG_ERROR([Could not find socket library - fi - AC_CHECK_FUNC([getaddrinfo],,[AC_MSG_ERROR([Could not find getaddrinfo library function])]) - -+AC_CHECK_LIB(rt, clock_gettime, , [AC_MSG_ERROR([Could not find librt])]) -+ - dnl AC_CHECK_HEADER(X11/X.h,[],[AC_MSG_ERROR([Could not find X11/X.h])]) - dnl AC_CHECK_HEADER(X11/Xlib.h,[],[AC_MSG_ERROR([Could not find X11/Xlib.h])]) - dnl AC_CHECK_HEADER(X11/extensions/security.h,[],[AC_MSG_ERROR([Could not find X11/extensions/secruity.h])],[#include ]) -diff --git a/main.c b/main.c -index b6b27a6..a8e1725 100644 ---- a/main.c -+++ b/main.c -@@ -45,6 +45,7 @@ bool denyallextensions = false; - bool interactive = false; - bool print_timestamps = false; - bool print_reltimestamps = false; -+bool print_uptime = false; - static bool buffered = false; - size_t maxshownlistlen = SIZE_MAX; - -@@ -390,7 +391,7 @@ char *strndup(const char *str,size_t n) { - } - #endif - --enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_VERSION, LO_HELP}; -+enum {LO_DEFAULT=0, LO_TIMESTAMPS, LO_RELTIMESTAMPS, LO_UPTIME, LO_VERSION, LO_HELP}; - static int long_only_option = 0; - static const struct option longoptions[] = { - {"display", required_argument, NULL, 'd'}, -@@ -412,6 +413,7 @@ static const struct option longoptions[] = { - {"version", no_argument, &long_only_option, LO_VERSION}, - {"timestamps", no_argument, &long_only_option, LO_TIMESTAMPS}, - {"relative-timestamps", no_argument, &long_only_option, LO_RELTIMESTAMPS}, -+ {"uptime", no_argument, &long_only_option, LO_UPTIME}, - {NULL, 0, NULL, 0} - }; - -@@ -526,6 +528,9 @@ argv[0]); - case LO_RELTIMESTAMPS: - print_reltimestamps = true; - break; -+ case LO_UPTIME: -+ print_uptime = true; -+ break; - } - break; - case ':': -diff --git a/parse.c b/parse.c -index 8bdd363..b808766 100644 ---- a/parse.c -+++ b/parse.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - #include "xtrace.h" -@@ -46,6 +47,7 @@ static inline unsigned int padded(unsigned int s) { - static void startline(struct connection *c, enum package_direction d, const char *format, ...) { - va_list ap; - struct timeval tv; -+ struct timespec ts; - - if( (print_timestamps || print_reltimestamps) - && gettimeofday(&tv, NULL) == 0 ) { -@@ -60,6 +62,10 @@ static void startline(struct connection *c, enum package_direction d, const char - (unsigned int)((tt - c->starttime)%1000)); - } - } -+ if( print_uptime && clock_gettime(CLOCK_MONOTONIC, &ts ) == 0 ) { -+ fprintf(out, "%lu.%03u ", (unsigned long)ts.tv_sec, -+ (unsigned int)(ts.tv_nsec/1000000)); -+ } - va_start(ap, format); - fprintf(out, "%03d:%c:", c->id, (d == TO_SERVER)?'<':'>'); - vfprintf(out, format, ap); -@@ -1749,4 +1755,3 @@ const struct extension *find_extension(const uint8_t *name,size_t len) { - - return NULL; - } -- -diff --git a/xtrace.h b/xtrace.h -index 95a725a..1c9bd4a 100644 ---- a/xtrace.h -+++ b/xtrace.h -@@ -46,6 +46,7 @@ extern bool denyallextensions; - extern size_t maxshownlistlen; - extern bool print_timestamps; - extern bool print_reltimestamps; -+extern bool print_uptime; - - #ifdef __GNUC__ - #define UNUSED __attribute__ ((unused)) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch deleted file mode 100644 index 80a2c7ed86..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/files/1.0.2-sync-extension.patch +++ /dev/null @@ -1,198 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index ba359c2..c611a14 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,7 +12,7 @@ dist_man_MANS = xtrace.1 - - MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in - --dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto -+dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto - - distclean-local: - -rm -rf $(srcdir)/autom4te.cache -diff --git a/Makefile.in b/Makefile.in -index 6f41217..a611645 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -204,7 +204,7 @@ xtrace_LDFLAGS = -Wl,-z,defs - noinst_HEADERS = xtrace.h parse.h stringlist.h translate.h - dist_man_MANS = xtrace.1 - MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in --dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto vidmode.proto xinerama.proto xinput.proto xkb.proto -+dist_pkgdata_DATA = all.proto bigfont.proto bigrequest.proto damage.proto dpms.proto errors.proto events.proto fixes.proto glx.proto mitshm.proto randr.proto render.proto requests.proto saver.proto setup.proto shape.proto sync.proto vidmode.proto xinerama.proto xinput.proto xkb.proto - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff --git a/all.proto b/all.proto -index b2fd22d..23d873d 100644 ---- a/all.proto -+++ b/all.proto -@@ -14,6 +14,7 @@ NEEDS "randr.proto" - NEEDS "render.proto" - NEEDS "saver.proto" - NEEDS "shape.proto" -+NEEDS "sync.proto" - NEEDS "vidmode.proto" - NEEDS "xinerama.proto" - NEEDS "xinput.proto" -diff --git a/sync.proto b/sync.proto -new file mode 100644 -index 0000000..e593c18 ---- /dev/null -+++ b/sync.proto -@@ -0,0 +1,154 @@ -+EXTENSION "SYNC" Sync -+USE core -+ -+REQUESTS -+Initialize RESPONDS -+ListSystemCounters RESPONDS -+CreateCounter -+SetCounter -+ChangeCounter -+QueryCounter RESPONDS -+DestroyCounter -+Await -+CreateAlarm -+ChangeAlarm -+QueryAlarm RESPONDS -+DestroyAlarm -+SetPriority -+GetPriority RESPONDS -+END -+ -+EVENTS -+CounterNotify -+AlarmNotify -+END -+ -+ERRORS -+BadCounter -+BadAlarm -+END -+ -+CONSTANTS alarm_state -+0 Active -+1 Inactive -+2 Destroyed -+END -+TYPE ALARM_STATE ENUM8 alarm_state -+ -+CONSTANTS test_type -+0 PositiveTransition -+1 NegativeTransition -+2 PositiveComparison -+3 NegativeComparison -+END -+TYPE TEST_TYPE ENUM32 test_type -+ -+REQUEST Initialize -+ 4 major-version UINT8 -+ 5 minor-version UINT8 -+END -+RESPONSE Initialize -+ 8 major-version UINT16 -+ 9 minor-version UINT16 -+END -+ -+REQUEST ListSystemCounters ALIASES Empty -+RESPONSE ListSystemCounters -+ 8 num-counters INT32 -+END -+ -+REQUEST CreateCounter -+ 4 counter UINT32 -+ 8 initial-value-high INT32 -+12 initial-value-low UINT32 -+END -+ -+REQUEST SetCounter -+ 4 counter UINT32 -+ 8 initial-value-high INT32 -+12 initial-value-low UINT32 -+END -+ -+REQUEST ChangeCounter -+ 4 counter UINT32 -+ 8 initial-value-high INT32 -+12 initial-value-low UINT32 -+END -+ -+REQUEST QueryCounter -+ 4 counter UINT32 -+END -+RESPONSE QueryCounter -+ 8 value-high INT32 -+12 value-low UINT32 -+END -+ -+REQUEST DestroyCounter -+ 4 counter UINT32 -+END -+ -+REQUEST Await ALIASES Empty -+ -+REQUEST CreateAlarm -+ 4 alarm UINT32 -+ 8 value-mask UINT32 -+END -+ -+REQUEST ChangeAlarm -+ 4 alarm UINT32 -+ 8 value-mask UINT32 -+END -+ -+REQUEST QueryAlarm -+ 4 alarm UINT32 -+END -+RESPONSE QueryAlarm -+ 8 counter UINT32 -+12 value-type UINT32 -+16 wait-value-high INT32 -+20 wait-value-low UINT32 -+24 test-type TEST_TYPE -+28 delta-high INT32 -+32 delta-low UINT32 -+36 events BOOL -+37 state ALARM_STATE -+END -+ -+REQUEST DestroyAlarm -+ 4 alarm UINT32 -+END -+ -+REQUEST SetPriority -+ 4 id UINT32 -+ 8 priority INT32 -+END -+ -+REQUEST GetPriority -+ 4 id UINT32 -+END -+RESPONSE GetPriority -+ 8 priority INT32 -+END -+ -+EVENT CounterNotify -+ 4 counter UINT32 -+ 8 wait-value-high INT32 -+12 wait-value-low UINT32 -+16 counter-value-high INT32 -+20 counter-value-low UINT32 -+24 time TIMESTAMP -+28 count INT16 -+30 destroyed BOOL -+END -+ -+EVENT AlarmNotify -+ 4 alarm UINT32 -+ 8 counter-value-high INT32 -+12 counter-value-low UINT32 -+16 alarm-value-high INT32 -+20 alarm-value-low UINT32 -+24 time TIMESTAMP -+28 state ALARM_STATE -+END -+ -+EOF diff --git a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild deleted file mode 100644 index 058250f47c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-apps/xtrace/xtrace-1.0.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 - -inherit eutils - -DESCRIPTION="X11 proxy that logs communication between a client and a server" -HOMEPAGE="http://xtrace.alioth.debian.org/" -SRC_URI="http://alioth.debian.org/frs/download.php/3201/${MY_PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-print-uptime.patch - epatch "${FILESDIR}"/${PV}-sync-extension.patch -} - -src_install() { - emake DESTDIR="${D}" install || die -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild deleted file mode 100644 index 12e60a3b12..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-drivers/xorg-drivers-1.12.ebuild,v 1.3 2012/03/24 16:30:25 chithanh Exp $ - -EAPI=4 - -DESCRIPTION="Meta package containing deps on all xorg drivers" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd" - -IUSE_INPUT_DEVICES=" - input_devices_acecad - input_devices_aiptek - input_devices_cmt - input_devices_elographics - input_devices_evdev - input_devices_fpit - input_devices_hyperpen - input_devices_joystick - input_devices_keyboard - input_devices_mouse - input_devices_mutouch - input_devices_penmount - input_devices_tslib - input_devices_vmmouse - input_devices_void - input_devices_synaptics - input_devices_wacom -" -IUSE_VIDEO_CARDS=" - video_cards_ark - video_cards_ast - video_cards_cirrus - video_cards_dummy - video_cards_epson - video_cards_fbdev - video_cards_geode - video_cards_glint - video_cards_i128 - video_cards_i740 - video_cards_intel - video_cards_mach64 - video_cards_mga - video_cards_neomagic - video_cards_newport - video_cards_nouveau - video_cards_nv - video_cards_omapfb - video_cards_qxl - video_cards_r128 - video_cards_radeon - video_cards_s3 - video_cards_savage - video_cards_siliconmotion - video_cards_sis - video_cards_sunbw2 - video_cards_suncg14 - video_cards_suncg3 - video_cards_suncg6 - video_cards_sunffb - video_cards_sunleo - video_cards_suntcx - video_cards_tdfx - video_cards_tga - video_cards_trident - video_cards_v4l - video_cards_vesa - video_cards_via - video_cards_virtualbox - video_cards_vmware - video_cards_voodoo - video_cards_fglrx - video_cards_nvidia -" - -IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" - -PDEPEND=" - input_devices_acecad? ( x11-drivers/xf86-input-acecad ) - input_devices_aiptek? ( x11-drivers/xf86-input-aiptek ) - input_devices_cmt? ( x11-drivers/xf86-input-cmt ) - input_devices_elographics? ( x11-drivers/xf86-input-elographics ) - input_devices_evdev? ( x11-drivers/xf86-input-evdev ) - input_devices_fpit? ( x11-drivers/xf86-input-fpit ) - input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen ) - input_devices_joystick? ( x11-drivers/xf86-input-joystick ) - input_devices_keyboard? ( x11-drivers/xf86-input-keyboard ) - input_devices_mouse? ( x11-drivers/xf86-input-mouse ) - input_devices_mutouch? ( x11-drivers/xf86-input-mutouch ) - input_devices_penmount? ( x11-drivers/xf86-input-penmount ) - input_devices_tslib? ( x11-drivers/xf86-input-tslib ) - input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) - input_devices_void? ( x11-drivers/xf86-input-void ) - input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) - input_devices_wacom? ( x11-drivers/xf86-input-wacom ) - - video_cards_ark? ( x11-drivers/xf86-video-ark ) - video_cards_ast? ( x11-drivers/xf86-video-ast ) - video_cards_cirrus? ( x11-drivers/xf86-video-cirrus ) - video_cards_dummy? ( x11-drivers/xf86-video-dummy ) - video_cards_fbdev? ( x11-drivers/xf86-video-fbdev ) - video_cards_geode? ( x11-drivers/xf86-video-geode ) - video_cards_glint? ( x11-drivers/xf86-video-glint ) - video_cards_i128? ( x11-drivers/xf86-video-i128 ) - video_cards_i740? ( x11-drivers/xf86-video-i740 ) - video_cards_intel? ( x11-drivers/xf86-video-intel ) - video_cards_mach64? ( x11-drivers/xf86-video-mach64 ) - video_cards_mga? ( x11-drivers/xf86-video-mga ) - video_cards_neomagic? ( x11-drivers/xf86-video-neomagic ) - video_cards_newport? ( x11-drivers/xf86-video-newport ) - video_cards_nouveau? ( x11-drivers/xf86-video-nouveau ) - video_cards_nv? ( x11-drivers/xf86-video-nv ) - video_cards_omapfb? ( x11-drivers/xf86-video-omapfb ) - video_cards_qxl? ( x11-drivers/xf86-video-qxl ) - video_cards_nvidia? ( x11-drivers/nvidia-drivers ) - video_cards_fglrx? ( x11-drivers/ati-drivers ) - video_cards_r128? ( x11-drivers/xf86-video-r128 ) - video_cards_radeon? ( x11-drivers/xf86-video-ati ) - video_cards_s3? ( x11-drivers/xf86-video-s3 ) - video_cards_savage? ( x11-drivers/xf86-video-savage ) - video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion ) - video_cards_sis? ( x11-drivers/xf86-video-sis ) - video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 ) - video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 ) - video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 ) - video_cards_sunffb? ( x11-drivers/xf86-video-sunffb ) - video_cards_sunleo? ( x11-drivers/xf86-video-sunleo ) - video_cards_suntcx? ( x11-drivers/xf86-video-suntcx ) - video_cards_tdfx? ( x11-drivers/xf86-video-tdfx ) - video_cards_tga? ( x11-drivers/xf86-video-tga ) - video_cards_trident? ( x11-drivers/xf86-video-trident ) - video_cards_v4l? ( x11-drivers/xf86-video-v4l ) - video_cards_vesa? ( x11-drivers/xf86-video-vesa ) - video_cards_via? ( x11-drivers/xf86-video-openchrome ) - video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox ) - video_cards_vmware? ( x11-drivers/xf86-video-vmware ) - video_cards_voodoo? ( x11-drivers/xf86-video-voodoo ) - - !x11-drivers/xf86-input-citron - !<=x11-drivers/xf86-video-apm-1.2.3 - !<=x11-drivers/xf86-video-chips-1.2.4 - !x11-drivers/xf86-video-cyrix - !x11-drivers/xf86-video-impact - !x11-drivers/xf86-video-nsc - !<=x11-drivers/xf86-video-rendition-4.2.4 - !<=x11-drivers/xf86-video-s3virge-1.10.4 - !<=x11-drivers/xf86-video-sisusb-0.9.4 - !x11-drivers/xf86-video-sunbw2 - !<=x11-drivers/xf86-video-tseng-1.2.4 -" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/Manifest deleted file mode 100644 index 13178d6246..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xorg-server-1.12.4.tar.bz2 5444761 SHA256 8ac07c35306ba3fb3c0972722dd4e919303039eca1d40ac7862560e0b2c94cf7 SHA512 70997e8ba4f948829c158e52924753c5691a783dd14e5a86fdce4fc601638dd4e0b281590876b0315a303bf8d5195bdf43ede7113d1d569415a41ab03d938d85 WHIRLPOOL bfee61329ca85ecedb991ca933de6e3a1e94e34a04d9a723a0e9c90a36e067824701c38e8a0034498ed28dfca82eb653d1e1ab5c0223020f5da69cbbf80bbf98 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch deleted file mode 100644 index e00f555cd0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-allow-root-none.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dix/window.c b/dix/window.c -index 823294b..d293e90 100644 ---- a/dix/window.c -+++ b/dix/window.c -@@ -1083,12 +1083,8 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client) - if (pixID == None) { - if (pWin->backgroundState == BackgroundPixmap) - (*pScreen->DestroyPixmap) (pWin->background.pixmap); -- if (!pWin->parent) -- SetRootWindowBackground(pWin, pScreen, &index2); -- else { -- pWin->backgroundState = XaceBackgroundNoneState(pWin); -- pWin->background.pixel = pScreen->whitePixel; -- } -+ pWin->backgroundState = XaceBackgroundNoneState(pWin); -+ pWin->background.pixel = pScreen->whitePixel; - } - else if (pixID == ParentRelative) { - if (pWin->parent && --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch deleted file mode 100644 index c357c03ad8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch +++ /dev/null @@ -1,333 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f94b88c..03beb36 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -515,9 +515,9 @@ AC_MSG_RESULT([$FONTPATH]) - AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]), - [ XKBPATH="$withval" ], - [ XKBPATH="${datadir}/X11/xkb" ]) --AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]), -+AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${localstatedir}/cache/xkb)]), - [ XKBOUTPUT="$withval" ], -- [ XKBOUTPUT="compiled" ]) -+ [ XKBOUTPUT="${localstatedir}/cache/xkb" ]) - AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], - [Keyboard ruleset (default: base/evdev)]), - [ XKB_DFLT_RULES="$withval" ], -@@ -1202,7 +1202,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir]) - dnl Make sure XKM_OUTPUT_DIR is an absolute path - XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` - if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then -- XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -+ AC_MSG_ERROR([xkb-output must be an absolute path.]) - fi - - dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed -diff --git a/xkb/README.compiled b/xkb/README.compiled -index 71caa2f..a4a2ae0 100644 ---- a/xkb/README.compiled -+++ b/xkb/README.compiled -@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients. The X server - or some other tool might destroy or replace the files in this directory, - so it is not a safe place to store compiled keymaps for long periods of - time. The default keymap for any server is usually stored in: -- X-default.xkm --where is the display number of the server in question, which makes --it possible for several servers *on the same host* to share the same --directory. -+ server-.xkm -+ -+where is the SHA1 hash of keymap source, so that compiled -+keymap of different keymap sources are stored in different files. - - Unless the X server is modified, sharing this directory between servers on - different hosts could cause problems. -diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c -index 1961423..411b677 100644 ---- a/xkb/ddxLoad.c -+++ b/xkb/ddxLoad.c -@@ -30,6 +30,12 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - - #include - -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+# include -+#else /* Use OpenSSL's libcrypto */ -+# include /* buggy openssl/sha.h wants size_t */ -+# include -+#endif - #include - #include - #include -@@ -43,20 +49,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - #define XKBSRV_NEED_FILE_FUNCS - #include - #include -+#include - #include "xkb.h" - -- /* -- * If XKM_OUTPUT_DIR specifies a path without a leading slash, it is -- * relative to the top-level XKB configuration directory. -- * Making the server write to a subdirectory of that directory -- * requires some work in the general case (install procedure -- * has to create links to /var or somesuch on many machines), -- * so we just compile into /usr/tmp for now. -- */ --#ifndef XKM_OUTPUT_DIR --#define XKM_OUTPUT_DIR "compiled/" --#endif -- - #define PRE_ERROR_MSG "\"The XKEYBOARD keymap compiler (xkbcomp) reports:\"" - #define ERROR_PREFIX "\"> \"" - #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" -@@ -166,13 +161,56 @@ OutputDirectory(char *outdir, size_t size) - } - - static Bool -+Sha1Asc(char sha1Asc[SHA_DIGEST_LENGTH*2+1], const char * input) -+{ -+ int i; -+ unsigned char sha1[SHA_DIGEST_LENGTH]; -+ -+#ifdef HAVE_SHA1_IN_LIBMD /* Use libmd for SHA1 */ -+ SHA1_CTX ctx; -+ -+ SHA1Init (&ctx); -+ SHA1Update (&ctx, input, strlen(input)); -+ SHA1Final (sha1, &ctx); -+#else /* Use OpenSSL's libcrypto */ -+ SHA_CTX ctx; -+ int success; -+ -+ success = SHA1_Init (&ctx); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Update (&ctx, input, strlen(input)); -+ if (! success) -+ return BadAlloc; -+ -+ success = SHA1_Final (sha1, &ctx); -+ if (! success) -+ return BadAlloc; -+#endif -+ -+ /* convert sha1 to sha1_asc */ -+ for(i=0; i nameRtrnLen) && nameRtrn) { -+ ErrorF("[xkb] nameRtrn too small to hold xkmfile name\n"); -+ return FALSE; -+ } -+ strncpy(nameRtrn, xkmfile, nameRtrnLen); -+ -+ /* if the xkm file already exists, reuse it */ -+ canonicalXkmFileName = Xprintf("%s%s.xkm", xkm_output_dir, xkmfile); -+ if (access(canonicalXkmFileName, R_OK) == 0) { -+ /* yes, we can reuse the old xkm file */ -+ LogMessage(X_INFO, "XKB: reuse xkmfile %s\n", canonicalXkmFileName); -+ result = TRUE; -+ goto _ret; -+ } -+ LogMessage(X_INFO, "XKB: generating xkmfile %s\n", canonicalXkmFileName); -+ -+ /* continue to call xkbcomp to compile the keymap. to avoid race -+ condition, we compile it to a tmpfile then rename it to -+ xkmfile */ -+ - #ifdef WIN32 - strcpy(tmpname, Win32TempDir()); - strcat(tmpname, "\\xkb_XXXXXX"); -@@ -214,15 +304,21 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, - } - } - -+ if ( (tmpXkmFile = tempnam(xkm_output_dir, NULL)) == NULL ) { -+ ErrorF("[xkb] Can't generate temp xkm file name"); -+ result = FALSE; -+ goto _ret; -+ } -+ - if (asprintf(&buf, - "\"%s%sxkbcomp\" -w %d %s -xkm \"%s\" " -- "-em1 %s -emp %s -eml %s \"%s%s.xkm\"", -+ "-em1 %s -emp %s -eml %s \"%s\"", - xkbbindir, xkbbindirsep, - ((xkbDebugFlags < 2) ? 1 : - ((xkbDebugFlags > 10) ? 10 : (int) xkbDebugFlags)), -- xkbbasedirflag ? xkbbasedirflag : "", xkmfile, -+ xkbbasedirflag ? xkbbasedirflag : "", xkbfile, - PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1, -- xkm_output_dir, keymap) == -1) -+ tmpXkmFile) == -1) - buf = NULL; - - free(xkbbasedirflag); -@@ -233,6 +329,11 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, - return FALSE; - } - -+ /* there's a potential race condition between calling tempnam() -+ and invoking xkbcomp to write the result file (potential temp -+ file name conflicts), but since xkbcomp is a standalone -+ program, we have to live with this */ -+ - #ifndef WIN32 - out = Popen(buf, "w"); - #else -@@ -240,32 +341,41 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, - #endif - - if (out != NULL) { --#ifdef DEBUG -- if (xkbDebugFlags) { -- ErrorF("[xkb] XkbDDXCompileKeymapByNames compiling keymap:\n"); -- XkbWriteXKBKeymapForNames(stderr, names, xkb, want, need); -+ /* write XKBKeyMapBuf to xkbcomp */ -+ if (EOF==fputs(xkbKeyMapBuf, out)) -+ { -+ ErrorF("[xkb] Sending keymap to xkbcomp failed\n"); -+ result = FALSE; -+ goto _ret; - } --#endif -- XkbWriteXKBKeymapForNames(out, names, xkb, want, need); - #ifndef WIN32 - if (Pclose(out) == 0) - #else - if (fclose(out) == 0 && System(buf) >= 0) - #endif - { -+ /* xkbcomp success */ - if (xkbDebugFlags) - DebugF("[xkb] xkb executes: %s\n", buf); -- if (nameRtrn) { -- strlcpy(nameRtrn, keymap, nameRtrnLen); -+ /* if canonicalXkmFileName already exists now, we simply -+ overwrite it, this is OK */ -+ ret = rename(tmpXkmFile, canonicalXkmFileName); -+ if (0 != ret) { -+ ErrorF("[xkb] Can't rename %s to %s, error: %s\n", -+ tmpXkmFile, canonicalXkmFileName, -+ strerror(errno)); -+ -+ /* in case of error, don't unlink tmpXkmFile, leave it -+ for debugging */ -+ -+ result = FALSE; -+ goto _ret; - } -- free(buf); --#ifdef WIN32 -- unlink(tmpname); --#endif -- return TRUE; -+ result = TRUE; -+ goto _ret; - } - else -- LogMessage(X_ERROR, "Error compiling keymap (%s)\n", keymap); -+ LogMessage(X_ERROR, "Error compiling keymap (%s)\n", xkbfile); - #ifdef WIN32 - /* remove the temporary file */ - unlink(tmpname); -@@ -280,8 +390,15 @@ XkbDDXCompileKeymapByNames(XkbDescPtr xkb, - } - if (nameRtrn) - nameRtrn[0] = '\0'; -+ result = FALSE; -+ -+_ret: -+ if (tmpXkmFile) -+ free(tmpXkmFile); -+ if (canonicalXkmFileName) -+ xfree(canonicalXkmFileName); - free(buf); -- return FALSE; -+ return result; - } - - static FILE * -@@ -368,7 +485,6 @@ XkbDDXLoadKeymapByNames(DeviceIntPtr keybd, - (*xkbRtrn)->defined); - } - fclose(file); -- (void) unlink(fileName); - return (need | want) & (~missing); - } - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch deleted file mode 100644 index 95778b10b1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-chromium-mouse-accel-profile.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/dix/ptrveloc.c b/dix/ptrveloc.c -index 30e14b1..ea447a8 100644 ---- a/dix/ptrveloc.c -+++ b/dix/ptrveloc.c -@@ -863,6 +863,82 @@ PowerProfile(DeviceIntPtr dev, - } - - /** -+ * Computes Acceleration based on the Chromium acceleration algorithm. -+ * This algorithm was taken from our Chromium MultiTouch touchpad driver. -+ * We think about acceleration curve taking an input velocity and returning -+ * an output velocity. The shape of the curve is parabolic at the low end -+ * and then at a certain point, it continues straight. The curve operates -+ * in units of inches/second. -+ * -+ * Note that X acceleration profile functions operate using very different -+ * units, generally, so a little bit of gynmastics is required to fit our -+ * curve to the X convention. -+ * -+ * Inputs: -+ * velocity: mouse velocity in inches per millisecond[1] -+ * threshold: if greater than 0, the X cutoff in 100ths of an inch/sec -+ * acc: multiplier applied to output, for user's speed preferences, multiplied -+ * by screen resolution (DPI). A good default for the user prefs is 1.0. -+ * A good default for the screen resolution is 125.[2] -+ * -+ * Outputs: -+ * Returns a multiplier m such that m * mouse counts = screen pixels. -+ * -+ * [1] To get this value to be inches per millisecond, the following xinput -+ * properties must be set accordingly: -+ * "Device Accel Velocity Scaling": 1.0 -+ * "Device Accel Constant Deceleration": CPI (Counts per inch) -+ * -+ * [2] To set this value for a particular device, do: -+ * xinput set-ptr-feedback 0 acc 1 # 0=thresh, acc/1 = num/den -+ * or for all devices(?): -+ * xset m acc/1 0 # num/den thresh -+ * -+ * Note about CPI: CPI is the resolution of the mouse. Many common mice at the -+ * time of writing have a CPI of approximately 1000, so that may be a good -+ * default value. -+ */ -+static double -+ChromiumMouseProfile( -+ DeviceIntPtr dev, -+ DeviceVelocityPtr vel, -+ double velocity, -+ double threshold, -+ double acc) -+{ -+ /* Parabola: v_out = a * v_in^2 + b * v_in -+ Line: v_out = m * v_in + b */ -+ /* These three constants seem to work well */ -+ const float kParabolaA = 1.3; -+ const float kParabolaB = 0.2; -+ /* v_in where we switch from parab. to line: */ -+ const float kCutoffX = threshold > 0 ? threshold * 0.01 : 8.0; -+ const float kCutoffY = -+ kParabolaA * kCutoffX * kCutoffX + kParabolaB * kCutoffX; -+ /* d/dx (ax^2 + bx) = 2ax + 1 */ -+ const float kLineM = 2.0 * kParabolaA * kCutoffX + kParabolaB; -+ const float kLineB = kCutoffY - kCutoffX * kLineM; -+ -+ float inch_per_sec = velocity * 1000.0; // inches/ms -> inches/s -+ float new_inch_per_sec; -+ if (velocity == 0.0) -+ return 1.0; -+ -+ /* acc defaults to a very small value, so if we see it, pick a better -+ default. It probably means that the user doesn't know how to properly -+ use this accel profile, but it sucks if we cause super slow mouse -+ movement. */ -+ if (acc < 50.0) -+ acc = 225.0; -+ -+ if (inch_per_sec <= kCutoffX) -+ return (kParabolaA * inch_per_sec + kParabolaB) * acc; -+ else -+ new_inch_per_sec = kLineM * inch_per_sec + kLineB; -+ return acc * new_inch_per_sec / inch_per_sec; -+} -+ -+/** - * just a smooth function in [0..1] -> [0..1] - * - point symmetry at 0.5 - * - f'(0) = f'(1) = 0 -@@ -988,6 +1064,8 @@ GetAccelerationProfile(DeviceVelocityPtr vel, int profile_num) - return LinearProfile; - case AccelProfileSmoothLimited: - return SmoothLimitedProfile; -+ case AccelProfileChromiumMouse: -+ return ChromiumMouseProfile; - case AccelProfileNone: - return NoProfile; - default: -diff --git a/include/ptrveloc.h b/include/ptrveloc.h -index 6f999a8..979bd30 100644 ---- a/include/ptrveloc.h -+++ b/include/ptrveloc.h -@@ -38,7 +38,8 @@ - #define AccelProfilePower 5 - #define AccelProfileLinear 6 - #define AccelProfileSmoothLimited 7 --#define AccelProfileLAST AccelProfileSmoothLimited -+#define AccelProfileChromiumMouse 8 -+#define AccelProfileLAST AccelProfileChromiumMouse - - /* fwd */ - struct _DeviceVelocityRec; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch deleted file mode 100644 index 9cb11caa74..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-monotonic-clock-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f1c50bbaf22a272b44d36441811ef9d8483838ca Mon Sep 17 00:00:00 2001 -From: David James -Date: Wed, 19 May 2010 09:24:39 -0700 -Subject: [PATCH] Discover monotonic clock using compile-time check. - -When xorg-xserver is being cross-compiled, there is currently no way -for us to detect whether the monotonic clock is available on the -target system, because we aren't able to run a test program. Currently, in -this situation, we default to not use the monotonic clock. One problem -with this situation is that the user will be treated as idle when the date -is updated. - -To fix this situation, we now use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: David James ---- - configure.ac | 14 ++++++-------- - 1 files changed, 6 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1c7875e..36f7bdd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -935,19 +935,17 @@ if ! test "x$have_clock_gettime" = xno; then - CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" - fi - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include -+#include - - int main(int argc, char *argv[[]]) { -- struct timespec tp; -- -- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) -+ #error No monotonic clock -+#endif - return 0; -- else -- return 1; - } -- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no], -- [MONOTONIC_CLOCK="cross compiling"]) -+ ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) - - LIBS="$LIBS_SAVE" - CPPFLAGS="$CPPFLAGS_SAVE" --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch deleted file mode 100644 index 18e265be78..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-nohwaccess.patch +++ /dev/null @@ -1,63 +0,0 @@ -Subject: [PATCH] xorg-server: add the ability to run without root privileges. - -Of course we'll need more changes in our startup scripts for this to work. ---- - hw/xfree86/os-support/linux/lnx_init.c | 7 +++++++ - hw/xfree86/os-support/linux/lnx_video.c | 4 ++++ - 2 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c -index 2176985..70c99b0 100644 ---- a/hw/xfree86/os-support/linux/lnx_init.c -+++ b/hw/xfree86/os-support/linux/lnx_init.c -@@ -39,6 +39,7 @@ - #include - - static Bool KeepTty = FALSE; -+Bool NoHwAccess = FALSE; - static int activeVT = -1; - - static char vtname[11]; -@@ -314,6 +315,11 @@ xf86ProcessArgument(int argc, char *argv[], int i) - return 1; - } - -+ if (!strcmp(argv[i], "-nohwaccess")) -+ { -+ NoHwAccess = TRUE; -+ return(1); -+ } - if ((argv[i][0] == 'v') && (argv[i][1] == 't')) { - if (sscanf(argv[i], "vt%2d", &xf86Info.vtno) == 0) { - UseMsg(); -@@ -331,4 +337,5 @@ xf86UseMsg(void) - ErrorF("vtXX use the specified VT number\n"); - ErrorF("-keeptty "); - ErrorF("don't detach controlling tty (for debugging only)\n"); -+ ErrorF("-nohwaccess don't access hardware ports directly\n"); - } -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index 0d91f7a..42f42d6 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -46,6 +46,7 @@ - #include - #endif - -+extern Bool NoHwAccess; - static Bool ExtendedEnabled = FALSE; - - #ifdef __ia64__ -@@ -488,6 +489,9 @@ xf86EnableIO(void) - int fd; - unsigned int ioBase_phys; - #endif -+ /* Fake it... */ -+ if (NoHwAccess) -+ return TRUE; - - if (ExtendedEnabled) - return TRUE; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch deleted file mode 100644 index c337550e4e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-refcnt-glxdrawable.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 37093bb245ccd57b7ed65e71163ea5b65e949521 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Fri, 10 Dec 2010 11:30:34 +0000 -Subject: [PATCH] glx: Refcnt the GLXDrawable to avoid use after free with multiple FreeResource -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Although there may be more than one resource handles pointing to the -Drawable, we only want to destroy it once and only reference the -resource which may have just been deleted on the first instance. - -v2: Apply fixes and combine with another bug fix from Michel Dänzer, - https://bugs.freedesktop.org/show_bug.cgi?id=28181 - -Signed-off-by: Chris Wilson -Cc: Kristian Høgsberg -Cc: Michel Dänzer ---- - glx/glxcmds.c | 24 +++++++++++++++--------- - glx/glxdrawable.h | 3 +++ - glx/glxext.c | 19 ++++++++++--------- - 3 files changed, 28 insertions(+), 18 deletions(-) - -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index de9c3f0..b3ea784 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -507,6 +507,7 @@ __glXGetDrawable(__GLXcontext * glxc, GLXDrawable drawId, ClientPtr client, - *error = BadAlloc; - return NULL; - } -+ pGlxDraw->refcnt++; - - return pGlxDraw; - } -@@ -1127,8 +1128,10 @@ __glXDrawableInit(__GLXdrawable * drawable, - drawable->pDraw = pDraw; - drawable->type = type; - drawable->drawId = drawId; -+ drawable->otherId = 0; - drawable->config = config; - drawable->eventMask = 0; -+ drawable->refcnt = 0; - - return GL_TRUE; - } -@@ -1158,15 +1161,18 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen * pGlxScreen, - pGlxDraw->destroy(pGlxDraw); - return BadAlloc; - } -- -- /* -- * Windows aren't refcounted, so track both the X and the GLX window -- * so we get called regardless of destruction order. -- */ -- if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW && -- !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) { -- pGlxDraw->destroy(pGlxDraw); -- return BadAlloc; -+ pGlxDraw->refcnt++; -+ -+ if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW) { -+ /* Add the glx drawable under the XID of the underlying X drawable -+ * too. That way we'll get a callback in DrawableGone and can -+ * clean up properly when the drawable is destroyed. */ -+ if (!AddResource(drawableId, __glXDrawableRes, pGlxDraw)) { -+ pGlxDraw->destroy (pGlxDraw); -+ return BadAlloc; -+ } -+ pGlxDraw->refcnt++; -+ pGlxDraw->otherId = drawableId; - } - - return Success; -diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h -index 2a365c5..80c3234 100644 ---- a/glx/glxdrawable.h -+++ b/glx/glxdrawable.h -@@ -51,8 +51,11 @@ struct __GLXdrawable { - void (*waitX) (__GLXdrawable *); - void (*waitGL) (__GLXdrawable *); - -+ int refcnt; /* number of resources handles referencing this */ -+ - DrawablePtr pDraw; - XID drawId; -+ XID otherId; /* for glx1.3 we need to track the original Drawable as well */ - - /* - ** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or -diff --git a/glx/glxext.c b/glx/glxext.c -index 4bd5d6b..77db8b0 100644 ---- a/glx/glxext.c -+++ b/glx/glxext.c -@@ -123,17 +123,18 @@ DrawableGone(__GLXdrawable * glxPriv, XID xid) - { - __GLXcontext *c, *next; - -- if (glxPriv->type == GLX_DRAWABLE_WINDOW) { -- /* If this was created by glXCreateWindow, free the matching resource */ -- if (glxPriv->drawId != glxPriv->pDraw->id) { -- if (xid == glxPriv->drawId) -- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE); -- else -- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); -- } -- /* otherwise this window was implicitly created by MakeCurrent */ -+ if (glxPriv->otherId) { -+ XID other = glxPriv->otherId; -+ glxPriv->otherId = 0; -+ if (xid == other) -+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE); -+ else -+ FreeResourceByType(other, __glXDrawableRes, TRUE); - } - -+ if (--glxPriv->refcnt) -+ return True; -+ - for (c = glxAllContexts; c; c = next) { - next = c->next; - if (c->isCurrent && (c->drawPriv == glxPriv || c->readPriv == glxPriv)) { --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch deleted file mode 100644 index 0355d0ba06..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.11.99.902-xserver-bg-none-root.patch +++ /dev/null @@ -1,101 +0,0 @@ -diff --git a/dix/window.c b/dix/window.c -index d293e90..c33514b 100644 ---- a/dix/window.c -+++ b/dix/window.c -@@ -550,9 +550,13 @@ InitRootWindow(WindowPtr pWin) - pWin->optional->cursor = rootCursor; - rootCursor->refcnt++; - -+ pWin->backingStore = defaultBackingStore; -+ pWin->forcedBS = (defaultBackingStore != NotUseful); -+ - if (party_like_its_1989) { - MakeRootTile(pWin); - backFlag |= CWBackPixmap; -+ (*pScreen->ChangeWindowAttributes)(pWin, backFlag); - } - else if (pScreen->canDoBGNoneRoot && bgNoneRoot) { - pWin->backgroundState = XaceBackgroundNoneState(pWin); -@@ -560,19 +564,9 @@ InitRootWindow(WindowPtr pWin) - backFlag |= CWBackPixmap; - } - else { -- pWin->backgroundState = BackgroundPixel; -- if (whiteRoot) -- pWin->background.pixel = pScreen->whitePixel; -- else -- pWin->background.pixel = pScreen->blackPixel; -- backFlag |= CWBackPixel; -+ /* nothing, handled in xf86CreateRootWindow */ - } - -- pWin->backingStore = defaultBackingStore; -- pWin->forcedBS = (defaultBackingStore != NotUseful); -- /* We SHOULD check for an error value here XXX */ -- (*pScreen->ChangeWindowAttributes) (pWin, backFlag); -- - MapWindow(pWin, serverClient); - } - -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index 5263b5f..eb530bb 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -60,6 +60,7 @@ - #ifdef XFreeXDGA - #include "dgaproc.h" - #endif -+#include "xace.h" - - #define XF86_OS_PRIVS - #include "xf86.h" -@@ -308,6 +309,7 @@ xf86CreateRootWindow(WindowPtr pWin) - int ret = TRUE; - int err = Success; - ScreenPtr pScreen = pWin->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RootWinPropPtr pProp; - CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) - dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); -@@ -357,6 +359,15 @@ xf86CreateRootWindow(WindowPtr pWin) - } - } - -+ if (pScrn->canDoBGNoneRoot) { -+ pWin->backgroundState = XaceBackgroundNoneState(pWin); -+ pWin->background.pixel = pScreen->whitePixel; -+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore); -+ } else { -+ pWin->background.pixel = pScreen->blackPixel; -+ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore); -+ } -+ - DebugF("xf86CreateRootWindow() returns %d\n", ret); - return ret; - } -diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index e2ca558..e1c5331 100644 ---- a/hw/xfree86/common/xf86str.h -+++ b/hw/xfree86/common/xf86str.h -@@ -497,7 +497,7 @@ typedef struct _confdrirec { - } confDRIRec, *confDRIPtr; - - /* These values should be adjusted when new fields are added to ScrnInfoRec */ --#define NUM_RESERVED_INTS 16 -+#define NUM_RESERVED_INTS 15 - #define NUM_RESERVED_POINTERS 14 - #define NUM_RESERVED_FUNCS 10 - -@@ -758,6 +758,9 @@ typedef struct _ScrnInfoRec { - ClockRangePtr clockRanges; - int adjustFlags; - -+ /* -nr support */ -+ int canDoBGNoneRoot; -+ - /* - * These can be used when the minor ABI version is incremented. - * The NUM_* parameters must be reduced appropriately to keep the --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch deleted file mode 100644 index df7c4f304f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-add-maxvt-flag.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Yoshiki IGUCHI -Date: Mon, 12 Nov 2012 14:21:28 +0800 -Subject: [PATCH] Add the flag to specify the maximum VT number the user - can switch to. - -This CL adds the flag named '-maxvt', which specify the maximum VT -number the user can switch to with Ctrl-Alt-Fn keys. - -BUG=chromium:153961 -TEST=manual ---- - hw/xfree86/common/xf86Events.c | 4 +++- - os/utils.c | 12 ++++++++++++ - 2 files changed, 15 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c -index 3ad34b5..cfe92f0 100644 ---- a/hw/xfree86/common/xf86Events.c -+++ b/hw/xfree86/common/xf86Events.c -@@ -100,6 +100,8 @@ Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for - - extern fd_set EnabledDevices; - -+extern int maxVT; -+ - #ifdef XF86PM - extern void (*xf86OSPMClose) (void); - #endif -@@ -198,7 +200,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) - if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { - int vtno = *((int *) arg); - -- if (vtno != xf86Info.vtno) { -+ if ((maxVT < 0 || vtno <= maxVT) && vtno != xf86Info.vtno) { - if (!xf86VTActivate(vtno)) { - ErrorF("Failed to switch from vt%02d to vt%02d: %s\n", - xf86Info.vtno, vtno, strerror(errno)); -diff --git a/os/utils.c b/os/utils.c -index 04bcbc6..8b19838 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -202,6 +202,8 @@ Bool PanoramiXExtensionDisabledHack = FALSE; - - int auditTrailLevel = 1; - -+int maxVT = -1; -+ - char *SeatId = NULL; - - #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) -@@ -502,6 +504,7 @@ UseMsg(void) - #ifdef RLIMIT_STACK - ErrorF("-ls int limit stack space to N Kb\n"); - #endif -+ ErrorF("-maxvt int maximum switchable VT, -1 to permit any\n"); - ErrorF("-nolock disable the locking mechanism\n"); - ErrorF("-nolisten string don't listen on protocol\n"); - ErrorF("-noreset don't reset after last client exists\n"); -@@ -734,6 +737,15 @@ ProcessCommandLine(int argc, char *argv[]) - UseMsg(); - } - #endif -+ else if (strcmp(argv[i], "-maxvt") == 0) { -+ if (++i < argc) { -+ maxVT = atoi(argv[i]); -+ if (maxVT < 0) -+ maxVT = -1; -+ } -+ else -+ UseMsg(); -+ } - else if (strcmp(argv[i], "-nolock") == 0) { - #if !defined(WIN32) && !defined(__CYGWIN__) - if (getuid() != 0) --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch deleted file mode 100644 index bda376ba8d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-dix-don-t-emulate-scroll-events-for-non-existing-axe.patch +++ /dev/null @@ -1,46 +0,0 @@ -From af88b43f9e604157b74270d609c08bdfa256a792 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 27 Apr 2012 16:31:17 +1000 -Subject: [PATCH] dix: don't emulate scroll events for non-existing axes - (#47281) - -Test case: -- create a device with REL_HWHEEL and ABS_X and ABS_Y. evdev 2.7.0 will set - that up as device with 1 relative axis -- move pointer to VGA1 -- xrandr --output VGA1 --off - -Warps the pointer to the new spot and calls GPE with the x/y mask bits set. -When running through the loop to check for scroll event, this overruns the -axes and may try to emulate scroll events based on random garbage in the -memory. If that memory contained non-zero for the scroll type but near-zero -for the increment field, the server would hang in an infinite loop. - -This was the trigger for this suggested, never-merged, patch here: -http://patchwork.freedesktop.org/patch/9543/ - -X.Org Bug 47281 - -Signed-off-by: Peter Hutterer -Reviewed-by: Chase Douglas ---- - dix/getevents.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 23bbe06..c960d44 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -1577,6 +1577,9 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type, - /* Now turn the smooth-scrolling axes back into emulated button presses - * for legacy clients, based on the integer delta between before and now */ - for (i = 0; i < valuator_mask_size(&mask); i++) { -+ if (i >= pDev->valuator->numAxes) -+ break; -+ - if (!valuator_mask_isset(&mask, i)) - continue; - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch deleted file mode 100644 index 990fd85a44..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-do-not-attend-gone-clients.patch +++ /dev/null @@ -1,26 +0,0 @@ -Subject: [PATCH] xserver: Fix dri2 race - -The is a race where the client disappears after submitting the swapbuffers -but before completing the request. Don't attend the client if it is gone. ---- - hw/xfree86/dri2/dri2.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c -index 5cc9068..d03d082 100644 ---- a/hw/xfree86/dri2/dri2.c -+++ b/hw/xfree86/dri2/dri2.c -@@ -220,7 +220,9 @@ DRI2SwapLimit(DrawablePtr pDraw, int swap_limit) - - if (pPriv->target_sbc == -1 && !pPriv->blockedOnMsc) { - if (pPriv->blockedClient) { -- AttendClient(pPriv->blockedClient); -+ if ((pPriv->blockedClient->clientState != ClientStateGone) && -+ (pPriv->blockedClient->clientState != ClientStateInitial)) -+ AttendClient(pPriv->blockedClient); - pPriv->blockedClient = NULL; - } - } --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch deleted file mode 100644 index cb92bc2068..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-emulate-partial-flips.patch +++ /dev/null @@ -1,372 +0,0 @@ -diff --git a/glx/glxcmds.c b/glx/glxcmds.c -index 5cd95f6..de22540 100644 ---- a/glx/glxcmds.c -+++ b/glx/glxcmds.c -@@ -784,7 +784,7 @@ __glXDisp_WaitGL(__GLXclientState * cl, GLbyte * pc) - } - - if (glxc && glxc->drawPriv->waitGL) -- (*glxc->drawPriv->waitGL) (glxc->drawPriv); -+ (*glxc->drawPriv->waitGL) (client, glxc->drawPriv); - - return Success; - } -@@ -811,7 +811,7 @@ __glXDisp_WaitX(__GLXclientState * cl, GLbyte * pc) - } - - if (glxc && glxc->drawPriv->waitX) -- (*glxc->drawPriv->waitX) (glxc->drawPriv); -+ (*glxc->drawPriv->waitX) (client, glxc->drawPriv); - - return Success; - } -@@ -1841,7 +1841,7 @@ __glXDisp_CopySubBufferMESA(__GLXclientState * cl, GLbyte * pc) - pGlxDraw->copySubBuffer == NULL) - return __glXError(GLXBadDrawable); - -- (*pGlxDraw->copySubBuffer) (pGlxDraw, x, y, width, height); -+ (*pGlxDraw->copySubBuffer) (client, pGlxDraw, x, y, width, height); - - return Success; - } -diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h -index 80c3234..7e71a23 100644 ---- a/glx/glxdrawable.h -+++ b/glx/glxdrawable.h -@@ -46,10 +46,10 @@ enum { - struct __GLXdrawable { - void (*destroy) (__GLXdrawable * private); - GLboolean(*swapBuffers) (ClientPtr client, __GLXdrawable *); -- void (*copySubBuffer) (__GLXdrawable * drawable, -+ void (*copySubBuffer) (ClientPtr client, __GLXdrawable * drawable, - int x, int y, int w, int h); -- void (*waitX) (__GLXdrawable *); -- void (*waitGL) (__GLXdrawable *); -+ void (*waitX) (ClientPtr client, __GLXdrawable *); -+ void (*waitGL) (ClientPtr client, __GLXdrawable *); - - int refcnt; /* number of resources handles referencing this */ - -diff --git a/glx/glxdri.c b/glx/glxdri.c -index 326f539..3fbf118 100644 ---- a/glx/glxdri.c -+++ b/glx/glxdri.c -@@ -270,7 +270,7 @@ __glXDRIdrawableSwapInterval(__GLXdrawable * baseDrawable, int interval) - } - - static void --__glXDRIdrawableCopySubBuffer(__GLXdrawable * basePrivate, -+__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * basePrivate, - int x, int y, int w, int h) - { - __GLXDRIdrawable *private = (__GLXDRIdrawable *) basePrivate; -diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index 5e524db..ff6145b 100644 ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -114,10 +114,11 @@ __glXDRIdrawableDestroy(__GLXdrawable * drawable) - } - - static void --__glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable, -+__glXDRIdrawableCopySubBuffer(ClientPtr client, __GLXdrawable * drawable, - int x, int y, int w, int h) - { - __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable; -+ __GLXDRIscreen *screen = private->screen; - BoxRec box; - RegionRec region; - -@@ -127,12 +128,27 @@ __glXDRIdrawableCopySubBuffer(__GLXdrawable * drawable, - box.y2 = private->height - y; - RegionInit(®ion, &box, 0); - -- DRI2CopyRegion(drawable->pDraw, ®ion, -- DRI2BufferFrontLeft, DRI2BufferBackLeft); -+ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__); -+#if __DRI2_FLUSH_VERSION >= 3 -+ LogMessage(X_INFO, "%s:%d flushing\n",__func__,__LINE__); -+ if (screen->flush) { -+ LogMessage(X_INFO, "%s:%d flushing2\n",__func__,__LINE__); -+ (*screen->flush->flush)(private->driDrawable); -+ (*screen->flush->invalidate)(private->driDrawable); -+ } -+#else -+ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__); -+ if (screen->flush) -+ (*screen->flush->flushInvalidate)(private->driDrawable); -+#endif -+ -+ LogMessage(X_INFO, "%s:%d \n",__func__,__LINE__); -+ DRI2CopyRegion(client, drawable->pDraw, ®ion, -+ DRI2BufferFrontLeft, DRI2BufferBackLeft, TRUE); - } - - static void --__glXDRIdrawableWaitX(__GLXdrawable * drawable) -+__glXDRIdrawableWaitX(ClientPtr client, __GLXdrawable * drawable) - { - __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable; - BoxRec box; -@@ -144,12 +160,12 @@ __glXDRIdrawableWaitX(__GLXdrawable * drawable) - box.y2 = private->height; - RegionInit(®ion, &box, 0); - -- DRI2CopyRegion(drawable->pDraw, ®ion, -- DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft); -+ DRI2CopyRegion(client, drawable->pDraw, ®ion, -+ DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft, FALSE); - } - - static void --__glXDRIdrawableWaitGL(__GLXdrawable * drawable) -+__glXDRIdrawableWaitGL(ClientPtr client, __GLXdrawable * drawable) - { - __GLXDRIdrawable *private = (__GLXDRIdrawable *) drawable; - BoxRec box; -@@ -161,8 +177,8 @@ __glXDRIdrawableWaitGL(__GLXdrawable * drawable) - box.y2 = private->height; - RegionInit(®ion, &box, 0); - -- DRI2CopyRegion(drawable->pDraw, ®ion, -- DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft); -+ DRI2CopyRegion(client, drawable->pDraw, ®ion, -+ DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft, FALSE); - } - - static void -@@ -565,7 +581,7 @@ static void - dri2FlushFrontBuffer(__DRIdrawable * driDrawable, void *loaderPrivate) - { - (void) driDrawable; -- __glXDRIdrawableWaitGL((__GLXdrawable *) loaderPrivate); -+ __glXDRIdrawableWaitGL(NULL, (__GLXdrawable *) loaderPrivate); - } - - static const __DRIdri2LoaderExtension loaderExtension = { -diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c -index d03d082..28383fb 100644 ---- a/hw/xfree86/dri2/dri2.c -+++ b/hw/xfree86/dri2/dri2.c -@@ -87,6 +87,7 @@ typedef struct _DRI2Drawable { - int swap_limit; /* for N-buffering */ - unsigned long serialNumber; - Bool needInvalidate; -+ RegionPtr previous_region; - } DRI2DrawableRec, *DRI2DrawablePtr; - - typedef struct _DRI2Screen { -@@ -175,6 +176,7 @@ DRI2AllocateDrawable(DrawablePtr pDraw) - pPriv->swap_count = 0; - pPriv->target_sbc = -1; - pPriv->swap_interval = 1; -+ pPriv->previous_region = NULL; - /* Initialize last swap target from DDX if possible */ - if (!ds->GetMSC || !(*ds->GetMSC) (pDraw, &ust, &pPriv->last_swap_target)) - pPriv->last_swap_target = 0; -@@ -552,8 +554,8 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height, - box.y2 = pPriv->height; - RegionInit(®ion, &box, 0); - -- DRI2CopyRegion(pDraw, ®ion, DRI2BufferFakeFrontLeft, -- DRI2BufferFrontLeft); -+ DRI2CopyRegion(NULL, pDraw, ®ion, DRI2BufferFakeFrontLeft, -+ DRI2BufferFrontLeft, FALSE); - } - - pPriv->needInvalidate = TRUE; -@@ -661,9 +663,118 @@ DRI2BlockClient(ClientPtr client, DrawablePtr pDraw) - pPriv->blockedOnMsc = TRUE; - } - -+static Bool DRI2CopyRegionWithFlip(ClientPtr client, DrawablePtr pDraw, -+ RegionPtr pRegion, -+ DRI2BufferPtr pDestBuffer, -+ DRI2BufferPtr pSrcBuffer) -+{ -+ DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); -+ DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw); -+ ScreenPtr pScreen = pPriv->dri2_screen->screen; -+ RegionPtr pPreviousRegion; -+ RegionPtr pCopyFrontToBack; -+ int ret; -+ DRI2SwapEventPtr func = NULL; -+ void *data = NULL; -+ PixmapPtr pWindowPix, pScreenPix; -+ CARD64 target_msc = 0, divisor = 0, remainder = 0; -+ CARD64 ust, current_msc; -+ CARD64 swap_target; -+ -+ /* Make sure we have a window */ -+ if (pDraw->type != DRAWABLE_WINDOW) -+ return FALSE; -+ -+ /* Ensure that our window is the screen pixmap */ -+ pWindowPix = pScreen->GetWindowPixmap((WindowPtr)pDraw); -+ pScreenPix = pScreen->GetScreenPixmap(pScreen); -+ if (pWindowPix != pScreenPix) -+ return FALSE; -+ -+ /* Create a region pCopyFrontToBack which brings over the changes from -+ * the last frame. Do this by subtracting the current region from the -+ * previous updates and copying the resulting bits. In the case where we -+ * don't have a previous region we'll update the whole drawable */ -+ pCopyFrontToBack = REGION_CREATE(pScreen, NULL, 0); -+ -+ if (pPriv->previous_region) { -+ pPreviousRegion = pPriv->previous_region; -+ } else { -+ BoxRec box; -+ box.x1 = pDraw->x; -+ box.y1 = pDraw->y; -+ box.x2 = box.x1 + pDraw->width; -+ box.y2 = box.y1 + pDraw->height; -+ pPreviousRegion = REGION_CREATE(pScreen, &box, 1); -+ } -+ -+ REGION_SUBTRACT(pScreen, pCopyFrontToBack, pPreviousRegion, pRegion); -+ REGION_DESTROY(pScreen, pPreviousRegion); -+ (*ds->CopyRegion)(pDraw, pCopyFrontToBack, pSrcBuffer, pDestBuffer); -+ -+ /* -+ * In the simple glXSwapBuffers case, all params will be 0, and we just -+ * need to schedule a swap for the last swap target + the swap interval. -+ */ -+ if (target_msc == 0 && divisor == 0 && remainder == 0) { -+ /* If the current vblank count of the drawable's crtc is lower -+ * than the count stored in last_swap_target from a previous swap -+ * then reinitialize last_swap_target to the current crtc's msc, -+ * otherwise the swap will hang. This will happen if the drawable -+ * is moved to a crtc with a lower refresh rate, or a crtc that just -+ * got enabled. -+ */ -+ if (ds->GetMSC) { -+ if (!(*ds->GetMSC)(pDraw, &ust, ¤t_msc)) -+ pPriv->last_swap_target = 0; -+ -+ if (current_msc < pPriv->last_swap_target) -+ pPriv->last_swap_target = current_msc; -+ -+ } -+ -+ /* -+ * Swap target for this swap is last swap target + swap interval since -+ * we have to account for the current swap count, interval, and the -+ * number of pending swaps. -+ */ -+ swap_target = pPriv->last_swap_target + pPriv->swap_interval; -+ -+ } else { -+ /* glXSwapBuffersMscOML could have a 0 target_msc, honor it */ -+ swap_target = target_msc; -+ } -+ -+ if (pPriv->swapsPending > 0) -+ return FALSE; -+ -+ pPriv->swapsPending++; -+ ret = (*ds->ScheduleSwap)(client, pDraw, pDestBuffer, pSrcBuffer, -+ &swap_target, divisor, remainder, func, data); -+ if (!ret) { -+ pPriv->swapsPending--; /* didn't schedule */ -+ return FALSE; -+ } -+ -+ pPriv->last_swap_target = swap_target; -+ -+ /* According to spec, return expected swapbuffers count SBC after this swap -+ * will complete. -+ */ -+ swap_target = pPriv->swap_count + pPriv->swapsPending; -+ -+ DRI2InvalidateDrawable(pDraw); -+ -+ pPriv->previous_region = REGION_CREATE(pScreen, NULL, 0); -+ REGION_COPY(pScreen, pPriv->previous_region, pRegion); -+ -+ REGION_DESTROY(pScreen, pCopyFrontToBack); -+ return TRUE; -+} -+ - int --DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, -- unsigned int dest, unsigned int src) -+DRI2CopyRegion(ClientPtr client, DrawablePtr pDraw, RegionPtr pRegion, -+ unsigned int dest, unsigned int src, Bool invalidate) - { - DRI2ScreenPtr ds = DRI2GetScreen(pDraw->pScreen); - DRI2DrawablePtr pPriv; -@@ -685,8 +796,13 @@ DRI2CopyRegion(DrawablePtr pDraw, RegionPtr pRegion, - if (pSrcBuffer == NULL || pDestBuffer == NULL) - return BadValue; - -- (*ds->CopyRegion) (pDraw, pRegion, pDestBuffer, pSrcBuffer); -+ if (invalidate && -+ DRI2CopyRegionWithFlip(client, pDraw, pRegion, -+ pDestBuffer, pSrcBuffer)) -+ return Success; - -+ pPriv->previous_region = NULL; -+ (*ds->CopyRegion)(pDraw, pRegion, pDestBuffer, pSrcBuffer); - return Success; - } - -@@ -814,8 +930,8 @@ DRI2SwapComplete(ClientPtr client, DrawablePtr pDraw, int frame, - box.x2 = pDraw->width; - box.y2 = pDraw->height; - RegionInit(®ion, &box, 0); -- DRI2CopyRegion(pDraw, ®ion, DRI2BufferFakeFrontLeft, -- DRI2BufferFrontLeft); -+ DRI2CopyRegion(client, pDraw, ®ion, DRI2BufferFakeFrontLeft, -+ DRI2BufferFrontLeft, FALSE); - - ust = ((CARD64) tv_sec * 1000000) + tv_usec; - if (swap_complete) -@@ -889,6 +1005,8 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc, - return BadDrawable; - } - -+ pPriv->previous_region = NULL; -+ - /* Old DDX or no swap interval, just blit */ - if (!ds->ScheduleSwap || !pPriv->swap_interval) { - BoxRec box; -@@ -1345,3 +1463,4 @@ DRI2Version(int *major, int *minor) - if (minor != NULL) - *minor = DRI2VersRec.minorversion; - } -+ -diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h -index a67e35f..e30fb7a 100644 ---- a/hw/xfree86/dri2/dri2.h -+++ b/hw/xfree86/dri2/dri2.h -@@ -248,9 +248,11 @@ extern _X_EXPORT DRI2BufferPtr *DRI2GetBuffers(DrawablePtr pDraw, - unsigned int *attachments, - int count, int *out_count); - --extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw, -+extern _X_EXPORT int DRI2CopyRegion(ClientPtr client, -+ DrawablePtr pDraw, - RegionPtr pRegion, -- unsigned int dest, unsigned int src); -+ unsigned int dest, unsigned int src, -+ Bool invalidate); - - /** - * Determine the major and minor version of the DRI2 extension. -diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c -index 73ef7f2..dfa242a 100644 ---- a/hw/xfree86/dri2/dri2ext.c -+++ b/hw/xfree86/dri2/dri2ext.c -@@ -319,7 +319,7 @@ ProcDRI2CopyRegion(ClientPtr client) - - VERIFY_REGION(pRegion, stuff->region, client, DixReadAccess); - -- status = DRI2CopyRegion(pDrawable, pRegion, stuff->dest, stuff->src); -+ status = DRI2CopyRegion(client, pDrawable, pRegion, stuff->dest, stuff->src, TRUE); - if (status != Success) - return status; - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch deleted file mode 100644 index 00a978422d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 758de0b68be0b2ace903d3c86fca65865f34d7cd Mon Sep 17 00:00:00 2001 -From: Yufeng Shen -Date: Fri, 20 Jul 2012 18:58:10 -0400 -Subject: [PATCH] x11-base/xorg-server: fix scale_to_desktop for edge ABS - events - -Scale_to_desktop() converts ABS events from device coordinates -to screen coordinates: -[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max] -[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max] - -An edge ABS event with X = dev_X_max (e.g., generated from the -edge of a touchscreen) will be converted to have screen X value -= screen_X_max, which, however, will be filterd out when xserver -tries to find proper Window to receive the event, because the -range check for a Window to receive events is - window_X_min <= event_screen_X < window_X_max -Events with event_screen_X = screen_X_max will fail the test get -and rejected by the Window. - -To fix this, we change the device to screen coordinates mapping to -[dev_X_min, dev_X_max] -> [screen_X_min, screen_X_max-1] -[dev_Y_min, dev_Y_max] -> [screen_Y_min, screen_Y_max-1] - -Signed-off-by: Yufeng Shen ---- - dix/getevents.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index b78d5ce..9898c6a 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -890,9 +890,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask, - - /* scale x&y to desktop coordinates */ - *screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL, -- screenInfo.x, screenInfo.width); -+ screenInfo.x, screenInfo.width - 1); - *screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL, -- screenInfo.y, screenInfo.height); -+ screenInfo.y, screenInfo.height - 1); - - *devx = x; - *devy = y; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch deleted file mode 100644 index cfe03a43cf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d53e6e02a2595ced1882f5fcd34d08ea039b3b85 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 16 Aug 2012 13:54:42 +1000 -Subject: [PATCH] mi: don't check for core events in miPointerSetPosition - (#53568) - -As of 81cfe44b1ed0de84ad1941fe2ca74bebef3fc58d, miPointerSetPosition now -returns the screen pointer of the device. This broke floating slave devices, -as soon as a motion event was submitted, miPointerSetPosition returned NULL, -crashing the server. - -dev->coreEvents is only false if the device is a floating slave, in which -case it has a sprite. - -X.Org Bug 53568 - -Signed-off-by: Peter Hutterer -Reviewed-by: Keith Packard ---- - mi/mipointer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/mi/mipointer.c b/mi/mipointer.c -index a56838e..4defaf5 100644 ---- a/mi/mipointer.c -+++ b/mi/mipointer.c -@@ -575,7 +575,7 @@ miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, - - miPointerPtr pPointer; - -- if (!pDev || !pDev->coreEvents) -+ if (!pDev) - return NULL; - - pPointer = MIPOINTER(pDev); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch deleted file mode 100644 index 9f04b259cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-block-signals-when-accessing-global-timer-list.patch +++ /dev/null @@ -1,163 +0,0 @@ -From: Daniel Kurtz -Date: Sat, 22 Sep 2012 19:58:22 +0800 -Subject: [PATCH] os: block signals when accessing global timer list - -X Input drivers, such as xf86-input-synaptics, tend to do all of their -processing in a SIGIO signal handler. This processing often involves -creating, modifying or canceling a timer. Any of these operations may -modify the global "timers" array. Therefore, all accesses of this global -must be done in critical sections during which signals are blocked. - -Otherwise, for example, a signal may clear the last timer between, which -sets timers global to NULL, between the NULL check and checking "expires", -which causes a SEGV. - -A previous patch protected write accesses. However, this is not -sufficient. ead accesses must also be made atomic such that a signal -cannot occur between the timers pointer NULL check and a subsequent -dereference. - -This change actually makes the Signal blocking in DoTimer() and -CheckAllTimers() redundant, since they are always called with signals -already blocked. - -Also, make the global volatile to ensure that the compiler does not -cache its value. - -Signed-off-by: Daniel Kurtz ---- - os/WaitFor.c | 27 +++++++++++++++++++-------- - 1 files changed, 19 insertions(+), 8 deletions(-) - -diff --git a/os/WaitFor.c b/os/WaitFor.c -index 852362e..f105acc 100644 ---- a/os/WaitFor.c -+++ b/os/WaitFor.c -@@ -122,7 +122,7 @@ struct _OsTimerRec { - - static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev); - static void CheckAllTimers(void); --static OsTimerPtr timers = NULL; -+volatile static OsTimerPtr timers = NULL; - - /***************** - * WaitForSomething: -@@ -186,6 +186,7 @@ WaitForSomething(int *pClientsReady) - } - else { - wt = NULL; -+ OsBlockSignals(); - if (timers) { - now = GetTimeInMillis(); - timeout = timers->expires - now; -@@ -204,6 +205,7 @@ WaitForSomething(int *pClientsReady) - wt = &waittime; - } - } -+ OsReleaseSignals(); - XFD_COPYSET(&AllSockets, &LastSelectMask); - } - -@@ -251,6 +253,7 @@ WaitForSomething(int *pClientsReady) - if (*checkForInput[0] != *checkForInput[1]) - return 0; - -+ OsBlockSignals(); - if (timers) { - int expired = 0; - -@@ -261,14 +264,18 @@ WaitForSomething(int *pClientsReady) - while (timers && (int) (timers->expires - now) <= 0) - DoTimer(timers, now, &timers); - -- if (expired) -+ if (expired) { -+ OsReleaseSignals(); - return 0; -+ } - } -+ OsReleaseSignals(); - } - else { - fd_set tmp_set; - - if (*checkForInput[0] == *checkForInput[1]) { -+ OsBlockSignals(); - if (timers) { - int expired = 0; - -@@ -279,9 +286,12 @@ WaitForSomething(int *pClientsReady) - while (timers && (int) (timers->expires - now) <= 0) - DoTimer(timers, now, &timers); - -- if (expired) -+ if (expired) { -+ OsReleaseSignals(); - return 0; -+ } - } -+ OsReleaseSignals(); - } - if (someReady) - XFD_ORSET(&LastSelectMask, &ClientsWithInput, &LastSelectMask); -@@ -382,7 +392,6 @@ CheckAllTimers(void) - OsTimerPtr timer; - CARD32 now; - -- OsBlockSignals(); - start: - now = GetTimeInMillis(); - -@@ -392,7 +401,6 @@ CheckAllTimers(void) - goto start; - } - } -- OsReleaseSignals(); - } - - static void -@@ -400,13 +408,11 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev) - { - CARD32 newTime; - -- OsBlockSignals(); - *prev = timer->next; - timer->next = NULL; - newTime = (*timer->callback) (timer, now, timer->arg); - if (newTime) - TimerSet(timer, 0, newTime, timer->callback, timer->arg); -- OsReleaseSignals(); - } - - OsTimerPtr -@@ -508,10 +514,13 @@ TimerFree(OsTimerPtr timer) - void - TimerCheck(void) - { -- CARD32 now = GetTimeInMillis(); -+ CARD32 now; - -+ OsBlockSignals(); -+ now = GetTimeInMillis(); - while (timers && (int) (timers->expires - now) <= 0) - DoTimer(timers, now, &timers); -+ OsReleaseSignals(); - } - - void -@@ -519,10 +528,12 @@ TimerInit(void) - { - OsTimerPtr timer; - -+ OsBlockSignals(); - while ((timer = timers)) { - timers = timer->next; - free(timer); - } -+ OsReleaseSignals(); - } - - #ifdef DPMSExtension --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch deleted file mode 100644 index 109b226e95..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-os-make-timers-signal-safe.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 2011e215a101ce928f81baae4ffa9d9ae817ce33 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 27 Apr 2012 08:52:39 +0800 -Subject: [PATCH] os: make timers signal-safe - -If TimerSet() is called from a signal handler (synaptics tap handling code) -may result in list corruption if we're currently inside TimerSet(). - -See backtrace in -https://bugzilla.redhat.com/show_bug.cgi?id=814869 - -Block signals for all list manipulations in the timers. - -Signed-off-by: Peter Hutterer -Reviewed-by: Chase Douglas -(cherry picked from commit 08962951de969b9d8c870af8b6e47303dc0decfd) - -Conflicts: - - os/WaitFor.c ---- - os/WaitFor.c | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/os/WaitFor.c b/os/WaitFor.c -index 867cb04..236406e 100644 ---- a/os/WaitFor.c -+++ b/os/WaitFor.c -@@ -405,6 +405,7 @@ CheckAllTimers(void) - OsTimerPtr timer; - CARD32 now; - -+ OsBlockSignals(); - start: - now = GetTimeInMillis(); - -@@ -414,6 +415,7 @@ start: - goto start; - } - } -+ OsReleaseSignals(); - } - - static void -@@ -421,11 +423,13 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev) - { - CARD32 newTime; - -+ OsBlockSignals(); - *prev = timer->next; - timer->next = NULL; - newTime = (*timer->callback)(timer, now, timer->arg); - if (newTime) - TimerSet(timer, 0, newTime, timer->callback, timer->arg); -+ OsReleaseSignals(); - } - - OsTimerPtr -@@ -443,6 +447,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, - } - else - { -+ OsBlockSignals(); - for (prev = &timers; *prev; prev = &(*prev)->next) - { - if (*prev == timer) -@@ -453,6 +458,7 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, - break; - } - } -+ OsReleaseSignals(); - } - if (!millis) - return timer; -@@ -473,29 +479,35 @@ TimerSet(OsTimerPtr timer, int flags, CARD32 millis, - if (!millis) - return timer; - } -+ OsBlockSignals(); - for (prev = &timers; - *prev && (int) ((*prev)->expires - millis) <= 0; - prev = &(*prev)->next) - ; - timer->next = *prev; - *prev = timer; -+ OsReleaseSignals(); - return timer; - } - - Bool - TimerForce(OsTimerPtr timer) - { -+ int rc = FALSE; - OsTimerPtr *prev; - -+ OsBlockSignals(); - for (prev = &timers; *prev; prev = &(*prev)->next) - { - if (*prev == timer) - { - DoTimer(timer, GetTimeInMillis(), prev); -- return TRUE; -+ rc = TRUE; -+ break; - } - } -- return FALSE; -+ OsReleaseSignals(); -+ return rc; - } - - -@@ -506,6 +518,7 @@ TimerCancel(OsTimerPtr timer) - - if (!timer) - return; -+ OsBlockSignals(); - for (prev = &timers; *prev; prev = &(*prev)->next) - { - if (*prev == timer) -@@ -514,6 +527,7 @@ TimerCancel(OsTimerPtr timer) - break; - } - } -+ OsReleaseSignals(); - } - - void --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch deleted file mode 100644 index 1752b78577..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-suffix-match-udev-paths.patch +++ /dev/null @@ -1,85 +0,0 @@ -From d09984016e41b602885e25b17582a0f563384e16 Mon Sep 17 00:00:00 2001 -From: Andrew de los Reyes -Date: Tue, 28 Aug 2012 14:33:45 -0700 -Subject: [PATCH] config/config.c: Workaround for handling udev REMOVED - messages. - -Details at http://code.google.com/p/chromium-os/issues/detail?id=33813 . - -The result of the bug is that sometimes a path will have the non-/sys part -of the prefix missing. For example, -'/sys/devices/pci0000:00/0000:00:1d.3/usb5/5-1/5-1:1.0/bluetooth/hci0/hci0:21/input32' -may come in as '/sys/hci0/hci0:21/input32'. This CL will look at the -suffixes to determine if there is a match. - -BUG=chromium-os:33813 -TEST=Reproduced error on ZGB. Saw log message appear and mouse -function. ---- - config/config.c | 39 +++++++++++++++++++++++++++++++++++++-- - 1 files changed, 37 insertions(+), 2 deletions(-) - -diff --git a/config/config.c b/config/config.c -index 0dae3ad..636abb8 100644 ---- a/config/config.c -+++ b/config/config.c -@@ -90,6 +90,41 @@ remove_device(const char *backend, DeviceIntPtr dev) - OsReleaseSignals(); - } - -+/** -+ * This is a workaround for -+ * http://code.google.com/p/chromium-os/issues/detail?id=33813 . -+ * We strip a prefix from the two strings we get, and if input_dev -+ * is a suffix of existing_dev, we consider it a match. -+ */ -+static Bool -+dev_same_suffix(const char* existing_dev, const char* input_dev) -+{ -+ const char PREFIX[] = "udev:/sys/"; -+ const size_t PREFIX_LEN = strlen(PREFIX); -+ size_t existing_len, input_len; -+ -+ if (strcmp(existing_dev, input_dev) == 0) -+ return TRUE; -+ /* If either doesn't have the magic prefix, abort */ -+ if (strncmp(existing_dev, PREFIX, PREFIX_LEN) != 0 || -+ strncmp(input_dev, PREFIX, PREFIX_LEN) != 0) -+ return FALSE; -+ existing_dev += PREFIX_LEN; -+ input_dev += PREFIX_LEN; -+ /* If input_dev is the suffix of existing_dev, return TRUE, else FALSE. */ -+ existing_len = strlen(existing_dev); -+ input_len = strlen(input_dev); -+ if (input_len > existing_len) -+ return FALSE; -+ if (strcmp(existing_dev + existing_len - input_len, input_dev) == 0) { -+ LogMessage(X_INFO, -+ "devices_same_suffix: matching %s with existing device %s\n", -+ input_dev, existing_dev); -+ return TRUE; -+ } -+ return FALSE; -+} -+ - void - remove_devices(const char *backend, const char *config_info) - { -@@ -97,12 +132,12 @@ remove_devices(const char *backend, const char *config_info) - - for (dev = inputInfo.devices; dev; dev = next) { - next = dev->next; -- if (dev->config_info && strcmp(dev->config_info, config_info) == 0) -+ if (dev->config_info && dev_same_suffix(dev->config_info, config_info)) - remove_device(backend, dev); - } - for (dev = inputInfo.off_devices; dev; dev = next) { - next = dev->next; -- if (dev->config_info && strcmp(dev->config_info, config_info) == 0) -+ if (dev->config_info && dev_same_suffix(dev->config_info, config_info)) - remove_device(backend, dev); - } - } --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch deleted file mode 100644 index a6d8871d8f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.0-xfixes-safer-barriers.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 5b8cafec54186ffc038874102e53419c2339130b Mon Sep 17 00:00:00 2001 -From: Chris Wolfe -Date: Mon, 23 Jul 2012 15:54:47 -0400 -Subject: [PATCH] fixes: Prevent the cursor from leaking at corners - -This is a quick fix to prevent the cursor from leaking through between -xfixes boundaries at corners. Previously the barrier_is_blocking_direction -would consider e.g. a +X barrier to block -Y movement, so the second check -in CursorConstrainCursorHarder would repeat the same barrier in some -configurations. ---- - xfixes/cursor.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/xfixes/cursor.c b/xfixes/cursor.c -index 7c46269..b9d5c4b 100644 ---- a/xfixes/cursor.c -+++ b/xfixes/cursor.c -@@ -1055,7 +1055,15 @@ barrier_is_blocking_direction(const struct PointerBarrier * barrier, - int direction) - { - /* Barriers define which way is ok, not which way is blocking */ -- return (barrier->directions & direction) != direction; -+ int blocks; -+ if (barrier_is_vertical(barrier)) { -+ blocks = BarrierNegativeX | BarrierPositiveX; -+ } else { -+ blocks = BarrierNegativeY | BarrierPositiveY; -+ } -+ blocks &= ~barrier->directions; -+ -+ return (blocks & direction) != 0; - } - - /** --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch deleted file mode 100644 index cc334c4d1e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.12.4-Per-Randr-CRTC-pointer-scaling.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 5dfb771f6e690b0a2f558f1b2c9d0787bc885587 Mon Sep 17 00:00:00 2001 -From: Daniel Kurtz -Date: Mon, 12 Nov 2012 14:39:33 +0800 -Subject: [PATCH] Per Randr CRTC pointer scaling - -Scale pointer motion based on the pixel density of the current "RandR" crtc -and whether or not it's internal. - -This implementation is very hacky since it directly accesses XRandR methods -and datastructures from within the X server proper. I'm not sure what -the proper way to solve this is. - -BUG=chromium-os:30822 -TEST=Tested on Link, Lucas w/ external display that pointer scaled -properly in each. ---- - dix/getevents.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 114 insertions(+), 0 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 7454cb4..5f00584 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -51,6 +51,7 @@ - #include "inpututils.h" - #include "mi.h" - #include "windowstr.h" -+#include "randrstr.h" - - #include - #include "xkbsrv.h" -@@ -72,6 +73,8 @@ - /* Number of motion history events to store. */ - #define MOTION_HISTORY_SIZE 256 - -+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) -+ - /** - * InputEventList is the storage for input events generated by - * QueuePointerEvents, QueueKeyboardEvents, and QueueProximityEvents. -@@ -1262,6 +1265,115 @@ QueuePointerEvents(DeviceIntPtr device, int type, - queueEventList(device, InputEventList, nevents); - } - -+/* -+ * Return TRUE if (x, y) is within the bounds of the given X RandR CRTC. -+ * If so, it also returns whether the display is high DPI and/or internal. -+ */ -+static Bool -+RRCrtcContainsPosition(RRCrtcPtr crtc, int x, int y, -+ int *isHighDPI, int *isInternal) -+{ -+ int i; -+ int width, height; -+ const float maxLowDPmm = 160.0 / 25.4; /* 160 DPI / 25.4 mm/inch */ -+ const char * const integratedPrefixes[] = { "LVDS", "eDP" }; -+ -+ if (!crtc->mode) -+ return FALSE; -+ -+ RRCrtcGetScanoutSize(crtc, &width, &height); -+ -+ if (crtc->x <= x && x < crtc->x + width && -+ crtc->y <= y && y < crtc->y + height) { -+ /* Use the first output for extra return values */ -+ if (crtc->numOutputs) { -+ RROutputPtr output = crtc->outputs[0]; -+ /* Only consider HighDPI if the output has a mmWidth. */ -+ *isHighDPI = output->mmWidth && -+ width > maxLowDPmm * output->mmWidth; -+ *isInternal = FALSE; -+ for (i = 0; i < ARRAY_SIZE(integratedPrefixes); i++) { -+ if (!strncmp(integratedPrefixes[i], output->name, -+ strlen(integratedPrefixes[i]))) { -+ *isInternal = TRUE; -+ break; -+ } -+ } -+ } -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+/* -+ * Find the X RandR CRTC (ie display) which contains desktop coordinate (x,y), -+ * and return whether it's high DPI and/or internal. -+ * -+ * Returns FALSE if (x, y) is not on any known X RandR CRTC. -+ */ -+static Bool -+RRGetContainingCrtcInfo(ScreenPtr pScreen, int x, int y, -+ int *isHighDPI, int *isInternal) -+{ -+ rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen); -+ RRCrtcPtr crtc = rrScrPriv->pointerCrtc; -+ int i; -+ -+ /* Check last known CRTC */ -+ if (crtc && RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) { -+ return TRUE; -+ } -+ -+ /* Check all CRTCs */ -+ for (i = 0; i < rrScrPriv->numCrtcs; i++) { -+ crtc = rrScrPriv->crtcs[i]; -+ if (RRCrtcContainsPosition(crtc, x, y, isHighDPI, isInternal)) { -+ rrScrPriv->pointerCrtc = crtc; -+ return TRUE; -+ } -+ } -+ return FALSE; -+} -+ -+/* -+ * Scale the motion vector in mask valuators 0 & 1 -+ * -+ * Find the RandR CRTC for the current pointer position for this device, and -+ * use its pixel density and whether or not it's integrated to scale pointer -+ * motion. Specifically: double all motion on High-DPI displays, add 20% more -+ * motion on non-integrated displays. -+ */ -+static void -+scaleMotionPerRRCrtc(DeviceIntPtr dev, ValuatorMask *mask) -+{ -+ ScreenPtr pScreen = miPointerGetScreen(dev); -+ double x, y, dx, dy, scale; -+ int isHighDPI = FALSE; -+ int isInternal = FALSE; -+ -+ x = dev->last.valuators[0]; -+ y = dev->last.valuators[1]; -+ -+ /* Find Size of RandR CRTC containing the current pointer (x, y) */ -+ if (!RRGetContainingCrtcInfo(pScreen, x, y, &isHighDPI, &isInternal)) -+ return; -+ -+ scale = 1.0; -+ if (isHighDPI) -+ scale *= 2.0; -+ if (!isInternal) -+ scale *= 1.2; -+ -+ if (scale != 1.0) { -+ if (valuator_mask_fetch_double(mask, 0, &dx)) -+ valuator_mask_set_double(mask, 0, dx * scale); -+ -+ if (valuator_mask_fetch_double(mask, 1, &dy)) -+ valuator_mask_set_double(mask, 1, dy * scale); -+ } -+} -+ -+ - /** - * Helper function for GetPointerEvents, which only generates motion and - * raw motion events for the slave device: does not update the master device. -@@ -1368,6 +1480,8 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, - if ((flags & POINTER_NORAW) == 0) - set_raw_valuators(raw, &mask, raw->valuators.data); - -+ scaleMotionPerRRCrtc(pDev, &mask); -+ - moveRelative(pDev, &mask); - } - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch deleted file mode 100644 index c7e25cacda..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch +++ /dev/null @@ -1,93 +0,0 @@ -From e2e273e135bcdadde22c48cf2d70cbd22f268120 Mon Sep 17 00:00:00 2001 -From: Yuly Novikov -Date: Mon, 19 Nov 2012 21:04:57 -0500 -Subject: [PATCH] dix: Save touchpoint last coordinates before transform. - #49347 - -DDXTouchPointInfoRec.valuators used to store axis values after transform. -This resulted in Coordinate Transformation Matrix -being applied multiple times to the last coordinates, -in the case when only pressure changes in the last touch event. - -Changed DDXTouchPointInfoRec.valuators to store values before transform. - -Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=49347 - -BUG=chromium-os:36115 -TEST=Follow the expected output in the bug desription. - -Signed-off-by: Yuly Novikov -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer -(cherry picked from commit 3b9f1c701787965246638c1a6fd99fb2b6078114) - -Conflicts: - - dix/getevents.c ---- - dix/getevents.c | 22 +++++++++------------- - include/inputstr.h | 2 +- - 2 files changed, 10 insertions(+), 14 deletions(-) - -diff --git a/dix/getevents.c b/dix/getevents.c -index 7454cb4..f1e7491 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -1895,32 +1895,28 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, - default: - return 0; - } -- if (t->mode == XIDirectTouch && !(flags & TOUCH_CLIENT_ID)) { -- if (!valuator_mask_isset(&mask, 0)) -- valuator_mask_set_double(&mask, 0, -- valuator_mask_get_double(touchpoint.ti-> -- valuators, 0)); -- if (!valuator_mask_isset(&mask, 1)) -- valuator_mask_set_double(&mask, 1, -- valuator_mask_get_double(touchpoint.ti-> -- valuators, 1)); -- } - - /* Get our screen event co-ordinates (root_x/root_y/event_x/event_y): - * these come from the touchpoint in Absolute mode, or the sprite in - * Relative. */ - if (t->mode == XIDirectTouch) { -- transformAbsolute(dev, &mask); -- - if (!(flags & TOUCH_CLIENT_ID)) { -- for (i = 0; i < valuator_mask_size(&mask); i++) { -+ for (i = 0; i < max(valuator_mask_size(&mask), 2); i++) { - double val; - - if (valuator_mask_fetch_double(&mask, i, &val)) - valuator_mask_set_double(touchpoint.ti->valuators, i, val); -+ /* If the device doesn't post new X and Y axis values, -+ * use the last values posted. -+ */ -+ else if (i < 2 && -+ valuator_mask_fetch_double(touchpoint.ti->valuators, i, -+ &val)) -+ valuator_mask_set_double(&mask, i, val); - } - } - -+ transformAbsolute(dev, &mask); - clipAbsolute(dev, &mask); - } - else { -diff --git a/include/inputstr.h b/include/inputstr.h -index 841e805..bce46cb 100644 ---- a/include/inputstr.h -+++ b/include/inputstr.h -@@ -331,7 +331,7 @@ typedef struct _DDXTouchPointInfo { - uint32_t ddx_id; /* touch ID given by the DDX */ - Bool emulate_pointer; - -- ValuatorMask *valuators; /* last recorded axis values */ -+ ValuatorMask *valuators; /* last axis values as posted, pre-transform */ - } DDXTouchPointInfoRec; - - typedef struct _TouchClassRec { --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch deleted file mode 100644 index edf5d6d9cc..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-chromeos-mode.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -aur xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c ---- xorg-server-1.12.4/hw/xfree86/modes/xf86Crtc.c 2012-08-26 22:11:00.000000000 -0700 -+++ xorg-server-1.12.4.work/hw/xfree86/modes/xf86Crtc.c 2012-10-26 16:34:34.316834000 -0700 -@@ -2208,6 +2208,53 @@ - } - - static Bool -+xf86TargetChromeOS(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, -+ DisplayModePtr *modes, Bool *enabled, -+ int width, int height) -+{ -+ int o, p; -+ DisplayModePtr main_output_mode; -+ xf86OutputPtr main_output = NULL; -+ Bool found = FALSE; -+ -+ /* Find the main output */ -+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) -+ { -+ if ( !strncmp(config->output[o]->name, "LVDS", 4) || -+ !strncmp(config->output[o]->name, "eDP", 3) ) -+ { -+ main_output = config->output[o]; -+ break; -+ } -+ } -+ -+ /* If we didn't find anything, grab the first enabled output */ -+ if (!main_output) { -+ o = -1; -+ nextEnabledOutput(config, enabled, &o); -+ main_output = config->output[o]; -+ } -+ -+ if (!main_output) -+ return FALSE; -+ -+ if (!(main_output_mode = xf86OutputHasPreferredMode(main_output, -+ width, height))) -+ return FALSE; -+ -+ /* Actually do the modesetting: turn off all non-main monitors */ -+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) -+ { -+ if (config->output[o] == main_output) -+ modes[o] = main_output_mode; -+ else -+ (*config->output[o]->funcs->dpms)(config->output[o], DPMSModeOff); -+ } -+ -+ return TRUE; -+} -+ -+static Bool - xf86CrtcSetInitialGamma(xf86CrtcPtr crtc, float gamma_red, float gamma_green, - float gamma_blue) - { -@@ -2369,6 +2416,8 @@ - else { - if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) - xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); -+ else if (xf86TargetChromeOS(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using ChromeOS mode for initial modes\n"); - else if (xf86TargetPreferred - (scrn, config, modes, enabled, width, height)) - xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch deleted file mode 100644 index 16e872e277..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/1.9.3-no-default-cursor.patch +++ /dev/null @@ -1,90 +0,0 @@ -Subject: [PATCH] no default cursor - -Revive the Xserver's null-root-cursor option. ---- - configure.ac | 7 +++++++ - dix/cursor.c | 17 +++++++++++++++++ - include/dix-config.h.in | 3 +++ - 3 files changed, 27 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 03beb36..e4d0163 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -566,6 +566,9 @@ AC_ARG_ENABLE(install-libxf86config, - [Install libxf86config (default: disabled)]), - [INSTALL_LIBXF86CONFIG=$enableval], - [INSTALL_LIBXF86CONFIG=no]) -+AC_ARG_ENABLE(null-root-cursor, AS_HELP_STRING([--enable-null-root-cursor], [Use an empty root cursor (default: use core cursor)]), -+ [NULL_ROOT_CURSOR=$enableval], -+ [NULL_ROOT_CURSOR=no]) - AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]), - [SYMBOL_VISIBILITY=$enableval], - [SYMBOL_VISIBILITY=auto]) -@@ -1239,6 +1242,10 @@ XKB_LIB='$(top_builddir)/xkb/libxkb.la' - XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' - REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" - -+if test "x$NULL_ROOT_CURSOR" = xyes; then -+ AC_DEFINE(NULL_ROOT_CURSOR, 1, [Use an empty root cursor]) -+fi -+ - PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"]) - if test "x$have_libxdmcp" = xyes; then - AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS]) -diff --git a/dix/cursor.c b/dix/cursor.c -index 6bff447..8771abf 100644 ---- a/dix/cursor.c -+++ b/dix/cursor.c -@@ -455,10 +455,26 @@ CursorPtr - CreateRootCursor(char *unused1, unsigned int unused2) - { - CursorPtr curs; -+#ifdef NULL_ROOT_CURSOR -+ CursorMetricRec cm; -+#else - FontPtr cursorfont; - int err; - XID fontID; -+#endif -+ -+#ifdef NULL_ROOT_CURSOR -+ cm.width = 0; -+ cm.height = 0; -+ cm.xhot = 0; -+ cm.yhot = 0; - -+ AllocARGBCursor(NULL, NULL, NULL, &cm, 0, 0, 0, 0, 0, 0, -+ &curs, serverClient, (XID)0); -+ -+ if (curs == NullCursor) -+ return NullCursor; -+#else - fontID = FakeClientID(0); - err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync, - (unsigned) strlen(defaultCursorFont), defaultCursorFont); -@@ -472,6 +488,7 @@ CreateRootCursor(char *unused1, unsigned int unused2) - if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0, - &curs, serverClient, (XID) 0) != Success) - return NullCursor; -+#endif - - if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer) curs)) - return NullCursor; -diff --git a/include/dix-config.h.in b/include/dix-config.h.in -index 3fb6413..d9871d4 100644 ---- a/include/dix-config.h.in -+++ b/include/dix-config.h.in -@@ -402,6 +402,9 @@ - /* Support HAL for hotplug */ - #undef CONFIG_HAL - -+/* Use an empty root cursor */ -+#undef NULL_ROOT_CURSOR -+ - /* Have a monotonic clock from clock_gettime() */ - #undef MONOTONIC_CLOCK - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1 deleted file mode 100644 index 365664e665..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm-setup.initd-1 +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm-setup.initd-1,v 1.1 2010/04/13 10:07:39 scarabeus Exp $ - -depend() { - need localmount -} - -start() { - if get_bootparam "nox" ; then - touch /etc/.noxdm - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4 deleted file mode 100644 index c82fece01c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.confd-4 +++ /dev/null @@ -1,10 +0,0 @@ -# We always try and start X on a static VT. The various DMs normally default -# to using VT7. If you wish to use the xdm init script, then you should ensure -# that the VT checked is the same VT your DM wants to use. We do this check to -# ensure that you haven't accidentally configured something to run on the VT -# in your /etc/inittab file so that you don't get a dead keyboard. -CHECKVT=7 - -# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ] -# NOTE: If this is set in /etc/rc.conf, that setting will override this one. -DISPLAYMANAGER="xdm" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8 b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8 deleted file mode 100644 index 539cac107c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xdm.initd-8 +++ /dev/null @@ -1,216 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-8,v 1.1 2012/05/01 22:08:46 chithanh Exp $ - -# This is here to serve as a note to myself, and future developers. -# -# Any Display manager (gdm,kdm,xdm) has the following problem: if -# it is started before any getty, and no vt is specified, it will -# usually run on vt2. When the getty on vt2 then starts, and the -# DM is already started, the getty will take control of the keyboard, -# leaving us with a "dead" keyboard. -# -# Resolution: add the following line to /etc/inittab -# -# x:a:once:/etc/X11/startDM.sh -# -# and have /etc/X11/startDM.sh start the DM in daemon mode if -# a lock is present (with the info of what DM should be started), -# else just fall through. -# -# How this basically works, is the "a" runlevel is a additional -# runlevel that you can use to fork processes with init, but the -# runlevel never gets changed to this runlevel. Along with the "a" -# runlevel, the "once" key word means that startDM.sh will only be -# run when we specify it to run, thus eliminating respawning -# startDM.sh when "xdm" is not added to the default runlevel, as was -# done previously. -# -# This script then just calls "telinit a", and init will run -# /etc/X11/startDM.sh after the current runlevel completes (this -# script should only be added to the actual runlevel the user is -# using). -# -# Martin Schlemmer -# aka Azarah -# 04 March 2002 - -depend() { - need localmount xdm-setup - - # this should start as early as possible - # we can't do 'before *' as that breaks it - # (#139824) Start after ypbind and autofs for network authentication - # (#145219 #180163) Could use lirc mouse as input device - # (#70689 comment #92) Start after consolefont to avoid display corruption - # (#291269) Start after quota, since some dm need readable home - # (#390609) gdm-3 will fail when dbus is not running - # (#366753) starting keymaps after X causes problems - after bootmisc consolefont modules netmount - after readahead-list ypbind autofs openvpn gpm lircmd - after quota keymaps - before alsasound - - # Start before X - use consolekit dbus xfs -} - -setup_dm() { - local MY_XDM - - MY_XDM=$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]') - - # Load our root path from profile.env - # Needed for kdm - PATH=${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}") - - NAME= - case "${MY_XDM}" in - kdm|kde) - EXE=/usr/bin/kdm - PIDFILE=/var/run/kdm.pid - ;; - entrance*) - EXE=/usr/sbin/entranced - PIDFILE=/var/lib/entranced.pid - ;; - gdm|gnome) - EXE=/usr/bin/gdm - [ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary - PIDFILE=/var/run/gdm.pid - ;; - wdm) - EXE=/usr/bin/wdm - PIDFILE= - ;; - gpe) - EXE=/usr/bin/gpe-dm - PIDFILE=/var/run/gpe-dm.pid - ;; - lxdm) - EXE=/usr/sbin/lxdm-binary - PIDFILE=/var/run/lxdm.pid - START_STOP_ARGS="--background" - ;; - lightdm) - EXE=/usr/sbin/lightdm - PIDFILE=/var/run/lightdm.pid - START_STOP_ARGS="--background" - ;; - *) - # first find out if there is such executable - EXE="$(command -v ${MY_XDM} 2>/dev/null)" - PIDFILE="/var/run/${MY_XDM}.pid" - - # warn user that he is doing sick things if the exe was not found - if [ -z "${EXE}" ]; then - echo "ERROR: Your XDM value is invalid." - echo " No ${MY_XDM} executable could be found on your system." - fi - ;; - esac - - if ! [ -x "${EXE}" ]; then - EXE=/usr/bin/xdm - PIDFILE=/var/run/xdm.pid - if ! [ -x "/usr/bin/xdm" ]; then - echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm," - echo " or install x11-apps/xdm package" - eend 255 - fi - fi -} - -# Check to see if something is defined on our VT -vtstatic() { - if [ -e /etc/inittab ] ; then - grep -Eq "^[^#]+.*\" /etc/inittab - elif [ -e /etc/ttys ] ; then - grep -q "^ttyv$(($1 - 1))" /etc/ttys - else - return 1 - fi -} - -start() { - local EXE NAME PIDFILE - setup_dm - - if [ -f /etc/.noxdm ]; then - einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed." - rm /etc/.noxdm - return 0 - fi - - ebegin "Setting up ${EXE##*/}" - - # save the prefered DM - save_options "service" "${EXE}" - save_options "name" "${NAME}" - save_options "pidfile" "${PIDFILE}" - save_options "start_stop_args" "${START_STOP_ARGS}" - - if [ -n "${CHECKVT-y}" ] ; then - if vtstatic "${CHECKVT:-7}" ; then - if [ -x /sbin/telinit ] && [ "${SOFTLEVEL}" != "BOOT" ] && [ "${RC_SOFTLEVEL}" != "BOOT" ]; then - ewarn "Something is already defined on VT ${CHECKVT:-7}, will start X later" - telinit a >/dev/null 2>&1 - return 0 - else - eerror "Something is already defined on VT ${CHECKVT:-7}, not starting" - return 1 - fi - fi - fi - - /etc/X11/startDM.sh - eend 0 -} - -stop() { - local curvt retval - - retval=0 - if [ -t 0 ]; then - if type fgconsole >/dev/null 2>&1; then - curvt=$(fgconsole 2>/dev/null) - else - curvt=$(tty) - case "${curvt}" in - /dev/ttyv[0-9]*) curvt=${curvt#/dev/ttyv} ;; - *) curvt= ;; - esac - fi - fi - local myexe myname mypidfile myservice - myexe=$(get_options "service") - myname=$(get_options "name") - mypidfile=$(get_options "pidfile") - myservice=${myexe##*/} - - [ -z "${myexe}" ] && return 0 - - ebegin "Stopping ${myservice}" - - if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then - start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \ - ${mypidfile:+--pidfile} ${mypidfile} \ - ${myname:+--name} ${myname} - retval=${?} - fi - - # switch back to original vt - if [ -n "${curvt}" ]; then - if type chvt >/dev/null 2>&1; then - chvt "${curvt}" - else - vidcontrol -s "$((curvt + 1))" - fi - fi - - eend ${retval} "Error stopping ${myservice}" - return ${retval} -} - -# vim: set ts=4 : diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch deleted file mode 100644 index 9a8b9149e9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 2693ce7..ac752fc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then - linux_alpha=yes - ;; - i*86|amd64*|x86_64*|ia64*) -- linux_acpi="yes" - ;; - *) - ;; --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf deleted file mode 100644 index 5cd8112f58..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/files/xorg-sets.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Rebuild all X11 modules (mostly useful after xorg-server ABI change). -[x11-module-rebuild] -class = portage.sets.dbapi.VariableSet -world-candidate = false -variable = CATEGORY -includes = x11-drivers diff --git a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild deleted file mode 100644 index 6648d602b4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-base/xorg-server/xorg-server-1.12.4-r10.ebuild +++ /dev/null @@ -1,335 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.12.2.ebuild,v 1.9 2012/07/22 12:54:50 chithanh Exp $ - -EAPI=4 - -XORG_DOC=doc -XORG_EAUTORECONF="yes" -inherit flag-o-matic xorg-2 multilib versionator -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" - -DESCRIPTION="X.Org X servers" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" - -IUSE_SERVERS="dmx kdrive xnest xorg xvfb" -# +suid needed because sparcs default off -IUSE="${IUSE_SERVERS} broken_partialswaps -doc ipv6 minimal nptl selinux +suid tegra tslib +udev" - -RDEPEND=">=app-admin/eselect-opengl-1.0.8 - dev-libs/openssl - media-libs/freetype - >=x11-apps/iceauth-1.0.2 - >=x11-apps/rgb-1.0.3 - >=x11-apps/xauth-1.0.3 - x11-apps/xkbcomp - >=x11-libs/libpciaccess-0.12.901 - >=x11-libs/libXau-1.0.4 - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libXfont-1.4.2 - >=x11-libs/libxkbfile-1.0.4 - >=x11-libs/pixman-0.21.8 - >=x11-libs/xtrans-1.2.2 - >=x11-misc/xbitmaps-1.0.1 - >=x11-misc/xkeyboard-config-2.4.1-r3 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) - !minimal? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-7.8_rc[nptl=] - ) - tslib? ( >=x11-libs/tslib-1.0 ) - udev? ( >=sys-fs/udev-150 ) - >=x11-apps/xinit-1.3 - selinux? ( sec-policy/selinux-xserver )" - -DEPEND="${RDEPEND} - sys-devel/flex - >=x11-proto/bigreqsproto-1.1.0 - >=x11-proto/compositeproto-0.4 - >=x11-proto/damageproto-1.1 - >=x11-proto/fixesproto-5.0 - >=x11-proto/fontsproto-2.0.2 - >=x11-proto/glproto-1.4.14 - >=x11-proto/inputproto-2.1.99.3 - >=x11-proto/kbproto-1.0.3 - >=x11-proto/randrproto-1.2.99.3 - >=x11-proto/recordproto-1.13.99.1 - >=x11-proto/renderproto-0.11 - >=x11-proto/resourceproto-1.0.2 - >=x11-proto/scrnsaverproto-1.1 - >=x11-proto/trapproto-3.4.3 - >=x11-proto/videoproto-2.2.2 - >=x11-proto/xcmiscproto-1.2.0 - >=x11-proto/xextproto-7.1.99 - >=x11-proto/xf86dgaproto-2.0.99.1 - >=x11-proto/xf86rushproto-1.1.2 - >=x11-proto/xf86vidmodeproto-2.2.99.1 - >=x11-proto/xineramaproto-1.1.3 - >=x11-proto/xproto-7.0.22 - dmx? ( - >=x11-proto/dmxproto-2.2.99.1 - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - !minimal? ( - >=x11-proto/xf86driproto-2.1.0 - >=x11-proto/dri2proto-2.6 - >=x11-libs/libdrm-2.4.20 - )" - -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - )" - -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) - -PATCHES=( - "${UPSTREAMED_PATCHES[@]}" - "${FILESDIR}"/${PN}-1.12-disable-acpi.patch - - # Allow usage of monotonic clock while cross-compiling. - "${FILESDIR}/1.11.99.902-monotonic-clock-fix.patch" - "${FILESDIR}/1.11.99.902-cache-xkbcomp-for-fast-start-up.patch" - # Match the behaviour of monitor_reconfigure at X.Org startup time. - "${FILESDIR}/1.9.3-chromeos-mode.patch" - # Allow setting the root window background to nothing to further reduce - # flicker when showing and hiding the composite overlay window. - "${FILESDIR}/1.11.99.902-allow-root-none.patch" - # Refcount glxdrawables to avoid crashes on double free() - "${FILESDIR}/1.11.99.902-refcnt-glxdrawable.patch" - - "${FILESDIR}/1.11.99.902-chromium-mouse-accel-profile.patch" - - "${FILESDIR}/1.11.99.902-xserver-bg-none-root.patch" - # Dont load a default X cursor. - "${FILESDIR}/1.9.3-no-default-cursor.patch" - # Ability to run without root privs - "${FILESDIR}/1.11.99.902-nohwaccess.patch" - # Don't attend clients which are already gone, race condition in dri2 - "${FILESDIR}/1.12.0-do-not-attend-gone-clients.patch" - # crosbug.com/p/11408 - "${FILESDIR}/1.12.0-fix-scale-to-desktop-for-edge-ABS-events.patch" - # Fix for xfixes pointer barriers - "${FILESDIR}/1.12.0-xfixes-safer-barriers.patch" - # crosbug.com/33813 - "${FILESDIR}/1.12.0-suffix-match-udev-paths.patch" - # crosbug.com/31570 - "${FILESDIR}/1.12.0-os-block-signals-when-accessing-global-timer-list.patch" - # Fix for crash with floating touchscreen (http://crosbug.com/27529) - "${FILESDIR}/1.12.0-mi-don-t-check-for-core-events-in-miPointerSetPositi.patch" - # Add the flag to specify the maximum VT the user can switch to - "${FILESDIR}/1.12.0-add-maxvt-flag.patch" - # Save touchpoint last coordinates before transform - "${FILESDIR}/1.13.0-dix-Save-touchpoint-last-coordinates-before-transform.patch" - # crbug.com/30822 - "${FILESDIR}/1.12.4-Per-Randr-CRTC-pointer-scaling.patch" -) - -src_prepare() { - # Partial flips - if use broken_partialswaps; then - PATCHES+=( - "${FILESDIR}/1.12.0-emulate-partial-flips.patch" - ) - fi - xorg-2_src_prepare -} - -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 wont work for xorg-server." -} - -pkg_setup() { - xorg-2_pkg_setup - - # localstatedir is used for the log location; we need to override the default - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # NOTE: fop is used for doc generating ; and i have no idea if gentoo - # package it somewhere - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable kdrive kdrive-kbd) - $(use_enable kdrive kdrive-mouse) - $(use_enable kdrive kdrive-evdev) - $(use_enable tslib) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !tegra dri) - $(use_enable !tegra dri2) - $(use_enable !arm glx) - $(use_enable !arm vgahw) - $(use_enable !arm vbe) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable nptl glx-tls) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_enable suid install-setuid) - --sysconfdir=/etc/X11 - --localstatedir=/var - --with-fontrootdir=/usr/share/fonts - --with-xkb-output=/var/lib/xkb - --disable-config-hal - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - --disable-xvmc - --disable-xdmcp - --disable-screensaver - --disable-xdm-auth-1 - --disable-dbe - --disable-xinerama - --disable-dga - --disable-xace - --disable-config-dbus - --disable-config-hal - --disable-clientids - --disable-xf86vidmode - --disable-registry - --disable-xfake - --disable-dmx - --disable-xvfb - --disable-xnest - --enable-null-root-cursor - --with-default-font-path=built-ins - ) - - if use amd64 || use x86 ; then - XORG_CONFIGURE_OPTIONS+=( --enable-xaa) - else - XORG_CONFIGURE_OPTIONS+=( --disable-xaa) - fi - - # Things we may want to remove later: - # --disable-xaa (requires dropping all xaa drivers) - # --disable-xv (requires fixing the drivers) - # --disable-tcp-transport - # --disable-ipv6 - # --disable-secure-rpc - - # Xorg-server requires includes from OS mesa which are not visible for - # users of binary drivers. - mkdir -p "${T}/mesa-symlinks/GL" - for i in gl glx glxmd glxproto glxtokens; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - for i in glext glxext; do - ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die - done - append-cppflags "-I${T}/mesa-symlinks" - - # Make breakage less obvious, bug #402285. - replace-flags -O3 -O2 -} - -src_install() { - xorg-2_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example - fi - - newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup - newinitd "${FILESDIR}"/xdm.initd-8 xdm - newconfd "${FILESDIR}"/xdm.confd-4 xdm - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf - - # crosbug.com/11553 - dosym /usr/bin/Xorg /usr/bin/X11/X || die -} - -pkg_postinst() { - # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old - - if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then - ewarn "You must rebuild all drivers if upgrading from buggy_gradients = TRUE; --#else -- display->buggy_gradients = FALSE; --#endif - display->buggy_pad_reflect = FALSE; - display->buggy_repeat = FALSE; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch deleted file mode 100644 index dc20714ae2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/cairo/files/cairo-1.8.8-interix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools ---- cairo-1.8.8.orig/build/configure.ac.tools 2009-09-30 13:36:42 +0200 -+++ cairo-1.8.8/build/configure.ac.tools 2009-09-30 13:50:50 +0200 -@@ -21,5 +21,12 @@ - *) PKGCONFIG_REQUIRES="Requires.private"; ;; - esac - -+dnl hmm... on interix, things go really bad with Requires.private, since libpng12 -+dnl is missing on the final link commands, so gtk+'s configure checks for cairo -+dnl fail miserably with unresolved symbols to it. -+case "$host_os" in -+interix*) PKGCONFIG_REQUIRES="Requires" ;; -+esac -+ - AC_SUBST(PKGCONFIG_REQUIRES) - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog deleted file mode 100644 index 89ab30cbf6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/ChangeLog +++ /dev/null @@ -1,1916 +0,0 @@ -# ChangeLog for x11-libs/gtk+ -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.447 2010/03/11 14:52:23 pacho Exp $ - -*gtk+-2.18.7-r1 (11 Mar 2010) - - 11 Mar 2010; Pacho Ramos +gtk+-2.18.7-r1.ebuild, - +files/gtk+-2.18.7-destroy-crash.patch: - Fix bug 308985, thanks to Michael Bombach for reporting and finding the - fix. - - 06 Mar 2010; Pacho Ramos gtk+-2.18.7.ebuild: - amd64 stable, bug 304777 - - 06 Mar 2010; Pawel Hajdan jr gtk+-2.18.6.ebuild: - x86 stable wrt bug #304777 - - 06 Mar 2010; Samuli Suominen gtk+-2.18.6.ebuild: - amd64 stable wrt #304777 - - 23 Feb 2010; Christian Faulhammer gtk+-2.18.7.ebuild: - Use libresolv from sys-libs/itx-bin on Interix Prefix - -*gtk+-2.18.7 (23 Feb 2010) - - 23 Feb 2010; Romain Perier +gtk+-2.18.7.ebuild: - Version bump, many bugsfixes and translation updates, per bug #306187. - Thanks to LeBarJack for tests. - - 19 Jan 2010; Samuli Suominen gtk+-2.18.5.ebuild, - gtk+-2.18.6.ebuild: - Require SLOT="0" of media-libs/jpeg wrt #301551. - -*gtk+-2.18.6 (15 Jan 2010) - - 15 Jan 2010; Romain Perier +gtk+-2.18.6.ebuild: - Version bump, various bugs fixes and translation update. - - 09 Jan 2010; Christian Faulhammer gtk+-2.18.5.ebuild: - keyword ~x86-freebsd - - 24 Dec 2009; Jonathan Callen gtk+-2.18.5.ebuild, - +files/gtk+-2.18.5-macosx-aqua.patch: - Add patch for Aqua on Mac OS X; move prefix keywords from overlay - -*gtk+-2.18.5 (13 Dec 2009) - - 13 Dec 2009; Nirbheek Chauhan -gtk+-2.18.3.ebuild, - +gtk+-2.18.5.ebuild: - Bump to 2.18.5; remove old -- many bugfixes; a few translation updates - - 31 Oct 2009; Nirbheek Chauhan gtk+-2.18.3.ebuild: - Depend on cairo[svg]; fixes bug 291283 (we probably want to do +svg in - cairo) - -*gtk+-2.18.3 (29 Oct 2009) - - 29 Oct 2009; Gilles Dartiguelongue +gtk+-2.18.3.ebuild: - New version for GNOME 2.28. - - 26 Oct 2009; Raúl Porcel gtk+-2.16.6.ebuild: - ia64/sh/sparc stable wrt #285586 - - 08 Oct 2009; Markus Meier gtk+-2.16.6.ebuild: - arm stable, bug #285586 - - 03 Oct 2009; Tobias Klausmann gtk+-2.16.6.ebuild: - Stable on alpha, bug #285586 - - 30 Sep 2009; Jeroen Roovers gtk+-2.16.6.ebuild: - Stable for HPPA (bug #285586). - - 27 Sep 2009; nixnut gtk+-2.16.6.ebuild: - ppc stable #285586 - - 25 Sep 2009; Brent Baude gtk+-2.16.6.ebuild: - Marking gtk+-2.16.6 ppc64 stable for bug 285586 - - 22 Sep 2009; Markus Meier gtk+-2.16.6.ebuild: - x86 stable, bug #285586 - - 20 Sep 2009; Mart Raudsepp - +files/gtk+-2.16.6-fix-pltcheck-test.patch, gtk+-2.16.6.ebuild: - Fix tests, bug 285698 - - 20 Sep 2009; Mart Raudsepp -gtk+-2.16.1.ebuild, - -gtk+-2.16.5.ebuild, -gtk+-2.16.5-r1.ebuild: - Remove old - - 19 Sep 2009; Olivier Crête gtk+-2.16.6.ebuild: - Stable on amd64, bug #285586 - -*gtk+-2.16.6 (19 Sep 2009) - - 19 Sep 2009; Mart Raudsepp +gtk+-2.16.6.ebuild: - Version bump. Various safe bug fixes - -*gtk+-2.16.5-r1 (06 Sep 2009) - - 06 Sep 2009; Romain Perier - +gtk+-2.16.5-r1.ebuild, - +files/gtk+-2.16.5-jpeg-backward-compatibility.patch: - Fix jpeg7 blured images in gdk-pixbuf due to jpeg7 scale specs changes, - per bug #282744. - -*gtk+-2.16.5 (19 Jul 2009) - - 19 Jul 2009; Gilles Dartiguelongue +gtk+-2.16.5.ebuild: - Version bump. Lots of bug fixes, disable tests broken in gentoo env. - -*gtk+-2.16.1 (04 May 2009) - - 04 May 2009; Gilles Dartiguelongue -gtk+-2.10.14.ebuild, - +gtk+-2.16.1.ebuild: - New version for GNOME 2.26. New GtkOrientable API, a lot of bug fixes and - polish all over the place. - - 27 Apr 2009; Jeroen Roovers gtk+-2.14.7-r2: - Stable for HPPA (bug #260063). - - 22 Apr 2009; Mart Raudsepp - -files/gtk+-2.12.1-cupsutils.patch, -gtk+-2.12.8.ebuild, - -gtk+-2.14.4.ebuild, -gtk+-2.14.5.ebuild, -gtk+-2.14.7.ebuild, - -gtk+-2.14.7-r1.ebuild: - Remove old - - 12 Apr 2009; Friedrich Oslage ChangeLog: - Stable on sparc, bug #260063 - - 29 Mar 2009; Raúl Porcel gtk+-2.14.7-r2.ebuild: - arm/sh/sparc stable - - 18 Mar 2009; Raúl Porcel gtk+-2.14.7-r2.ebuild: - alpha/ia64 stable wrt #260063 - - 15 Mar 2009; Markus Meier gtk+-2.14.7-r2.ebuild: - x86 stable, bug #260063 - - 11 Mar 2009; Daniel Gryniewicz gtk+-2.14.7-r2.ebuild: - Marked stable on amd64 - - 06 Mar 2009; Brent Baude gtk+-2.14.7-r2.ebuild: - Marking gtk+-2.14.7-r2 ppc stable for bug 260063 - - 05 Mar 2009; Brent Baude gtk+-2.14.7-r2.ebuild: - Marking gtk+-2.14.7-r2 ppc64 stable for bug 260063 - -*gtk+-2.14.7-r2 (01 Mar 2009) - - 01 Mar 2009; Gilles Dartiguelongue - +files/gtk+-2.14.7-ignore-gtkcurve.patch, - +files/gtk+-2.14.7-uncertain-mime.patch, +gtk+-2.14.7-r2.ebuild: - Bump to 2.14.7-r2. Hopefully fix test failures, bug #238995, and enhance - mime-type resolution, bug #257980. - - 15 Feb 2009; Raúl Porcel gtk+-2.12.11.ebuild: - arm/sh stable - -*gtk+-2.14.7-r1 (29 Jan 2009) - - 29 Jan 2009; Daniel Gryniewicz - +files/gtk+-2.14.7-filechooser.patch, +gtk+-2.14.7-r1.ebuild: - Fix for filechooser centering: bug #239360 - -*gtk+-2.14.7 (15 Jan 2009) - - 15 Jan 2009; Mart Raudsepp +gtk+-2.14.7.ebuild: - Version bump for various bug fixes. This is a stable candidate. - - 30 Nov 2008; Gilles Dartiguelongue gtk+-2.10.14.ebuild, - gtk+-2.12.8.ebuild, gtk+-2.12.11.ebuild, gtk+-2.12.12.ebuild, - gtk+-2.14.4.ebuild, gtk+-2.14.5.ebuild: - Update comment about preview command, bug #236547. - -*gtk+-2.14.5 (27 Nov 2008) - - 27 Nov 2008; Mart Raudsepp - -files/gtk+-2.12.9-filechooser-fix-icon-size.patch, - -files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch, - -files/gtk+-2.12.9-print-backend-64bit.patch, - -files/gtk+-2.12.9-treeview-search-window-type.patch, - -files/gtk+-2.12.10-fix-get_frame_extents.patch, - -files/gtk+-2.12.10-fix-treeview_sort_indicators.patch, - -files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch, - -files/gtk+-2.14.3-fix-combining-broken-diacritics.patch, - -files/gtk+-2.14.3-fix-filesystem-double-free.patch, - -files/gtk+-2.14.3-fix-lpr_write-double-free.patch, - -files/gtk+-2.14.3-fix-password-dialog-on-mount.patch, - -files/gtk+-2.14.3-notebook-tab-draw-correctness.patch, - -files/gtk+-2.14.3-reorder-compose-key-table-order.patch, - -gtk+-2.12.9-r1.ebuild, -gtk+-2.12.9-r2.ebuild, -gtk+-2.12.10-r1.ebuild, - -gtk+-2.14.3-r1.ebuild, -gtk+-2.14.3-r2.ebuild, +gtk+-2.14.5.ebuild: - Version bump for various bug fixes. Remove old - - 17 Nov 2008; Diego E. Pettenò - files/gtk+-2.10.7-mozilla-dnd-fix.patch: - Fix patch with absolute paths. - - 13 Nov 2008; Brent Baude gtk+-2.12.11.ebuild: - Marking gtk+-2.12.11 ppc64 stable for bug 236971 - -*gtk+-2.14.4 (19 Oct 2008) - - 19 Oct 2008; Mart Raudsepp +gtk+-2.14.4.ebuild: - Version bump for various bug fixes - - 18 Oct 2008; Brent Baude gtk+-2.12.11.ebuild: - Marking gtk+-2.12.11 ppc stable for bug 236971 - -*gtk+-2.14.3-r2 (01 Oct 2008) - - 01 Oct 2008; Rémi Cardona - +files/gtk+-2.14.3-fix-combining-broken-diacritics.patch, - +files/gtk+-2.14.3-reorder-compose-key-table-order.patch, - +gtk+-2.14.3-r2.ebuild: - fix broken diacritics on intl keyboards (see gnome bug #554192) - -*gtk+-2.14.3-r1 (29 Sep 2008) - - 29 Sep 2008; Mart Raudsepp - +files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch, - +files/gtk+-2.14.3-fix-filesystem-double-free.patch, - +files/gtk+-2.14.3-fix-lpr_write-double-free.patch, - +files/gtk+-2.14.3-fix-password-dialog-on-mount.patch, - +files/gtk+-2.14.3-notebook-tab-draw-correctness.patch, - -gtk+-2.14.3.ebuild, +gtk+-2.14.3-r1.ebuild: - Add a few fixes from upstream unreleased code - - 28 Sep 2008; Mart Raudsepp - +files/gtk+-2.14.3-limit-gtksignal-includes.patch, gtk+-2.14.3.ebuild: - Adjust a header so that packages using GtkCList will remain buildable - - 25 Sep 2008; Jeroen Roovers gtk+-2.12.11.ebuild: - Stable for HPPA (bug #236971). - -*gtk+-2.14.3 (25 Sep 2008) - - 25 Sep 2008; Mart Raudsepp +gtk+-2.14.3.ebuild: - Major version bump. Uses GIO (and indirectly gvfs for remote file support) - directly for filechooser, with improved auto-completion; printer dialog - can show status information; includes gail accessibility library with - other a11y improvements; better keyboard compose sequences; jpeg2000 - support for gdk-pixbuf with USE=jpeg2k; uses Xrandr for more and better - monitor information; new API that helps removing use of libgnome(ui) by - applications; and much much more - -*gtk+-2.12.12 (22 Sep 2008) - - 22 Sep 2008; Mart Raudsepp +gtk+-2.12.12.ebuild: - Version bump for bug fixes in the 2.12 series - - 09 Sep 2008; Raúl Porcel gtk+-2.12.11.ebuild: - alpha/ia64/sparc stable wrt #236971 - - 08 Sep 2008; Markus Meier gtk+-2.12.11.ebuild: - x86 stable, bug #236971 - - 07 Sep 2008; Olivier Crête gtk+-2.12.11.ebuild: - amd64 stable, bug #236971 - - 12 Aug 2008; Raúl Porcel gtk+-2.12.10-r1.ebuild: - alpha/ia64/sparc stable wrt #229709 - - 10 Aug 2008; Markus Meier gtk+-2.12.10-r1.ebuild: - x86 stable, bug #229709 - - 31 Jul 2008; Gilles Dartiguelongue - gtk+-1.2.10-r12.ebuild, -gtk+-2.12.1-r2.ebuild, -gtk+-2.12.5-r1.ebuild, - -gtk+-2.12.9.ebuild, -gtk+-2.12.10.ebuild: - drop gtk+-1 to ~mips for repoman check. - clean up old revisions. - - 30 Jul 2008; Brent Baude gtk+-2.12.10-r1.ebuild: - Marking gtk+-2.12.10-r1 ppc stable for bug 229709 - - 26 Jul 2008; Olivier Crête gtk+-2.12.10-r1.ebuild: - Stable on amd64, bug #229709 - -*gtk+-2.12.11 (16 Jul 2008) - - 16 Jul 2008; Gilles Dartiguelongue +gtk+-2.12.11.ebuild: - version bump for various bug fixes and translation updates. - -*gtk+-2.12.10-r1 (11 Jun 2008) - - 11 Jun 2008; Mart Raudsepp - +files/gtk+-2.12.10-fix-get_frame_extents.patch, - +files/gtk+-2.12.10-fix-nocxx.patch, - +files/gtk+-2.12.10-fix-treeview_sort_indicators.patch, - +files/gtk+-2.12.10-no-libintl.patch, +gtk+-2.12.10-r1.ebuild: - Fix bug #225339 in gdk_window_get_frame_extents causing window - misplacements by various programs; fix sort indicator on treeview not - showing in certain circumstances; also include some patches that benefit - embedded use cases - - 07 Jun 2008; nixnut gtk+-2.12.9-r2.ebuild: - Stable on ppc wrt bug 224817 - - 07 Jun 2008; Kenneth Prugh gtk+-2.12.9-r2.ebuild: - amd64 stable, bug #224817 - - 04 Jun 2008; Raúl Porcel gtk+-2.12.9-r2.ebuild: - alpha/ia64/sparc stable wrt #224817 - - 04 Jun 2008; Markus Rothe gtk+-2.12.9-r2.ebuild: - Stable on ppc64; bug #224817 - - 04 Jun 2008; Dawid WÄ™gliÅ„ski gtk+-2.12.9-r2.ebuild: - Stable on x86 (bug #224817) - - 04 Jun 2008; Jeroen Roovers gtk+-2.12.9-r2.ebuild: - Stable for HPPA (bug #224817). - -*gtk+-2.12.10 (04 Jun 2008) - - 04 Jun 2008; Mart Raudsepp +gtk+-2.12.10.ebuild: - Version bump for various bug fixes - - 28 Apr 2008; Gilles Dartiguelongue - +files/gtk+-2.12.9-libtool-2.patch, gtk+-2.12.9-r2.ebuild: - Fix libtool usage for configure stage, bug #213789. Fix bug #197899 by - raising gtk-doc to 1.8 (as per upstream svn). - -*gtk+-2.12.9-r2 (10 Apr 2008) - - 10 Apr 2008; Mart Raudsepp - +files/gtk+-2.12.9-filechooser-fix-icon-size.patch, - +files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch, - +files/gtk+-2.12.9-print-backend-64bit.patch, - +files/gtk+-2.12.9-treeview-search-window-type.patch, - +gtk+-2.12.9-r2.ebuild: - Fix 64bit printing dialogs, especially seen in Eclipse, bugs 214863 and - 215318; Improve ~ handling in gtk+ filechooser backend (outside GNOME usage - mostly), bug 215146; Also add patches to fix treeview search popup window - type for compiz benefits and filechooser icon size inconsistencies that were - best seen with GVFS bookmark icons - -*gtk+-2.12.9-r1 (26 Mar 2008) - - 26 Mar 2008; Rémi Cardona +gtk+-2.12.9-r1.ebuild: - fix cups support (fixes bug #214017, patch by Octavio Ruiz) - - 22 Mar 2008; Daniel Gryniewicz gtk+-2.12.8.ebuild: - Marked stable on amd64 for bug #212986 - -*gtk+-2.12.9 (17 Mar 2008) - - 17 Mar 2008; Mart Raudsepp +gtk+-2.12.9.ebuild: - Version bump for mostly bug fixes - - 17 Mar 2008; Jeroen Roovers gtk+-2.12.8.ebuild: - Stable for HPPA (bug #212986). - - 15 Mar 2008; nixnut gtk+-2.12.8.ebuild: - Stable on ppc wrt bug 212986 - - 14 Mar 2008; Raúl Porcel gtk+-2.12.8.ebuild: - alpha/ia64/sparc stable wrt #212986 - - 12 Mar 2008; Christian Faulhammer gtk+-2.12.8.ebuild: - stable x86, bug 212986 - - 12 Mar 2008; Brent Baude gtk+-2.12.8.ebuild: - Marking gtk+-2.12.8 ppc64 for bug 212986 - -*gtk+-2.12.8 (14 Feb 2008) - - 14 Feb 2008; Mart Raudsepp +gtk+-2.12.8.ebuild: - Version bump for assorted bug fixes, including multiple filechooser - improvements - - 04 Feb 2008; Jeroen Roovers gtk+-2.12.5-r1.ebuild: - Stable for HPPA (bug #208366). - -*gtk+-2.12.7 (03 Feb 2008) - - 03 Feb 2008; Mart Raudsepp +gtk+-2.12.7.ebuild: - Version bump - - 03 Feb 2008; Raúl Porcel gtk+-2.12.5-r1.ebuild: - alpha/ia64/sparc stable wrt #208366 - - 02 Feb 2008; Chris Gianelloni gtk+-2.12.5-r1.ebuild: - Stable on amd64 wrt bug #208366. - - 01 Feb 2008; Brent Baude gtk+-2.12.5-r1.ebuild: - Marking gtk+-2.12.5-r1 ppc64 and ppc stable for bug 208366 - - 01 Feb 2008; Christian Faulhammer - gtk+-2.12.5-r1.ebuild: - stable x86, bug 208366 - -*gtk+-2.12.5-r1 (13 Jan 2008) - - 13 Jan 2008; Gilles Dartiguelongue - +gtk+-2.12.5-r1.ebuild: - apply flash & OOo fix again (bug #205515) - -*gtk+-2.12.5 (10 Jan 2008) - - 10 Jan 2008; Gilles Dartiguelongue +gtk+-2.12.5.ebuild: - bump to 2.12.5, numerous fixes (firefox, OOo, pixbufs, and many more) - - 14 Dec 2007; Saleem Abdulrasool - -files/gtk+-2.2.1-disable_icons_smooth_alpha.patch, - -files/gtk+-2.4.9-ppc64.patch, - -files/gtk+-2.12.0-icon-cache-speedup.patch, - -files/gtk+-2.12.0-libtracker_so.patch, - -files/gtk+-2.12.0-searchenginesimple-crash-fix.patch, - -files/gtk+-2.12.0-swt-tooltips-fix.patch, -files/gtk+-2-xpm_loader.patch, - -gtk+-2.6.10-r1.ebuild, -gtk+-2.8.19.ebuild, -gtk+-2.8.20-r1.ebuild, - -gtk+-2.10.13.ebuild, -gtk+-2.12.1-r1.ebuild: - prune unused versions - - 23 Nov 2007; Jeroen Roovers gtk+-2.12.1-r2.ebuild: - Stable for HPPA (bug #198845). - - 23 Nov 2007; Jeroen Roovers gtk+-2.12.1-r1.ebuild: - Stable for HPPA (bug #198845). - -*gtk+-2.12.1-r2 (21 Nov 2007) - - 21 Nov 2007; Samuli Suominen +gtk+-2.12.1-r2.ebuild: - gdk-pixbuf.loaders installation was broken by einstall passing sysconfdir, - revert back to using make with destdir wrt #199746. - - 20 Nov 2007; Joshua Kinard gtk+-2.12.1-r1.ebuild: - Stable on mips, per #198845. - - 20 Nov 2007; Joshua Kinard gtk+-2.10.14.ebuild: - Stable on mips, per #190019. - - 19 Nov 2007; Markus Rothe gtk+-2.12.1-r1.ebuild: - Stable on ppc64; bug #198845 - - 17 Nov 2007; nixnut gtk+-2.12.1-r1.ebuild: - Stable on ppc wrt bug 198845 - - 14 Nov 2007; Raúl Porcel gtk+-2.12.1-r1.ebuild: - sparc stable wrt #198845 - - 14 Nov 2007; Raúl Porcel gtk+-2.12.1-r1.ebuild: - alpha/ia64 stable wrt #198845 - - 13 Nov 2007; Christian Faulhammer - gtk+-2.12.1-r1.ebuild: - stable x86, bug 198845 - - 13 Nov 2007; Mart Raudsepp gtk+-2.6.10-r1.ebuild, - gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild, gtk+-2.10.13.ebuild, - gtk+-2.10.14.ebuild: - QA: Fix quoting of variables in old versions - - 13 Nov 2007; Mart Raudsepp -gtk+-2.10.11.ebuild, - -gtk+-2.12.0-r2.ebuild, -gtk+-2.12.1.ebuild: - Remove old unnecessary versions - - 12 Nov 2007; Samuli Suominen gtk+-2.12.1-r1.ebuild: - amd64 stable wrt #198845 - -*gtk+-2.12.1-r1 (05 Nov 2007) - - 05 Nov 2007; Daniel Gryniewicz - +files/gtk+-2.12.1-cupsutils.patch, +gtk+-2.12.1-r1.ebuild: - Bump to 2.12.1-r1 - Include patch to fix printing on ppc64; bug #197639 - - 28 Oct 2007; Gilles Dartiguelongue gtk+-2.12.1.ebuild: - add vim-syntax support, fix bug #152275 - add a note about evince being the default backend for printing preview - -*gtk+-2.12.1 (20 Oct 2007) - - 20 Oct 2007; Mart Raudsepp - +files/gtk+-2.12.1-firefox-print-preview.patch, -gtk+-2.12.0.ebuild, - -gtk+-2.12.0-r1.ebuild, +gtk+-2.12.1.ebuild: - Version bump. Include patch to fix firefox print preview crash for bug #195644 - -*gtk+-2.12.0-r2 (25 Sep 2007) - - 25 Sep 2007; Mart Raudsepp - +files/gtk+-2.12.0-openoffice-freeze-workaround.patch, - +files/gtk+-2.12.0-searchenginesimple-crash-fix.patch, - +gtk+-2.12.0-r2.ebuild: - Fix a crash in file chooser search functionality and freezes in OpenOffice - when ran outside Gnome; upstream bug #480123 and our bug #193513 - respectively - - 25 Sep 2007; Mart Raudsepp gtk+-2.12.0-r1.ebuild: - QA: Some quoting and other fixes, thanks to Donnie Berkholz - -*gtk+-2.12.0-r1 (24 Sep 2007) - - 24 Sep 2007; Mart Raudsepp - +files/gtk+-2.12.0-flash-workaround.patch, - +files/gtk+-2.12.0-swt-tooltips-fix.patch, +gtk+-2.12.0-r1.ebuild: - Hopefully fix netscape-flash crashes and infinite loops and Java SWT - tooltips weird behaviour and related crashes. Bug #193513 and part of bug - #192310 and self-observation - -*gtk+-2.12.0 (21 Sep 2007) - - 21 Sep 2007; Rémi Cardona - +files/gtk+-2.12.0-icon-cache-speedup.patch, +gtk+-2.12.0.ebuild: - Add gtk+-2.12.0 (Gnome 2.20) - - 21 Sep 2007; Brent Baude gtk+-2.10.14.ebuild: - Marking gtk+-2.10.14 ppc64 for bug #190019 - - 28 Aug 2007; nixnut gtk+-2.10.14.ebuild: - Stable on ppc wrt bug 190019 - - 28 Aug 2007; Jeroen Roovers gtk+-2.10.14.ebuild: - Stable for HPPA (bug #190019). - - 25 Aug 2007; Raúl Porcel gtk+-2.10.14.ebuild: - alpha/ia64/x86 stable wrt #190019 - - 24 Aug 2007; Wulf C. Krueger gtk+-2.10.14.ebuild: - Marked stable on amd64 as per bug 190019. - - 24 Aug 2007; Gustavo Zacarias gtk+-2.10.14.ebuild: - Stable on sparc wrt #190019 - - 31 Jul 2007; Joshua Kinard gtk+-2.10.13.ebuild: - Stable on mips, per #185614. - - 23 Jul 2007; nixnut gtk+-2.10.13.ebuild: - Stable on ppc wrt bug 185614 - - 22 Jul 2007; Donnie Berkholz ; - gtk+-1.2.10-r12.ebuild, gtk+-2.6.10-r1.ebuild, gtk+-2.8.19.ebuild, - gtk+-2.8.20-r1.ebuild: - Drop virtual/x11 references. - - 19 Jul 2007; Christoph Mende gtk+-2.10.13.ebuild: - Stable on amd64 wrt bug #185614 - - 18 Jul 2007; Raúl Porcel gtk+-2.10.13.ebuild: - alpha/ia64/x86 stable wrt #185614 - - 17 Jul 2007; Jeroen Roovers gtk+-2.10.13.ebuild: - Stable for HPPA (bug #185614). - - 17 Jul 2007; Markus Rothe gtk+-2.10.13.ebuild: - Stable on ppc64; bug #185614 - - 17 Jul 2007; Gustavo Zacarias gtk+-2.10.13.ebuild: - Stable on sparc wrt #185614 - -*gtk+-2.10.14 (16 Jul 2007) - - 16 Jul 2007; Mart Raudsepp - -files/gtk+-2.10.7-textview-fix.patch, -gtk+-2.10.6.ebuild, - -gtk+-2.10.7-r1.ebuild, -gtk+-2.10.9.ebuild, -gtk+-2.10.12.ebuild, - +gtk+-2.10.14.ebuild: - Version bump and remove some old versions - - 02 Jul 2007; Piotr JaroszyÅ„ski gtk+-2.8.19.ebuild, - gtk+-2.8.20-r1.ebuild, gtk+-2.10.6.ebuild, gtk+-2.10.7-r1.ebuild, - gtk+-2.10.9.ebuild, gtk+-2.10.11.ebuild, gtk+-2.10.12.ebuild, - gtk+-2.10.13.ebuild: - (QA) RESTRICT clean up. - - 27 Jun 2007; Mike Frysinger - +files/gtk+-1.2.10-automake.patch, +files/gtk+-1.2.10-cleanup.patch, - gtk+-1.2.10-r12.ebuild: - Fixup autotool handling #168198. - -*gtk+-2.10.13 (14 Jun 2007) - - 14 Jun 2007; Mart Raudsepp +gtk+-2.10.13.ebuild: - Version bump for bug fixes. Should also fix our bug #180669 - - 02 Jun 2007; Brent Baude gtk+-2.10.11.ebuild: - Marking gtk+-2.10.11 ppc stable for bug #171107 - - 31 May 2007; Jeroen Roovers gtk+-2.10.11.ebuild: - Stable for HPPA (bug #171107). - - 31 May 2007; Daniel Gryniewicz gtk+-2.10.11.ebuild: - Marked stable on amd64 for bug #171107 - - 31 May 2007; Brent Baude gtk+-2.10.11.ebuild: - Marking gtk+-2.10.11 ppc64 stable for bug #171107 - - 30 May 2007; Raúl Porcel gtk+-2.10.11.ebuild: - alpha/ia64 stable wrt #171107 - - 29 May 2007; Andrej Kacian gtk+-2.10.11.ebuild: - Stable on x86, bug #171107. - - 29 May 2007; Gustavo Zacarias gtk+-2.10.11.ebuild: - Stable on sparc wrt #171107 - - 27 May 2007; Joshua Kinard gtk+-2.10.11.ebuild: - Stable on mips. - - 26 May 2007; Daniel Gryniewicz gtk+-2.10.11.ebuild: - icon cache patch shouldn't have gone into .11 - - 22 May 2007; Daniel Gryniewicz - +files/gtk+-2.10.11-update-icon-subdirs.patch, gtk+-2.10.11.ebuild, - gtk+-2.10.12.ebuild: - Add patch to check intelligently for icon cache updates - -*gtk+-2.10.12 (03 May 2007) - - 03 May 2007; Saleem Abdulrasool - +gtk+-2.10.12.ebuild: - Version bump from upstream with numerous bug fixes - - 22 Mar 2007; Chris Gianelloni gtk+-2.10.9.ebuild: - Stable on alpha/ia64/ppc wrt bug #163678. - - 15 Mar 2007; Markus Rothe gtk+-2.10.9.ebuild: - Stable on ppc64; bug #163678 - - 15 Mar 2007; Gustavo Zacarias gtk+-2.10.9.ebuild: - Stable on sparc wrt #163678 - - 15 Mar 2007; Jeroen Roovers gtk+-2.10.9.ebuild: - Stable for HPPA (bug #163678). - -*gtk+-2.10.11 (14 Mar 2007) - - 14 Mar 2007; Daniel Gryniewicz +gtk+-2.10.11.ebuild: - Bump to 2.10.11 - - Tons of bug fixes... - - 14 Mar 2007; Simon Stelling gtk+-2.10.9.ebuild: - stable on amd64; security bug 163678 - - 14 Mar 2007; Christian Faulhammer gtk+-2.10.9.ebuild: - stable x86, bug 163678 - - 21 Feb 2007; Simon Stelling gtk+-2.10.6.ebuild, - gtk+-2.10.9.ebuild: - we don't need the use x86 && [[ LIBDIR == lib32 ]] hack anymore - -*gtk+-2.10.9 (25 Jan 2007) - - 25 Jan 2007; Mart Raudsepp +gtk+-2.10.9.ebuild: - Version bump - -*gtk+-2.10.7-r1 (16 Jan 2007) - - 16 Jan 2007; Mart Raudsepp - +files/gtk+-2.10.7-mozilla-dnd-fix.patch, -gtk+-2.10.7.ebuild, - +gtk+-2.10.7-r1.ebuild: - Fix drag and drop problem in mozilla products, bug 162362 - -*gtk+-2.10.7 (14 Jan 2007) - - 14 Jan 2007; Mart Raudsepp - +files/gtk+-2.10.7-textview-fix.patch, +gtk+-2.10.7.ebuild: - Version bump, also fix bug 158179 - - 10 Jan 2007; Mart Raudsepp -gtk+-1.2.10-r11.ebuild: - Remove old gtk1 revision - - 09 Jan 2007; Mart Raudsepp - -files/gtk+-gdk-pixbuf-testfix.patch, -gtk+-2.8.8.ebuild, - -gtk+-2.8.12.ebuild: - Remove some old versions - - 06 Jan 2007; Stephen P. Becker gtk+-1.2.10-r12.ebuild: - stable on mips - - 05 Jan 2007; Diego Pettenò gtk+-2.8.8.ebuild, - gtk+-2.8.12.ebuild, gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild, - gtk+-2.10.6.ebuild: - Remove debug.eclass usage. - - 09 Dec 2006; Bryan Østergaard gtk+-2.10.6.ebuild: - Stable on Alpha. - - 07 Dec 2006; Mart Raudsepp gtk+-2.10.6.ebuild: - Fix the broken syntax in elog for the module rebuild suggestion, bug #157419 - - 07 Dec 2006; Doug Goldstein gtk+-2.10.6.ebuild: - Removed pdf USE flag check since cairo no longer has the pdf USE flag - - 01 Dec 2006; Gustavo Zacarias gtk+-2.10.6.ebuild: - Stable on hppa wrt #156572 - - 01 Dec 2006; Markus Rothe gtk+-2.10.6.ebuild: - Stable on ppc64; bug #156572 - - 01 Dec 2006; Gustavo Zacarias gtk+-2.10.6.ebuild: - Stable on sparc wrt #156572 - - 30 Nov 2006; Tobias Scherbaum gtk+-2.10.6.ebuild: - ppc stable, bug #156572 - - 30 Nov 2006; Christian Faulhammer gtk+-2.10.6.ebuild: - stable x86, bug #156572 - - 29 Nov 2006; Olivier Crête gtk+-2.10.6.ebuild: - Stable on amd64 for bugs #156572 - - 12 Nov 2006; Donnie Berkholz ; gtk+-2.8.8.ebuild, - gtk+-2.8.12.ebuild, gtk+-2.8.19.ebuild, gtk+-2.8.20-r1.ebuild, - gtk+-2.10.6.ebuild: - Remove warning about Nvidia drivers RENDER accel being broken (Andy Ritger, - Nvidia). It's reported fixed on >=8756 and current stable is 8776. - - 05 Nov 2006; Mart Raudsepp gtk+-1.2.10-r12.ebuild: - Fix automake dependency, bug #150503 - - 01 Nov 2006; Bryan Østergaard gtk+-1.2.10-r12.ebuild: - Stable on Alpha, bug 150355. - - 20 Oct 2006; Simon Stelling Manifest: - repoman broke the manifest - - 20 Oct 2006; Simon Stelling gtk+-1.2.10-r12.ebuild: - stable on amd64 - - 19 Oct 2006; Bryan Østergaard gtk+-2.8.19.ebuild: - Stable on Alpha. - - 14 Oct 2006; Aron Griffis gtk+-1.2.10-r12.ebuild: - Mark 1.2.10-r12 stable on ia64. #150355 - - 11 Oct 2006; Stephanie Lockwood-Childs - gtk+-1.2.10-r12.ebuild: - stable on ppc (Bug #150355) - - 10 Oct 2006; Gustavo Zacarias - gtk+-1.2.10-r12.ebuild: - Stable on sparc wrt #150355 - - 09 Oct 2006; Jeroen Roovers gtk+-1.2.10-r12.ebuild: - Stable for HPPA (bug #150355). - -*gtk+-2.10.6 (07 Oct 2006) - - 07 Oct 2006; Mart Raudsepp - -files/gtk+-2.10.5-buildfile_typo.patch, -gtk+-2.10.4.ebuild, - -gtk+-2.10.5.ebuild, +gtk+-2.10.6.ebuild: - New version in the 2.10 series - - 07 Oct 2006; Markus Rothe gtk+-1.2.10-r12.ebuild: - Stable on ppc64; bug #150355 - - 07 Oct 2006; Andrej Kacian gtk+-1.2.10-r12.ebuild: - Stable on x86, bug #150355. - -*gtk+-1.2.10-r12 (07 Oct 2006) - - 07 Oct 2006; Alin Nastac - +files/gtk+-1.2.10-as-needed.patch, +gtk+-1.2.10-r12.ebuild: - Strip unsupported languages from LINGUAS (#114797). Fix broken compilation - of dependent packages when they're build with LDFLAGS=-Wl,--as-needed - (#133819). - -*gtk+-2.10.5 (02 Oct 2006) - - 02 Oct 2006; Mart Raudsepp - +files/gtk+-2.10.5-buildfile_typo.patch, +gtk+-2.10.5.ebuild: - Version bump for 2.10 series. - -*gtk+-2.10.4 (28 Sep 2006) - - 28 Sep 2006; Mart Raudsepp -gtk+-2.10.2.ebuild, - -gtk+-2.10.3.ebuild, +gtk+-2.10.4.ebuild: - Add 2.10.4, and clean up older 2.10 versions - - 25 Sep 2006; Daniel Gryniewicz Manifest: - Fix digest - - 23 Sep 2006; Markus Rothe gtk+-2.8.19.ebuild, - gtk+-2.8.20-r1.ebuild, gtk+-2.10.2.ebuild, gtk+-2.10.3.ebuild: - Do not filter -mminimal-toc on ppc64, else it won't build - - 15 Sep 2006; John N. Laliberte Manifest: - fix digest, #147632 - - 14 Sep 2006; Daniel Gryniewicz - +files/gtk+-gdk-pixbuf-testfix.patch, +gtk+-2.8.8.ebuild: - Oops, missed a hard dep on 2.8.8. Thanks, mr-bones - - 13 Sep 2006; Daniel Gryniewicz gtk+-2.8.19.ebuild, - gtk+-2.8.20-r1.ebuild, gtk+-2.10.2.ebuild, gtk+-2.10.3.ebuild: - Only allow upstream-supported CFLAGS. Bug #133469 - - 13 Sep 2006; Daniel Gryniewicz - -files/gtk+-gdk-pixbuf-testfix.patch, -gtk+-1.2.10-r10.ebuild, - -gtk+-2.8.8.ebuild, -gtk+-2.8.17.ebuild, -gtk+-2.8.18.ebuild, - -gtk+-2.8.20.ebuild: - Clean up old versions - - 12 Sep 2006; Daniel Gryniewicz gtk+-2.10.3.ebuild: - Remove monolithic X deps - -*gtk+-2.10.3 (05 Sep 2006) - - 05 Sep 2006; Daniel Gryniewicz -gtk+-2.10.0.ebuild, - -gtk+-2.10.1.ebuild, +gtk+-2.10.3.ebuild: - Add 2.10.3, and clean up older 2.10 versions - - 05 Sep 2006; Joshua Kinard gtk+-2.8.19.ebuild: - Marked stable on mips. - - 04 Sep 2006; Gustavo Zacarias - gtk+-1.2.10-r11.ebuild: - Stable on sparc - - 27 Aug 2006; Saleem Abdulrasool - gtk+-1.2.10-r11.ebuild: - Add an if block around the warning for gtkrc as per bug #141253 - -*gtk+-2.10.2 (26 Aug 2006) - - 26 Aug 2006; Saleem Abdulrasool +gtk+-2.10.2.ebuild: - version bump from upstream - - 16 Aug 2006; Markus Rothe gtk+-2.8.19.ebuild: - Stable on ppc64 - - 26 Jul 2006; Stefan Schweizer gtk+-2.10.1.ebuild: - Pango 1.12 is enough thanks to Todd Merrill in - bug 141797 - -*gtk+-2.10.1 (24 Jul 2006) - - 24 Jul 2006; Stefan Schweizer +gtk+-2.10.1.ebuild: - version bump - - 19 Jul 2006; Olivier Crête files/digest-gtk+-2.8.19: - Fix digest - -*gtk+-2.8.20-r1 (18 Jul 2006) - - 18 Jul 2006; John N. Laliberte - +gtk+-2.8.20-r1.ebuild, gtk+-2.10.0.ebuild: - we now create a gtkrc file with the fallback theme set to gnome. fixes #133241 - - 17 Jul 2006; Daniel Gryniewicz gtk+-2.8.19.ebuild: - Marked stable on amd64 for bug #139612 - -*gtk+-2.8.20 (17 Jul 2006) - - 17 Jul 2006; Daniel Gryniewicz +gtk+-2.8.20.ebuild: - Bump to 2.8.20 and fix bug #140222 - - 16 Jul 2006; Tobias Scherbaum gtk+-2.8.19.ebuild: - hppa stable, bug #139612 - - 14 Jul 2006; Tobias Scherbaum gtk+-2.8.19.ebuild: - ppc stable, bug #139612 - - 12 Jul 2006; Chris Gianelloni gtk+-2.8.19.ebuild: - Stable on x86 wrt bug #139612. - - 12 Jul 2006; Chris Gianelloni gtk+-2.8.19.ebuild: - Stable on x86 wrt bug #139612. - - 10 Jul 2006; Gustavo Zacarias gtk+-2.8.19.ebuild: - Stable on sparc wrt #139612 - - 08 Jul 2006; Stefan Schweizer gtk+-2.10.0.ebuild: - Add elog message about rebuilding the gtk-engines - -*gtk+-2.10.0 (05 Jul 2006) - - 05 Jul 2006; Stefan Schweizer +gtk+-2.10.0.ebuild: - version bump thanks to Milosz Kosobucki and Josef - Reidinger in bug 139195 - - 25 Jun 2006; Javier Villavicencio - gtk+-2.8.19.ebuild: - Add ~x86-fbsd keyword. - -*gtk+-2.8.19 (16 Jun 2006) - - 16 Jun 2006; Leonardo Boshell +gtk+-2.8.19.ebuild: - New release. - -*gtk+-2.8.18 (26 May 2006) - - 26 May 2006; John N. Laliberte -gtk+-2.8.11.ebuild, - -gtk+-2.8.13.ebuild, -gtk+-2.8.16.ebuild, +gtk+-2.8.18.ebuild: - new version, cleanup old versions. - -*gtk+-2.8.17 (01 May 2006) - - 01 May 2006; Daniel Gryniewicz +gtk+-2.8.17.ebuild: - Bump for 2.14.1 - - 21 Apr 2006; Thomas Cort gtk+-2.8.12.ebuild: - Stable on alpha wrt Bug #126321. - - 21 Apr 2006; Marinus Schraal gtk+-2.8.16.ebuild : - Always enable png, so we actually can display icons - - 15 Apr 2006; Stephen P. Becker gtk+-2.8.12.ebuild: - stable on mips - - 12 Apr 2006; Diego Pettenò gtk+-1.2.10-r11.ebuild: - Add ~x86-fbsd keyword. - - 07 Apr 2006; Diego Pettenò gtk+-2.8.13.ebuild, - gtk+-2.8.16.ebuild: - Restrict confcache on gtk+ as it might cause spurious failures during build - (not during configure). - - 24 Mar 2006; Aron Griffis gtk+-2.8.12.ebuild: - Mark 2.8.12 stable on ia64 - - 20 Mar 2006; Seemant Kulleen gtk+-2.8.16.ebuild: - fix the make check stage which wants to run a gtk+ app (so run it in a - virtual X display). - - 19 Mar 2006; Markus Rothe gtk+-2.8.12.ebuild: - Stable on ppc64 - - 18 Mar 2006; Olivier Crête gtk+-2.8.12.ebuild: - Stable on amd64 per bug #126321 - - 17 Mar 2006; Chris Gianelloni gtk+-2.8.12.ebuild: - Stable on x86 wrt bug #126321. - - 17 Mar 2006; Tobias Scherbaum gtk+-2.8.12.ebuild: - Stable gnome-2.12.3 for ppc, bug #126321 - - 16 Mar 2006; John N. Laliberte gtk+-2.8.16.ebuild: - add missing inherit on autotools eclass. fixes #126455 - -*gtk+-2.8.16 (16 Mar 2006) - - 16 Mar 2006; John N. Laliberte -gtk+-2.8.15.ebuild, - +gtk+-2.8.16.ebuild: - new version - - 14 Mar 2006; Gustavo Zacarias gtk+-2.8.12.ebuild: - Stable on hppa - -*gtk+-2.8.15 (13 Mar 2006) - - 13 Mar 2006; Saleem Abdulrasool +gtk+-2.8.15.ebuild: - Version bump from upstream. allanonjl dropped disable_icons_smooth_alpha - patch, and bumped glib dependency to 2.10.1. - - 13 Mar 2006; Gustavo Zacarias gtk+-2.8.12.ebuild: - Stable on sparc - -*gtk+-2.8.13 (03 Mar 2006) - - 03 Mar 2006; Saleem Abdulrasool +gtk+-2.8.13.ebuild: - Version bump from upstream - - 20 Feb 2006; Saleem Abdulrasool - gtk+-1.2.10-r11.ebuild: - Fixing mod-z deps as per bug #123453 - - 12 Feb 2006; John N. Laliberte gtk+-2.8.12.ebuild: - add AT_M4DIR to fix compilation when user does not have gtk-doc installed - -*gtk+-2.8.12 (12 Feb 2006) - - 12 Feb 2006; John N. Laliberte +gtk+-2.8.12.ebuild: - new version. this includes the patch to fix the slow repainting with ATI - cards. remove smoothscroll patch, use eautoreconf. - - 12 Feb 2006; Donnie Berkholz ; - gtk+-1.2.10-r10.ebuild, gtk+-1.2.10-r11.ebuild, gtk+-2.6.10-r1.ebuild: - Fix for modular X. - - 03 Feb 2006; Aron Griffis gtk+-2.8.8.ebuild: - Mark 2.8.8 stable on ia64 - - 03 Feb 2006; Guy Martin gtk+-2.8.8.ebuild: - Stable on hppa. - -*gtk+-2.8.11 (29 Jan 2006) - - 29 Jan 2006; John N. Laliberte -gtk+-2.8.9.ebuild, - -gtk+-2.8.10.ebuild, +gtk+-2.8.11.ebuild: - version bump. cleanup old ebuilds. remove abicheck.sh patch since it is now - applied upstream. - - 14 Jan 2006; +files/gtk+-2.8.10-xinerama.patch, - gtk+-2.8.10.ebuild: - Make xinerama support optional. Bug #118744 - - 13 Jan 2006; Fernando J. Pereda gtk+-2.8.8.ebuild: - Stable on alpha wrt bug #117505 - -*gtk+-2.8.10 (13 Jan 2006) - - 13 Jan 2006; John N. Laliberte - +files/gtk+-gdk-pixbuf-testfix.patch, gtk+-2.8.8.ebuild, - gtk+-2.8.9.ebuild, +gtk+-2.8.10.ebuild: - apply patch to fix #118722 . Attached patch to gnome bug #317961 - - 08 Jan 2006; Tobias Scherbaum gtk+-2.8.8.ebuild: - ppc stable, bug #117505 - - 04 Jan 2006; Mark Loeser gtk+-2.8.8.ebuild: - Stable on x86; bug #117505 - - 03 Jan 2006; Luis Medinas gtk+-2.8.8.ebuild: - Stable on amd64. For bug #117505. - - 03 Jan 2006; Markus Rothe gtk+-2.8.8.ebuild: - Stable on ppc64 - - 03 Jan 2006; Gustavo Zacarias gtk+-2.8.8.ebuild: - Stable on sparc wrt #117505 - - 02 Jan 2006; John N. Laliberte - -files/gtk+-2.8.6-freebsd.patch, -gtk+-2.6.8.ebuild, - -gtk+-2.8.6-r1.ebuild, -gtk+-2.8.7.ebuild, gtk+-2.8.8.ebuild, - gtk+-2.8.9.ebuild: - cleanup old builds, add informational message about RenderAccel bug, bump - atk dep to fix #111741 - -*gtk+-2.8.9 (13 Dec 2005) - - 13 Dec 2005; +gtk+-2.8.9.ebuild: - New upstream version - - 13 Dec 2005; Seemant Kulleen gtk+-1.2.10-r11.ebuild: - modular X deps, committing Donnie's fixes in bug #115232 - -*gtk+-2.8.8 (01 Dec 2005) - - 01 Dec 2005; +gtk+-2.8.8.ebuild: - New upstream release - - 20 Nov 2005; Hardave Riar gtk+-2.6.10-r1.ebuild: - Stable on mips, bug #112608. - -*gtk+-2.8.7 (18 Nov 2005) - - 18 Nov 2005; Leonardo Boshell +gtk+-2.8.7.ebuild: - New version. Dropped patches that have been integrated upstream. - -*gtk+-2.8.6-r1 (15 Nov 2005) -*gtk+-2.6.10-r1 (15 Nov 2005) - - 15 Nov 2005; Leonardo Boshell - +files/gtk+-2-xpm_loader.patch, -gtk+-2.6.10.ebuild, - +gtk+-2.6.10-r1.ebuild, -gtk+-2.8.6.ebuild, +gtk+-2.8.6-r1.ebuild: - Added patch to fix a probem inside gdk-pixbuf regarding the XPM loader - (bug #112608). Marked 2.6.10-r1 stable on all arches that reported back - successful testing. - - 11 Nov 2005; Michael Hanselmann gtk+-2.6.10.ebuild: - Stable on hppa, ppc. - - 04 Nov 2005; gtk+-2.8.6.ebuild: - Make sure cairo was built with X. bug 111483 - - 02 Nov 2005; Gustavo Zacarias gtk+-2.6.10.ebuild: - Stable on sparc - - 01 Nov 2005; John N. Laliberte gtk+-2.6.10.ebuild: - stable on x86 - - 31 Oct 2005; Leonardo Boshell gtk+-2.6.10.ebuild, - gtk+-2.8.6.ebuild: - Fix logic around GTK2_CONFDIR to make the postinst hook work on binary - packages. - - 27 Oct 2005; Diego Pettenò - +files/gtk+-2.8.6-freebsd.patch, gtk+-2.8.6.ebuild: - Added patch to compile on FreeBSD as per bug #109519. - - 22 Oct 2005; Yuta SATOH gtk+-2.6.8.ebuild, - gtk+-2.6.10.ebuild: - also fixes #109089 of 2.6.x - - 19 Oct 2005; Yuta SATOH gtk+-2.8.6.ebuild: - Fixes #109089 by not applying the patch which fixes the problem of the - cursor key for ppc64. - - 10 Oct 2005; Hardave Riar gtk+-2.6.8.ebuild: - Stable on mips. - -*gtk+-2.8.6 (08 Oct 2005) - - 08 Oct 2005; Leonardo Boshell -gtk+-2.8.4.ebuild, - +gtk+-2.8.6.ebuild: - New version. - -*gtk+-2.8.4 (27 Sep 2005) - - 27 Sep 2005; Leonardo Boshell - -files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3-r1.ebuild, - +gtk+-2.8.4.ebuild: - New version. - - 17 Sep 2005; Aron Griffis gtk+-2.6.8.ebuild: - Mark 2.6.8 stable on alpha - -*gtk+-2.8.3-r1 (04 Sep 2005) - - 04 Sep 2005; Leonardo Boshell - +files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3.ebuild, - +gtk+-2.8.3-r1.ebuild: - Avoid passing --disable-debug. Added patch with various bug fixes from - upstream CVS repository. - - 03 Sep 2005; Michael Hanselmann gtk+-2.6.8.ebuild: - Stable on ppc. - - 03 Sep 2005; Markus Rothe gtk+-2.6.8.ebuild: - Stable on ppc64 - -*gtk+-2.8.3 (01 Sep 2005) - - 01 Sep 2005; Leonardo Boshell - -files/gtk+-2.8.0-dep_checks.patch, -files/gtk+-2.8.0-gdk_fix.patch, - -gtk+-2.8.0-r2.ebuild, -gtk+-2.8.2.ebuild, +gtk+-2.8.3.ebuild: - New version. - - 31 Aug 2005; Herbie Hopkins gtk+-2.6.8.ebuild: - Stable on amd64. - - 29 Aug 2005; Guy Martin gtk+-2.6.8.ebuild: - Stable on hppa. - - 26 Aug 2005; Gustavo Zacarias gtk+-2.6.8.ebuild: - Stable on sparc - -*gtk+-2.8.2 (25 Aug 2005) - - 25 Aug 2005; Doug Goldstein +gtk+-2.8.2.ebuild: - rev bump. modular X depends. clean up old cruft from the 2.0.x days. - - 25 Aug 2005; Aron Griffis gtk+-2.6.8.ebuild: - stable on ia64 - - 25 Aug 2005; Leonardo Boshell - gtk+-2.6.8.ebuild: - Stable on x86. - - 23 Aug 2005; Aron Griffis gtk+-2.6.7.ebuild: - stable on ia64 - - 19 Aug 2005; Leonardo Boshell gtk+-2.6.10.ebuild, - gtk+-2.8.0-r2.ebuild: - Fix invocation of epatch (bug #103042). - -*gtk+-2.8.0-r2 (19 Aug 2005) - - 19 Aug 2005; Leonardo Boshell - +files/gtk+-2.8.0-dep_checks.patch, +files/gtk+-2.8.0-gdk_fix.patch, - +gtk+-2.8.0-r2.ebuild: - Patches from upstream CVS to fix gdk warnings and related side-effects, as - wall as sanitizing some dependencies (bug #102854). - -*gtk+-2.6.10 (18 Aug 2005) - - 18 Aug 2005; Leonardo Boshell +gtk+-2.6.10.ebuild: - New version from the stable branch. - -*gtk+-2.8.0-r1 (17 Aug 2005) - - 17 Aug 2005; Herbie Hopkins - +files/gtk+-2.8.0-multilib.patch, +gtk+-2.8.0-r1.ebuild: - Updated the multilib patch for 2.8, bug 101289 - -*gtk+-2.8.0 (15 Aug 2005) - - 15 Aug 2005; Leonardo Boshell gtk+-2.8.0.ebuild: - New version. - -*gtk+-2.7.4 (31 Jul 2005) - - 31 Jul 2005; Marinus Schraal gtk+-2.7.4.ebuild : - New release - - 12 Jul 2005; Stephen P. Becker gtk+-2.6.7.ebuild: - stable on mips - -*gtk+-2.6.8 (22 Jun 2005) - - 22 Jun 2005; Marinus Schraal gtk+-2.6.8.ebuild : - New release - - 12 Jun 2005; Olivier Crête gtk+-2.6.7.ebuild: - Stable on amd64 - - 12 Jun 2005; Tobias Scherbaum gtk+-2.6.7.ebuild: - Stable on ppc. - - 12 Jun 2005; Bryan Østergaard gtk+-2.6.7.ebuild: - Stable on alpha. - - 10 Jun 2005; Rene Nussbaumer gtk+-2.6.7.ebuild: - Stable on hppa. - - 06 Jun 2005; Gustavo Zacarias gtk+-2.6.7.ebuild: - Stable on sparc - - 06 Jun 2005; Markus Rothe gtk+-2.6.7.ebuild: - Stable on ppc64 - - 13 May 2005; Rene Nussbaumer gtk+-2.6.4-r1.ebuild: - stable on hppa - - 28 Apr 2005; Bryan Østergaard gtk+-2.6.4-r1.ebuild: - Stable on alpha + ia64. - - 20 Apr 2005; Michael Hanselmann gtk+-2.6.4-r1.ebuild: - Stable on ppc. - - 20 Apr 2005; Herbie Hopkins gtk+-2.6.4-r1.ebuild: - Stable on amd64. - - 18 Apr 2005; Herbie Hopkins gtk+-2.6.7.ebuild: - Minor multilib cleanup. - -*gtk+-2.6.7 (16 Apr 2005) - - 16 Apr 2005; foser gtk+-2.6.7.ebuild : - Updated scroll patch (#85663) - - 09 Apr 2005; Markus Rothe gtk+-2.6.4-r1.ebuild: - Stable on ppc64 - - 07 Apr 2005; Simon Stelling gtk+-2.4.14.ebuild: - stable on amd64 - - 02 Apr 2005; Stephen P. Becker gtk+-2.6.4-r1.ebuild: - stable on mips - - 30 Mar 2005; Gustavo Zacarias gtk+-2.6.4-r1.ebuild: - Stable on sparc - -*gtk+-2.6.4-r1 (30 Mar 2005) - - 30 Mar 2005; foser gtk+-2.6.4-r1.ebuild : - Add bmp corruption header fix (#86979) - Change location of epunt_cxx so it has some effect - - 21 Mar 2005; Jeremy Huddleston - gtk+-1.2.10-r11.ebuild: - Use the right toolchain compiler. - - 09 Mar 2005; Mike Gardiner gtk+-2.4.14.ebuild: - Keyworded ppc - - 08 Mar 2005; Gustavo Zacarias gtk+-2.6.2.ebuild: - Stable on sparc - - 07 Mar 2005; Markus Rothe gtk+-2.6.2.ebuild: - Stable on ppc64 - - 03 Mar 2005; Sven Wegener : - Added missing digest entries. - - 13 Feb 2005; Bryan Østergaard gtk+-2.4.14.ebuild: - Stable on alpha. - -*gtk+-2.6.2 (05 Feb 2005) - - 05 Feb 2005; Joe McCann +gtk+-2.6.2.ebuild: - New version. File selector and dialogue patches applied upstream and no - longer needed - -*gtk+-2.6.1-r2 (03 Feb 2005) - - 03 Feb 2005; Joe McCann - +files/gtk+-2.6.1-gtk_dialog.patch, +gtk+-2.6.1-r2.ebuild: - Adding upstream patch from bug 80262 as reported by compnerd. Should fix - gtk+ apps crashing when focus is called on lable widgets. - - 22 Jan 2005; Markus Rothe gtk+-2.6.1-r1.ebuild: - Added append-flags -mminimal-toc for ppc64 to let it compile - -*gtk+-2.6.1-r1 (17 Jan 2005) - - 17 Jan 2005; foser gtk+-2.6.1-r1.ebuild : - Add upstream patch for http://bugzilla.gnome.org/show_bug.cgi?id=164290 - block pixmap engine, partially fixes #77791 - - 13 Jan 2005; Mike Doty gtk+-2.6.1.ebuild: - amd64 patch update by seemant - - 12 Jan 2005; Gustavo Zacarias gtk+-2.4.14.ebuild: - Stable on sparc - -*gtk+-2.6.1 (12 Jan 2005) - - 12 Jan 2005; foser gtk+-2.6.1.ebuild : - New release, closes a whole lot of empty bugs - - 28 Dec 2004; Ciaran McCreesh : - Change encoding to UTF-8 for GLEP 31 compliance - -*gtk+-2.4.9-r2 (26 Dec 2004) - - 26 Dec 2004; Markus Rothe - +files/gtk+-2.4.9-ppc64.patch, gtk+-2.4.14.ebuild, +gtk+-2.4.9-r2.ebuild: - I've added the patch from bug #64359, which fixes a cursor key problem on - ppc64 to 2.4.9-r2 and 2.4.14. I marked 2.4.9-r2 stable on ppc64 and will - remove this version when 2.4.14 will be marked stable. Credits go to Yuta - SATOH. - - 24 Dec 2004; Bryan Østergaard gtk+-2.4.13-r1.ebuild: - Stable on alpha. - - 23 Dec 2004; Guy Martin gtk+-2.4.13-r1.ebuild: - Stable on hppa. - - 21 Dec 2004; Gustavo Zacarias gtk+-2.4.13-r1.ebuild: - Stable on sparc - - 20 Dec 2004; Dylan Carlson gtk+-2.4.13-r1.ebuild: - Stable on amd64. - - 19 Dec 2004; Mike Gardiner gtk+-2.4.13-r1.ebuild: - Keyworded x86 and ppc for GNOME 2.8.1 - -*gtk+-2.4.14 (11 Dec 2004) - - 11 Dec 2004; Mike Gardiner +gtk+-2.4.14.ebuild: - New version of gtk+ - -*gtk+-2.4.13-r1 (21 Nov 2004) - - 21 Nov 2004; foser gtk+-2.4.13-r1.ebuild : - Add revised smoothscroll patch (#71807), moved patch to mirrors - - 02 Nov 2004; Malcolm Lashley : - Fix missing digest - bug #69859 - -*gtk+-2.4.13 (02 Nov 2004) - - 02 Nov 2004; foser gtk+-2.4.13.ebuild : - Not so fresh release (#64913) - Add correct automake dep (#65796) - - 14 Oct 2004; Mamoru KOMACHI gtk+-1.2.10-r11.ebuild: - Removed ~ppc-macos keyword until bug #57677 is solved. - - 11 Oct 2004; Mamoru KOMACHI gtk+-1.2.10-r11.ebuild: - Added to ~ppc-macos. This closes bug #62069. - - 09 Oct 2004; Tom Gall gtk+-2.4.9-r1.ebuild: - stable on ppc64, bug #64230 - - 01 Oct 2004; Stephen P. Becker gtk+-2.4.4.ebuild, - gtk+-2.4.9-r1.ebuild: - stable on mips - - 20 Sep 2004; Bryan Østergaard,,, gtk+-2.4.9-r1.ebuild: - Stable on alpha, bug 64240. - - 20 Sep 2004; Gustavo Zacarias gtk+-2.4.9-r1.ebuild: - Stable on sparc wrt #64230 - - 20 Sep 2004; gtk+-2.4.9-r1.ebuild: - marked ppc gsla bug: 64230 - -*gtk+-2.4.9-r1 (20 Sep 2004) - - 20 Sep 2004; foser gtk+-2.4.9-r1.ebuild, gtk+-2.4.9-ico_xpm_secure.patch : - Add security fix for the ico & xpm loaders (#64230) - - 30 Aug 2004; Tom Gall gtk+-2.4.4.ebuild: - only stable version of gtk+-2.4.3 for ppc64 was removed, - marking 2.4.4 stable on an emergancy basis - -*gtk+-2.4.9 (29 Aug 2004) - - 29 Aug 2004; foser gtk+-2.4.4.ebuild: - Stable on alpha. - - 22 Aug 2004; Travis Tilley gtk+-2.4.4.ebuild, - gtk+-2.4.7.ebuild: - made arch specific config file patch apply on x86 when CONF_LIBDIR=lib32. this - is just to make building the emul-linux-x86-gtklibs package easier, and has no - effect on x86 users in general. - - 22 Aug 2004; Travis Tilley gtk+-2.4.4.ebuild, - gtk+-2.4.7.ebuild: - added a patch that puts the config files for gtk in an arch specific directory - on amd64 so that the 32bit and 64bit versions dont clash - -*gtk+-2.4.7 (19 Aug 2004) - - 19 Aug 2004; foser gtk+-2.4.7.ebuild : - New release - Add smoothscroll patch from gnome bugzilla for testing - - 07 Aug 2004; Travis Tilley gtk+-2.4.4.ebuild: - stable on amd64 - - 07 Aug 2004; Michael Hanselmann gtk+-1.2.10-r11.ebuild: - Added gnuconfig to replace config.* on Mac OS X and added to ~macos. - - 05 Aug 2004; Gustavo Zacarias gtk+-2.4.4.ebuild: - Stable on sparc - - 05 Aug 2004; Guy Martin gtk+-2.4.4.ebuild: - Stable on hppa. - - 31 Jul 2004; gtk+-2.4.4.ebuild: - stable on x86 for gnome 2.6.2 - - 27 Jul 2004; gtk+-1.2.10-r11.ebuild, - gtk+-2.4.1.ebuild: - stable on alpha (1.2.10-r11) and ia64 (1.2.10-r11, 2.4.1) - - 26 Jul 2004; Tom Gall gtk+-1.2.10-r11.ebuild: - stable on ppc64 - - 20 Jul 2004; Tom Gall gtk+-2.4.3-r1.ebuild: - stable on ppc64, bug #57154 - -*gtk+-2.4.4 (11 Jul 2004) - - 11 Jul 2004; +gtk+-2.4.4.ebuild: - Versionbump. - -*gtk+-2.4.3-r1 (06 Jul 2004) - - 06 Jul 2004; Martin Schlemmer - +files/gtk+-2.4.x-filesel-navbuttons.patch.bz2, +gtk+-2.4.3-r1.ebuild: - Add fileselect dialog patch from Ximian/Suse. - - 02 Jul 2004; Tom Gall gtk+-1.2.10-r11.ebuild: - fix repoman dep (imlib) - - 28 Jun 2004; Tom Gall gtk+-2.4.3.ebuild: - ~ppc64 , bug #54792 - - 23 Jun 2004; Aron Griffis gtk+-1.2.10-r10.ebuild: - QA - fix use invocation - - 19 Jun 2004; Gustavo Zacarias gtk+-2.4.1.ebuild: - sparc stable - - 16 Jun 2004; Bryan Østergaard gtk+-2.4.1.ebuild: - Stable on alpha. - -*gtk+-2.4.3 (15 Jun 2004) - - 15 Jun 2004; foser gtk+-2.4.3.ebuild : - New release (#53700) - - 03 Jun 2004; Stephen P. Becker gtk+-2.4.1.ebuild: - Stable on mips. - - 01 Jun 2004; Travis Tilley gtk+-2.4.1.ebuild: - stable on amd64 - -*gtk+-2.4.1 (04 May 2004) - - 04 May 2004; foser gtk+-2.4.1.ebuild : - New release, add patch & dep to have a default icon theme available to the chooser - - 26 Apr 2004; Stephen P. Becker gtk+-2.2.4-r1.ebuild: - Marked stable on mips. - - 22 Apr 2004; Stephen P. Becker gtk+-2.4.0-r1.ebuild: - Breaks GNOME 2.4, so returned to ~mips. - - 14 Apr 2004; Stephen P. Becker gtk+-1.2.10-r10.ebuild, - gtk+-1.2.10-r11.ebuild, gtk+-2.4.0-r1.ebuild: - Marked stable on mips. - -*gtk+-2.4.0-r1 (09 Apr 2004) - - 09 Apr 2004; Travis Tilley gtk+-2.4.0-r1.ebuild, - files/gtk+-2.4.0-uimanager-zero-becomes-null.patch: - added patch to fix a crash in epiphany that may or may not occur only on - amd64. for more information on this bug, please refer to - http://bugzilla.gnome.org/show_bug.cgi?id=138997 - - 30 Mar 2004; Donnie Berkholz ; gtk+-2.2.4-r1.ebuild, - gtk+-2.4.0.ebuild: - Change x11-base/xfree dependency to virtual/x11. Everyone on xfree should be - on 4.3.0-r3 or greater by now, so #20407 shouldn't be an issue. - -*gtk+-2.4.0 (18 Mar 2004) - - 18 Mar 2004; foser gtk+-2.4.0.ebuild : - New release - Remove incorporated patches - Removed wm patch, it's broken - Correct license - - 06 Mar 2004; Stephen P. Becker gtk+-1.2.10-r10.ebuild, - gtk+-2.2.4-r1.ebuild: - Added ~mips keyword. - -*gtk+-1.2.10-r11 (05 Feb 2004) - - 05 Feb 2004; gtk+-1.2.10-r11.ebuild: - Minor change to DEPEND, adding an RDEPEND to get intltool out of the RDEPEND - set. this deserves a revbump only to make sure that packages get updated. - - 07 Dec 2003; foser gtk+-1.2.10-r10.ebuild : - Fix sysconfdir to /etc to fix gtkrc problems described in #34279 - - 14 Nov 2003; Aron Griffis gtk+-1.2.10-r10.ebuild: - Stable on ia64 - - 08 Nov 2003; Todd Sunderlin gtk+-2.2.4-r1.ebuild: - added sparc keyword - - 20 Oct 2003; Aron Griffis gtk+-2.2.4-r1.ebuild: - Stable on alpha - - 08 Oct 2003; foser gtk+-2.2.4-r1.ebuild : - Added patch to fix notification area, submitted by - - 06 Oct 2003; Mike Gardiner gtk+-2.2.4-r1.ebuild: - Marked stable on x86 - - 23 Sep 2003; Bartosch Pixa gtk+-2.2.4-r1.ebuild: - set ppc in keywords - -*gtk+-2.2.4-r1 (10 Sep 2003) - - 16 Nov 2003; Guy Martin gtk+-2.2.4-r1.ebuild : - Added hppa to KEYWORDS. - - 10 Sep 2003; foser gtk+-2.2.4-r1.ebuild : - Remove USE debug support, the not hardcoded disabling of debugging support - should fix a lot of problems. Rev bump to propagate. - -*gtk+-2.2.4 (07 Sep 2003) - - 07 Sep 2003; foser gtk+-2.2.4.ebuild : - New bugfix release - -*gtk+-2.2.3 (27 Aug 2003) - - 27 Aug 2003; foser gtk+-2.2.3.ebuild : - New version - - 25 Jul 2003; foser gtk+-2.2.2-r1.ebuild : - Fix xinput (#25203) - - 02 Jul 2003; Jason Wever gtk+-2.2.2-r1.ebuild: - Changed sparc keyword back to ~sparc to fix broken dependencies. - -*gtk+-2.2.2-r1 (12 Jun 2003) - - 01 Jul 2003; Guy Martin gtk+-2.2.2-r1.ebuild : - Added ~hppa to KEYWORDS. - - 01 Jul 2003; Todd Sunderlin gtk+-2.2.2-r1.ebuild : - set stable on sparc - - 16 Jun 2003; foser gtk+-2.2.2-r1.ebuild, gtk+-2.2.2-gtkwidget_pixmap_expose.patch : - Replace reverting patch with correct upstream patch for #22576 - - 12 Jun 2003; foser gtk+-2.2.2-r1.ebuild : - Added patch to 'fix' pixbuf corruption issues (#22576) - - 10 Jun 2003; Luca Barbato gtk+-2.2.2.ebuild : - Removed an unnecessary ppc patch. - -*gtk+-2.2.2 (10 Jun 2003) - - 10 Jun 2003; foser gtk+-2.2.2.ebuild : - New version, enabled xinput support (#20407) which needs a recent xfree - Added GDK_USE_XFT as environment var as suggested by utx - - 30 May 2003; Luca Barbato gtk+-2.2.1.ebuild: - Added ppc to keywords. - -*gtk+-2.2.1-r1 (11 Apr 2003) - - 19 Apr 2003; foser gtk+-2.2.1-r1.ebuild : - Make sure we enable wm patch (better late then never) - - 11 Apr 2003; foser gtk+-2.2.1-r1.ebuild : - Added gtktreeview patch for eclipse (#19084) - -*gtk+-1.2.10-r10 (08 Mar 2003) - - 01 Jul 2003; Guy Martin gtk+-1.2.10-r10.ebuild : - Marked stable on hpp. - - 04 Apr 2003; Jason Wever gtk+-1.2.10-r10.ebuild: - Changed ~sparc keyword to sparc. - - 30 Mar 2003; Aron Griffis gtk+-1.2.10-r10.ebuild: - Mark stable on alpha - - 16 Mar 2003; Mark Guertin gtk+-1.2.10-r10.ebuild: - set ppc in keywords - - 16 Mar 2003; Guy Martin gtk+-1.2.10-r10.ebuild : - Added ~hppa to keywords. - - 09 Mar 2003; Martin Schlemmer gtk+-1.2.10-r10.ebuild : - Change to fully use epatch, and also make use of libtool eclass. - - 08 Mar 2003; foser gtk+-1.2.10-r10.ebuild : - New patch to fix locale problems that have been bugging us for a long time - Patch done by Stanislav Brabec - Related gentoo bugs #10529, #16883 - -*gtk+-2.2.1 (04 Feb 2003) - - 01 Jul 2003; Guy Martin gtk+-2.2.1.ebuild : - Added hppa to KEYWORDS. - - 04 Mar 2003; Jason Wever gtk+-2.2.1.ebuild: - Added sparc to keywords. - - 01 Mar 2003; Jason Wever gtk+-2.2.1.ebuild: - Added ~sparc to keywords. - - 21 Feb 2003; Aron Griffis gtk+-2.2.1.ebuild : - Mark stable on alpha - - 13 Feb 2003; Jon Nall gtk+-2.2.1.ebuild : - bumped pango version to 1.1.3 since the gtk+ configure script - barfs if xft-2 is installed, but pango <1.1.3 is installed - - 07 Feb 2003; foser gtk+-2.2.1.ebuild : - Added alpha blended disabled icons patch - - 05 Feb 2003; Jon Nall gtk+--2.2.1.ebuild : - added patch to fix endian problem for 15/24 bit displays - - 04 Feb 2003; Spider gtk+-2.2.1.ebuild : - bumped version - - 16 Jan 2003; foser gtk+-2.2.0.ebuild : - Added some info about rebuilding gtk theme engines after an emerge - - 04 Jan 2003; Rodney Rees gtk+-2.0.6-r3.ebuild : - changed ~sparc to sparc - - 01 Jan 2003; Aron Griffis gtk+-2.0.9.ebuild gtk+-2.2.0.ebuild: - Reverted previous change on gtk+-2.0.9 since it sounds like 2.2.0 works on - Alpha. Added ~alpha to KEYWORDS on 2.2.0 - - 31 Dec 2002; Aron Griffis gtk+-2.0.9.ebuild : - glib-2.0.7 is broken on alpha, so change the dependency here to version - 2.0.6 which works fine with gtk+-2.0.9 - - 24 Dec 2002; Martin Schlemmer gtk+-2.2.0.ebuild : - Fix to depend on glib-2.2.0, else it fails with unresolved symbols .. - -*gtk+-2.2.0 (22 Dec 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - - 22 Dec 2002; foser gtk+-2.2.0.ebuild : - New version - - 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords - - 21 Nov 2002; Martin Schlemmer gtk+-2.1.2.ebuild, - gtk+-2.0.9.ebuild : - - Turn of --export-symbols-regex for now, since it removes - the wrong symbols. Patch from Redhat. - -*gtk+-2.0.9 (20 Nov 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 20 Nov 2002; foser gtk+-2.0.9.ebuild : - New version, mainly fixes a bug which made metacity crash - -*gtk-2.0.8-r1 (15 Nov 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 15 Nov 2002; Seemant Kulleen gtk+-2.0.8-r1.ebuild - files/digest-gtk+-2.0.8-r1 : - - DirectFB patched version of it. - -*gtk+-2.1.2 (12 Nov 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 29 Nov 2002; Jon Nall gtk+-2.1.2.ebuild : - added ~ppc to KEYWORDS - - 12 Nov 2002; foser gtk+-2.1.2.ebuild : - GNOME 2.1.2 release - -*gtk+-2.0.8 (09 Nov 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 12 Nov 2002; L. Boshell : Removed directfb dep - since it wasn't being used. - - 11 Nov 2002; Spider gtk+-2.0.8.ebuild : - stabilized for x86 - - 09 Nov 2002; Spider gtk+-2.0.8.ebuild - files/digest-gtk+-2.0.8 : New version fixes the patch needed for last version - also fixed the dependencies, after 2.0.7-r1. - -*gtk+-2.0.7-r1 (05 Nov 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 09 Nov 2002; foser gtk+-2.0.7-r1 : - Added sgmltools-lite dep, to fix documentation problems - - 05 Nov 2002; foser gtk+-2.0.7-r1 : - Added a patch to fix problems with gdk-pixbuf (bug #10261) - -*gtk+-2.0.7 (04 Nov 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 04 Nov 2002; Spider gtk+-2.0.4.ebuild - files/digest-gtk+-2.0.4: added the latest stable release, bugfixes and nothing - more. Ripped out the directfb (wow, it survived more than 10 days! ) - - -*gtk+-2.1.1 (27 Oct 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 27 Oct 2002; foser gtk+-2.1.1.ebuild : - gnome 2.1 - -*gtk+-2.0.6-r3 (21 Oct 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 21 Oct 2002; Seemant Kulleen gtk+-2.0.6-r3.ebuild - files/digest-gtk+-2.0.6-r3 : - - Added the DirectFB patch (finally!) - -*gtk+-2.0.6-r2 (10 Oct 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 10 Oct 2002; foser gtk+-2.0.6-r2.ebuild : - Bumped revision to get the safety replacement added in r1 spread - -*gtk+-1.2.10-r9 (26 Sep 2002) - - 16 Mar 2003; Guy Martin gtk+-1.2.10-r9.ebuild : - Added hppa to keywords. - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 26 Sep 2002; Spider gtk+-1.2.10-r9.ebuild : - This build enables minimal debugging for all users, this will fix some unexpected crashes in amongst other things xchat. - -*gtk+-2.0.6-r1 (04 Jul 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 08 Oct 2002; foser gtk+-2.0.6-r1.ebuild : - Replace -O3 with -O2 to be on the safe side (bug 8762) - - 04 Jul 2002; Spider gtk+-2.0.6-r1.ebuild : - remove unnecessary debugging - remove bad parts from SRC_URI (broken use) - changed configure some - -*gtk+-2.0.6 (04 Jul 2002) - - 04 Feb 2003; Spider gtk+*.ebuild: - changed all DEBUG to DEBUGBUILD - - 04 Jul 2002; Gabriele Giorgetti gtk+-2.0.6.ebuild: - - New version. - -*gtk+-2.0.5-r2 (15 Jul 2002) - - 15 Jul 2002; Owen Stampflee : - - Added PPC to KEYWORDS. - - 15 Jul 2002; Seemant Kulleen gtk+-2.0.5-r2.ebuild - files/digest-gtk+-2.0.5-r2 : - - directfb enabled GTK is now a patch on our mirrors instead of being a - separate tarball. This makes the behaviour better for portage's server - side caching. - -*gtk+-2.0.5-r1 (03 Jul 2002) - - 03 Jul 2002; Seemant Kulleen gtk+-2.0.5-r1.ebuild - files/digest-gtk+-2.0.5-r1 : - - The DirectFB tarball was replaced on the directfb.org server with one that - has bugfixes in it. No need for paranoia, the directfb folks have - verified it for us. Thanks to: gentoo@tuurlijk.eu.org (Tuurlijk!) in bug - #4451 for spotting it. - -*gtk+-2.0.5 (17 Jun 2002) - - 17 Jun 2002; Seemant Kulleen gtk+-2.0.5.ebuild - files/digest-gtk+-2.0.5 : - - Version bump for both regular GTK+2 and GTK+DirectFB - -*gtk+-2.0.3-r1 (8 Jun 2002) - - 8 Jun 2002; Seemant Kulleen gtk+-2.0.3-r1.ebuild - files/digest-gtk+-2.0.3-r1 : - - Option for directfb-patched gtk libs. This actually gets and compiles a - separate source tarball from directfb.org - -*gtk+-2.0.3 (28 May 2002) - 28 May 2002; Spider gtk+-2.0.3.ebuild: - new stable branch - -*gtk+-1.2.10-r8 (27 May 2002) - - 27 May 2002; Bruce A. Locke gtk+-1.2.10-r8.ebuild: - - Ximian patch set and redhat/mdk patch merged - -*gtk+-2.0.2-r6 (27 May 2002) - 27 May 2002; Spider gtk+-2.0.2-r6.ebuild: - fix for the use png bug, not libtoolized - -*gtk+-2.0.2-r5 (23 May 2002) - 23 May 2002; Spider gtk+-2.0.2-r5.ebuild: - seems people who installed with the libtoolized version of gtk+ fails - when installing gtk+ again. Test this version if it works (read -libtoolize) - - -*gtk+-2.0.2-r4 (22 May 2002) - 22 May 2002; Spider gtk+-2.0.2-r4.ebuild: - - lintool check - debug info back inside - remove libtoolize since it breaks things - singlethread make since this uses cludgy code - - -gtk+-1.2.10-r7 (14 Apr 2002) - 14 Apr 2002; M.Schlemmer ; gtk+-1.2.10-r7.ebuild : - Libtoolize. - -*gtk+-2.0.2-r2 (24 Apr 2002) - 24 Apr 2002; Spider ; gtk+-2.0.2-r2.ebuild: - Libtoolize - -*gtk+-2.0.2-r2 (12 Apr 2002) - 12 Apr 2002; Spider ; gtk+-2.0.2-r2.ebuild: - Update so a user can disable png, jpeg, tiff support for gtk+ - This will so break things if they disable it though ;) - - -gtk+-2.0.2-r1 - 11 Apr 2002; Spider ; gtk+-1.2.10-r4.ebuild gtk+-1.2.10-r5.ebuild gtk+-1.2.10-r6.ebuild gtk+-1.2.10-r7.ebuild gtk+-2.0.2-r1.ebuild : - Update all glib dependencies to use glib-1.2* in preparation of -unmasking the glib-2.0.1 packages - - -*gtk+-2.0.2 (11 Apr 2002) - 11 Apr 2002; Spider ; gtk+-2.0.2-r1.ebuild: - New release with new api - USE="doc" will build api documentation - needs libpng 1.2.1 and is masked because of that. - needs glib 2.0 as well - - -*gtk+-1.2.10-r7 (23 Mar 2002) - - 23 Mar 2002; Seemant Kulleen gtk+-1.2.10-r7.ebuild : - - Man pages are now in LFH compliant /usr/share/man tree. Changes submitted by - Matthew Kennedy. - -*gtk+-1.2.10-r6 (21 Mar 2002) - - 21 Mar 2002; Seemant Kulleen gtk+-1.2.10-r6.ebuild : - - Changed the html documentation step to not be gzipped. This is a small - enough change that it shouldn't matter to have users remerge it. - -*gtk+-1.2.10-r6 (13 Mar 2002) - - 13 Mar 2002; Bruce A. Locke gtk+-1.2.10-r6.ebuild : - - gtk+ 1.2.10-r6 now includes patches from Ximian Gnome that help make - the gtk+ file picker dialog a little more user friendly :) - -*gtk+-1.2.10-r5 (10 Mar 2002) - - 10 Mar 2002; Bruce A. Locke gtk+-1.2.10-r5.ebuild : - - NLS fixes submitted by seemant@rocketmail.com (Seemant Kulleen) - - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/Manifest deleted file mode 100644 index 427e361905..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gtk+-2.20.1.tar.bz2 19089076 SHA256 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65 SHA512 1cef8b36ecdab8f1b3b9b6c951b64d85e852a666110e881833513d3ff34730a743b882a0a5aa9fe7d3ea62de7de910aa9c4e08d5ea5558b151410fc1536599d9 WHIRLPOOL b7f7ffb2a120ba372ca2e2e66a0f3cc9064d41e721818ff2cce11fb8956040ccbbf19e4c38682ada6e7211b7d1bb86f8d7086df353d2c59dd6585c535eab6059 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch deleted file mode 100644 index 3fe8cffd90..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.14.3-limit-gtksignal-includes.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=536767 - -Makes inkscape and claws-mail buildable again. Basically all packages still using -GtkCList and single included headers. ---- gtk/gtksignal.h.orig 2008-06-12 01:40:59.000000000 -0400 -+++ gtk/gtksignal.h 2008-06-11 18:21:47.000000000 -0400 -@@ -29,7 +29,9 @@ - #ifndef __GTK_SIGNAL_H__ - #define __GTK_SIGNAL_H__ - --#include -+#include -+#include -+#include - #include - - G_BEGIN_DECLS diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch deleted file mode 100644 index f13ffe65c5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch +++ /dev/null @@ -1,145 +0,0 @@ -This patch touches both the Makefile.am files as well as the Makefile.in files because -eautoreconf doesn't work properly on gtk+, for some reason. - ---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.am -+++ gtk+-2.18.5/demos/gtk-demo/Makefile.am -@@ -83,6 +83,10 @@ gtk_demo_DEPENDENCIES = $(DEPS) - gtk_demo_LDADD = $(LDADDS) - gtk_demo_LDFLAGS = -export-dynamic - -+if USE_QUARTZ -+gtk_demo_LDFLAGS += -framework AppKit -framework Carbon -+endif -+ - IMAGEFILES= alphatest.png \ - apple-red.png \ - background.jpg \ ---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.in -+++ gtk+-2.18.5/demos/gtk-demo/Makefile.in -@@ -40,6 +40,7 @@ host_triplet = @host@ - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl - bin_PROGRAMS = gtk-demo$(EXEEXT) -+@USE_QUARTZ_TRUE@am__append_1 = -framework AppKit -framework Carbon - subdir = demos/gtk-demo - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -@@ -460,7 +461,7 @@ gtk_demo_SOURCES = \ - - gtk_demo_DEPENDENCIES = $(DEPS) - gtk_demo_LDADD = $(LDADDS) --gtk_demo_LDFLAGS = -export-dynamic -+gtk_demo_LDFLAGS = -export-dynamic $(am__append_1) - IMAGEFILES = alphatest.png \ - apple-red.png \ - background.jpg \ ---- gtk+-2.18.5.orig/demos/Makefile.am -+++ gtk+-2.18.5/demos/Makefile.am -@@ -28,6 +28,10 @@ noinst_PROGRAMS = \ - testpixbuf-scale \ - pixbuf-demo - -+if USE_QUARTZ -+AM_LDFLAGS = -framework AppKit -framework Carbon -+endif -+ - # Need to build test-inline-pixbufs.h for testpixbuf - if HAVE_PNG - noinst_PROGRAMS += testpixbuf ---- gtk+-2.18.5.orig/demos/Makefile.in -+++ gtk+-2.18.5/demos/Makefile.in -@@ -433,6 +433,7 @@ LDADDS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon - @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h - @CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource - @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE) ---- gtk+-2.18.5.orig/gtk/Makefile.am -+++ gtk+-2.18.5/gtk/Makefile.am -@@ -888,7 +888,7 @@ libgtk_directfb_2_0_la_SOURCES = $(gtk_c - - libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) - libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid --libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon - libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) - - libgtk_x11_2_0_la_LIBADD = $(libadd) -@@ -901,6 +901,10 @@ libgtk_win32_2_0_la_DEPENDENCIES = $(gtk - libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) - libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) - -+if USE_QUARTZ -+AM_LDFLAGS = -framework AppKit -framework Carbon -+endif -+ - if USE_WIN32 - libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) - endif ---- gtk+-2.18.5.orig/gtk/Makefile.in -+++ gtk+-2.18.5/gtk/Makefile.in -@@ -1294,7 +1294,7 @@ libgtk_quartz_2_0_la_SOURCES = $(gtk_c_s - libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources) - libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) - libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid --libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon - libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) - libgtk_x11_2_0_la_LIBADD = $(libadd) - libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32 -@@ -1304,6 +1304,7 @@ libgtk_x11_2_0_la_DEPENDENCIES = $(deps) - libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps) - libgtk_quartz_2_0_la_DEPENDENCIES = $(deps) - libgtk_directfb_2_0_la_DEPENDENCIES = $(deps) -+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon - @USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols) - EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la - DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib) ---- gtk+-2.18.5.orig/perf/Makefile.am -+++ gtk+-2.18.5/perf/Makefile.am -@@ -20,6 +20,10 @@ LDADDS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -+if USE_QUARTZ -+AM_LDFLAGS = -framework AppKit -framework Carbon -+endif -+ - noinst_PROGRAMS = \ - testperf - ---- gtk+-2.18.5.orig/perf/Makefile.in -+++ gtk+-2.18.5/perf/Makefile.in -@@ -373,6 +373,7 @@ LDADDS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon - testperf_DEPENDENCIES = $(TEST_DEPS) - testperf_LDADD = $(LDADDS) - testperf_SOURCES = \ ---- gtk+-2.18.5.orig/tests/Makefile.am -+++ gtk+-2.18.5/tests/Makefile.am -@@ -20,6 +20,10 @@ LDADDS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -+if USE_QUARTZ -+AM_LDFLAGS = -framework AppKit -framework Carbon -+endif -+ - if USE_X11 - testsocket_programs = testsocket testsocket_child - endif ---- gtk+-2.18.5.orig/tests/Makefile.in -+++ gtk+-2.18.5/tests/Makefile.in -@@ -639,6 +639,7 @@ LDADDS = \ - $(top_builddir)/gdk/$(gdktargetlib) \ - $(top_builddir)/gtk/$(gtktargetlib) - -+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon - @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child - @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc - @HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \ diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch deleted file mode 100644 index e412c40f32..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtk+-2.18.7-gold.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gtk+-2.18.7/configure b/gtk+-2.18.7/configure -index 53755ea..17e7082 100755 ---- a/gtk+-2.18.7/configure -+++ b/gtk+-2.18.7/configure -@@ -10338,6 +10338,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in -+ *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc deleted file mode 100644 index 8d1783431d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/files/gtkrc +++ /dev/null @@ -1,39 +0,0 @@ -style "default" - -{ - font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*" -} - -style "button" = "default" - -{ - bg[PRELIGHT] = { 0.7, 0.7, 0.9 } -} - -style "treeitem" -{ -bg[ACTIVE] = { 0.7, 0.7, 0.9 } -} - -style "scrollbar" = "button" -{ - bg[ACTIVE] = {0.6, 0.6, 0.6 } -} - -style "status" { - bg[PRELIGHT] = { 0.3, 1.0, 0.3 } -} - -style "gtk-tooltips" { - bg[NORMAL] = "#ffff60" -} - -class "GtkWidget" style "default" -class "GtkButton" style "button" -class "GtkItem" style "button" -class "GtkProgressBar" style "status" -class "GtkScrollbar" style "scrollbar" -class "GtkTreeItem" style "treeitem" -widget "gtk-tooltips" style "gtk-tooltips" - - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild deleted file mode 100644 index 8badde670a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/gtk+-2.20.1.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/Attic/gtk+-2.18.7-r1.ebuild,v 1.1 2010/03/11 14:52:23 pacho Exp $ - -EAPI="2" - -inherit gnome.org flag-o-matic eutils libtool virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/" - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama" - -# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -RDEPEND="!aqua? ( - x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXt - x11-libs/libXext - >=x11-libs/libXrandr-1.2 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXdamage - >=x11-libs/cairo-1.6[X,svg] - ) - aqua? ( - >=x11-libs/cairo-1.6[aqua,svg] - ) - xinerama? ( x11-libs/libXinerama ) - >=dev-libs/glib-2.21.3 - >=x11-libs/pango-1.20 - >=dev-libs/atk-1.13 - media-libs/fontconfig - x11-misc/shared-mime-info - >=media-libs/libpng-1.2.1 - cups? ( net-print/cups ) - jpeg? ( >=media-libs/jpeg-6b-r2:0 ) - jpeg2k? ( media-libs/jasper ) - tiff? ( >=media-libs/tiff-3.5.7 ) - ! "${T}/gtkrc" - insinto ${GTK2_CONFDIR} - doins "${T}"/gtkrc - - # Enable xft in environment as suggested by - echo "GDK_USE_XFT=1" > "${T}"/50gtk2 - doenvd "${T}"/50gtk2 - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed" - - # This has to be removed, because it's multilib specific; generated in - # postinst - rm "${D%/}${EPREFIX}/etc/gtk-2.0/gtk.immodules" - - # ChromeOS specific: Remove all gtk im modules except im-ibus.* since - # we don't use them. (crosbus.com/11580) - for immodule in "${D%/}${EPREFIX}/usr/lib/gtk-2.0/2.*/immodules/*" - do - grep ibus $immodule || rm $immodule - done - - # add -framework Carbon to the .pc files - use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do - sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed" - done -} - -pkg_postinst() { - set_gtk2_confdir - - if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then - gtk-query-immodules-2.0 > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules" - gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - else - ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;" - ewarn "to complete the installation of GTK+, please create the" - ewarn "directory and then manually run:" - ewarn " cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" - ewarn " gtk-query-immodules-2.0 > gtk.immodules" - ewarn " gdk-pixbuf-query-loaders > gdk-pixbuf.loaders" - fi - - if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" - fi - - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml b/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml deleted file mode 100644 index 2662444a43..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/gtk+/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - gnome - - GTK+ is a multi-platform toolkit for creating graphical user - interfaces. Offering a complete set of widgets, GTK+ is suitable - for projects ranging from small one-off projects to complete - application suites. - - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest deleted file mode 100644 index 54681700df..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libXfont-1.4.4.tar.bz2 440022 RMD160 0241b2505ed65b0bd66d8bd3c80330a4db6eea6d SHA1 189dd7a3756cb80bcf41b779bf05ec3c366e3041 SHA256 a2065f5f66882f7a9cb0eb674e16d284da48e449af443eda272e99832be8239a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild deleted file mode 100644 index 2080e5185d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXfont/libXfont-1.4.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.4.ebuild,v 1.7 2011/08/15 15:24:56 armin76 Exp $ - -EAPI=4 - -XORG_DOC=doc -inherit xorg-2 - -DESCRIPTION="X.Org Xfont library" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="ipv6" - -RDEPEND="x11-libs/xtrans - x11-libs/libfontenc - >=media-libs/freetype-2 - app-arch/bzip2 - x11-proto/xproto - x11-proto/fontsproto" -DEPEND="${RDEPEND}" - -pkg_setup() { - xorg-2_pkg_setup - XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable doc devel-docs) - $(use_with doc xmlto) - --without-bzip2 - --disable-freetype - --without-fop - --with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings" - ) -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest deleted file mode 100644 index 5ef8fa2fab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libXft-2.2.0.tar.bz2 290451 RMD160 e2955cfd5c8d2e02d4dba5f01b5132634005f971 SHA1 ed29784259f4e26df78141035560ae8a7c62e83f SHA256 c8685ae56da0c1dcc2bc1e34607e7d76ae98b86a1a71baba3a6b76dbcf5ff9b2 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild deleted file mode 100644 index 6e4ff78986..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXft/libXft-2.2.0-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.2.0.ebuild,v 1.10 2011/02/14 23:22:40 xarthisius Exp $ - -EAPI=3 -inherit xorg-2 flag-o-matic - -DESCRIPTION="X.Org Xft library" - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND=">=x11-libs/libXrender-0.8.2 - x11-libs/libX11 - x11-libs/libXext - media-libs/freetype - media-libs/fontconfig - x11-proto/xproto" -DEPEND="${RDEPEND}" diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/Manifest deleted file mode 100644 index ea6a9ccd0a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libXi-1.6.0.tar.bz2 418674 SHA256 b2fc65a24a269405c5bbe27152e97ed4c5987ca728b9d7e7576e4c9543c4a7af SHA512 b583b72451ac1f7524f694975feacc1c5071912de9f7e5d825bef8f4c448064bc18d7ed856f4480be190bbe90ac74bdc61606872cd6c4cd72460688a144417ed WHIRLPOOL 57bee6553117632d3ea757a2678b83f17eda10e1469c520b0c3136e9b03c52243275fa48da00e9c90e6428a9e5d51c03331d0deea792042479473aeaf949f4fd diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch deleted file mode 100644 index 0a66652398..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/files/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 8436c920953f288aea2d6d5f370f8eaaaef82d97 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 15 Mar 2012 11:51:41 +1000 -Subject: [PATCH] Fix wrong button label and mask copy on OS X - -Regression introduced in c1a5a70b51f12dedf354102217c7cd4247ed3a4b. - -If double-padding is applied, the length of the mask on the wire may be -smaller than libXi's mask_len. When copying, only the wire length must be -copied, with the remainder set to 0. -When advancing to the button labels, the wire length matters, not libXi's -internal length. - -Signed-off-by: Peter Hutterer -Reviewed-by: Jeremy Huddleston -Tested-by: Jeremy Huddleston ---- - src/XExtInt.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 89c0894..0c64f9a 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -1610,12 +1610,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) - int struct_size; - int state_size; - int labels_size; -+ int wire_mask_size; - - cls_wire = (xXIButtonInfo*)any_wire; - sizeXIButtonClassType(cls_wire->num_buttons, - &struct_size, &state_size, - &labels_size); - cls_lib = next_block(&ptr_lib, struct_size); -+ wire_mask_size = ((cls_wire->num_buttons + 7)/8 + 3)/4 * 4; - - cls_lib->type = cls_wire->type; - cls_lib->sourceid = cls_wire->sourceid; -@@ -1623,10 +1625,14 @@ copy_classes(XIDeviceInfo* to, xXIAnyInfo* from, int *nclasses) - cls_lib->state.mask_len = state_size; - cls_lib->state.mask = next_block(&ptr_lib, state_size); - memcpy(cls_lib->state.mask, &cls_wire[1], -- cls_lib->state.mask_len); -+ wire_mask_size); -+ if (state_size != wire_mask_size) -+ memset(&cls_lib->state.mask[wire_mask_size], 0, -+ state_size - wire_mask_size); - - cls_lib->labels = next_block(&ptr_lib, labels_size); -- atoms =(uint32_t*)((char*)&cls_wire[1] + cls_lib->state.mask_len); -+ -+ atoms =(uint32_t*)((char*)&cls_wire[1] + wire_mask_size); - for (j = 0; j < cls_lib->num_buttons; j++) - cls_lib->labels[j] = *atoms++; - --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild deleted file mode 100644 index 837b74daf7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXi/libXi-1.6.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.6.0.ebuild,v 1.1 2012/03/09 00:04:22 chithanh Exp $ - -EAPI=4 - -XORG_DOC=doc -inherit xorg-2 - -DESCRIPTION="X.Org Xi library" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND=">=x11-libs/libX11-1.4.99.1 - >=x11-libs/libXext-1.1 - >=x11-proto/inputproto-2.1.99.6 - >=x11-proto/xproto-7.0.13 - >=x11-proto/xextproto-7.0.3" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/1.6.0-Fix-wrong-button-label-and-mask-copy-on-OS-X.patch" -) - -pkg_setup() { - xorg-2_pkg_setup - XORG_CONFIGURE_OPTIONS=( - $(use_enable doc specs) - $(use_with doc xmlto) - $(use_with doc asciidoc) - --without-fop - ) -} - -pkg_postinst() { - xorg-2_pkg_postinst - - ewarn "Some special keys and keyboard layouts may stop working." - ewarn "To fix them, recompile xorg-server." -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/Manifest deleted file mode 100644 index 5d76ac477d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libXt-1.0.6.tar.bz2 538143 SHA256 8d940251972ffe7e3caa41c4e82b6659ad4070aa2ec0d3e789c9fa39b79ff947 SHA512 eaea416961342e8f2cf54a9545050a3ecf3d23b283f181e61ce944547e9fa8257171bbc338c5cc4e208e4856cf596293406893b27b8f47825f728d5201e8a550 WHIRLPOOL 29959c4a79986efc4dabe16672ef2b306111e80ce13726d689d35af1445fbbd41fa84b7b49c1f512932e6de54eb4a41eb9b3015bce0105c6e9d398a636364e88 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch deleted file mode 100644 index b5448ccbbd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/files/libXt-1.0.6-cross.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f77482f0618f954de1d080599ada058e9a3c24ff Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 28 Jul 2009 09:59:41 +0000 -Subject: Fix compilation of host tools in cross-compilation case - -At 36e9f0d351afbf7fd2595990b2d39e7c551f6420, a fix was added to use -the host gcc instead of the target gcc when cross-compiling -libXt. This fix works, but is not solve the whole problem: the CFLAGS -and LDFLAGS used with the host compilers are the one defined for the -target compiler (and the flags for both compilers might be very -different). - -This new fix let libXt obey to CFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD -environment variables, and use them to compile the host tools in -util/. - -Signed-off-by: Thomas Petazzoni ---- -diff --git a/configure.ac b/configure.ac -index 043ab5f..cb00a41 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -48,6 +48,10 @@ if test x"$CC_FOR_BUILD" = x; then - fi - fi - AC_SUBST([CC_FOR_BUILD]) -+CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} -+AC_SUBST(CFLAGS_FOR_BUILD) -+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} -+AC_SUBST(LDFLAGS_FOR_BUILD) - - PKG_CHECK_MODULES(XT, sm x11 xproto kbproto) - -diff --git a/util/Makefile.am b/util/Makefile.am -index 0d3ff01..37b78d2 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -5,6 +5,8 @@ noinst_PROGRAMS = makestrs - endif - - CC = @CC_FOR_BUILD@ -+CFLAGS = @CFLAGS_FOR_BUILD@ -+LDFLAGS = @LDFLAGS_FOR_BUILD@ - - EXTRA_DIST = \ - Shell.ht \ --- -cgit v0.8.2 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild deleted file mode 100644 index 4c136f8450..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libXt/libXt-1.0.6-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.6.ebuild,v 1.6 2009/10/11 11:04:55 nixnut Exp $ - -# Must be before x-modular eclass is inherited -SNAPSHOT="yes" - -inherit x-modular flag-o-matic - -DESCRIPTION="X.Org Xt library" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND="x11-libs/libX11 - x11-libs/libSM - x11-libs/libICE - x11-proto/xproto - x11-proto/kbproto" -DEPEND="${RDEPEND}" - -# patch is in git master and macros are only needed if SNAPSHOT is set to "yes" -DEPEND="${DEPEND} >=x11-misc/util-macros-1.2" -PATCHES=("${FILESDIR}/libXt-1.0.6-cross.patch") - -pkg_setup() { - # No such function yet - # x-modular_pkg_setup - - # (#125465) Broken with Bdirect support - filter-flags -Wl,-Bdirect - filter-ldflags -Bdirect - filter-ldflags -Wl,-Bdirect -} - -# msb: Copied from http://gentoo.mindzoo.de/index.cgi/changeset/151 -# Reference: http://gentoo.mindzoo.de/index.cgi/ticket/3 -x-modular_src_compile() { - x-modular_src_configure - - # For some reason, CC gets cleared out after the x-modular_src_make - # call so the recompile below would fail, so we save off the target CC. - TARGET_CC=$(tc-getCC) - - # [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for makestr - ( filter-flags -m* ; - cd util && - make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS= clean all ) - x-modular_src_make - - # [Cross-Compile Love] Recompile 'makestr' with the target compiler, - # just in case we want to install it. - ( cd util && make CC="${TARGET_CC}" clean all ) -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/Manifest deleted file mode 100644 index 52bf23f710..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libdrm-2.4.39.tar.bz2 492215 SHA256 386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d SHA512 51b849d501adbf6c9d65847d2e6b41e426137af8cdb1335d19e22939128b7cdae8685c27d750db3aad7b1c43e7bb5a448634491dcd86873ba98293d56320eb1f WHIRLPOOL 9b23f950126cff75871610d46da70aa3b2dfed90f2271a2d547f5f3c2951ca41e35478ca4f11d6ad08327969836f8aede8e34cb9069b584472b7a9f67a2358c8 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild deleted file mode 120000 index 119496a4a7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39-r2.ebuild +++ /dev/null @@ -1 +0,0 @@ -libdrm-tests-2.4.39.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild deleted file mode 100644 index 3158c681c4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm-tests/libdrm-tests-2.4.39.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.34.ebuild,v 1.1 2012/05/11 00:25:45 chithanh Exp $ - -EAPI=4 -inherit xorg-2 - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" - -UPSTREAM_PKG="${P/-tests}" - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="http://dri.freedesktop.org/" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - SRC_URI="http://dri.freedesktop.org/${PN}/${UPSTREAM_PKG}.tar.bz2" -fi - -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -VIDEO_CARDS="exynos intel nouveau omap radeon vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} libkms" -RESTRICT="test" # see bug #236845 - -RDEPEND="dev-libs/libpthread-stubs - sys-fs/udev - video_cards_intel? ( >=x11-libs/libpciaccess-0.10 ) - ~x11-libs/libdrm-${PV}" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${UPSTREAM_PKG} - -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( - --enable-udev - $(use_enable video_cards_intel intel) - $(use_enable video_cards_nouveau nouveau) - $(use_enable video_cards_radeon radeon) - $(use_enable video_cards_vmware vmwgfx-experimental-api) - $(use_enable video_cards_exynos exynos-experimental-api) - $(use_enable video_cards_omap omap-experimental-api) - $(use_enable libkms) - ) - - xorg-2_pkg_setup -} - -src_compile() { - xorg-2_src_compile - - # Manually build tests since they are not built automatically. - # This should match the logic of tests/Makefile.am. e.g. gem tests for - # intel only. - TESTS=( dr{i,m}stat ) - if use video_cards_intel; then - TESTS+=( gem_{basic,flink,readwrite,mmap} ) - fi - emake -C "${AUTOTOOLS_BUILD_DIR}"/tests "${TESTS[@]}" -} - -src_install() { - into /usr/local/ - dobin "${AUTOTOOLS_BUILD_DIR}"/tests/*/.libs/* - dobin "${TESTS[@]/#/${AUTOTOOLS_BUILD_DIR}/tests/.libs/}" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/Manifest deleted file mode 100644 index 52bf23f710..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libdrm-2.4.39.tar.bz2 492215 SHA256 386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d SHA512 51b849d501adbf6c9d65847d2e6b41e426137af8cdb1335d19e22939128b7cdae8685c27d750db3aad7b1c43e7bb5a448634491dcd86873ba98293d56320eb1f WHIRLPOOL 9b23f950126cff75871610d46da70aa3b2dfed90f2271a2d547f5f3c2951ca41e35478ca4f11d6ad08327969836f8aede8e34cb9069b584472b7a9f67a2358c8 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild deleted file mode 120000 index f6ec90f982..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39-r5.ebuild +++ /dev/null @@ -1 +0,0 @@ -libdrm-2.4.39.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild deleted file mode 100644 index e0c9c85953..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libdrm/libdrm-2.4.39.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.34.ebuild,v 1.1 2012/05/11 00:25:45 chithanh Exp $ - -EAPI=4 -inherit xorg-2 - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" - -DESCRIPTION="X.Org libdrm library" -HOMEPAGE="http://dri.freedesktop.org/" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2" -fi - -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -VIDEO_CARDS="exynos intel nouveau omap radeon vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} libkms" -RESTRICT="test" # see bug #236845 - -RDEPEND="dev-libs/libpthread-stubs - video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )" -DEPEND="${RDEPEND}" - -src_prepare() { - if [[ ${PV} = 9999* ]]; then - # tests are restricted, no point in building them - sed -ie 's/tests //' "${S}"/Makefile.am - fi - xorg-2_src_prepare -} - -src_configure() { - XORG_CONFIGURE_OPTIONS=( - --enable-udev - $(use_enable video_cards_intel intel) - $(use_enable video_cards_nouveau nouveau) - $(use_enable video_cards_radeon radeon) - $(use_enable video_cards_vmware vmwgfx-experimental-api) - $(use_enable video_cards_exynos exynos-experimental-api) - $(use_enable video_cards_omap omap-experimental-api) - $(use_enable libkms) - ) - - xorg-2_src_configure -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest deleted file mode 100644 index 051266c7ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libpciaccess-0.12.902.tar.bz2 331008 SHA256 0861d5bf68b598baa307e5c9b06dfd38ae03096b46e36b236106517bcd14b63a SHA512 8c5f7d204a742e97826558705559d4c3f41d6e3a0b2a711136e98ba181ccf7605c35ee216c41c0298d90100808e358b67103e1c51c688947269648a13c53528b WHIRLPOOL a62e8f9a8655396d5ea9cce8f9b83d8819beabe51f6d21dd3c5314c8a6d153d802fe3ca323a303f82f065a1c2011259fecc4a5ed1cb2e41006bf55c97a91f3e6 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch deleted file mode 100644 index 6de2b5f7aa..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/files/nodevport.patch +++ /dev/null @@ -1,146 +0,0 @@ -From f550c1347d3518874fe1c1d417a57322ee6b52db Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 27 Feb 2012 15:43:20 +0000 -Subject: linux: Don't use /dev/port - -Reviewed-by: Jeremy Huddleston -Signed-off-by: Adam Jackson ---- -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index 09e7138..9566d40 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -1,6 +1,7 @@ - /* - * (C) Copyright IBM Corporation 2006 - * All Rights Reserved. -+ * Copyright 2012 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -44,6 +45,18 @@ - #include - #include - -+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) -+#include -+#else -+#define inb(x) -1 -+#define inw(x) -1 -+#define inl(x) -1 -+#define outb(x) do {} while (0) -+#define outw(x) do {} while (0) -+#define outl(x) do {} while (0) -+#define iopl(x) -1 -+#endif -+ - #include "config.h" - - #ifdef HAVE_MTRR -@@ -769,12 +782,17 @@ pci_device_linux_sysfs_open_legacy_io(struct pci_io_handle *ret, - dev = pci_device_get_parent_bridge(dev); - } - -- /* If not, /dev/port is the best we can do */ -- if (!dev) -- ret->fd = open("/dev/port", O_RDWR); -+ /* -+ * You would think you'd want to use /dev/port here. Don't make that -+ * mistake, /dev/port only does byte-wide i/o cycles which means it -+ * doesn't work. If you think this is stupid, well, you're right. -+ */ - -- if (ret->fd < 0) -- return NULL; -+ /* If we've no other choice, iopl */ -+ if (ret->fd < 0) { -+ if (iopl(3)) -+ return NULL; -+ } - - ret->base = base; - ret->size = size; -@@ -786,7 +804,8 @@ static void - pci_device_linux_sysfs_close_io(struct pci_device *dev, - struct pci_io_handle *handle) - { -- close(handle->fd); -+ if (handle->fd > -1) -+ close(handle->fd); - } - - static uint32_t -@@ -794,8 +813,11 @@ pci_device_linux_sysfs_read32(struct pci_io_handle *handle, uint32_t port) - { - uint32_t ret; - -- pread(handle->fd, &ret, 4, port + handle->base); -- -+ if (handle->fd > -1) -+ pread(handle->fd, &ret, 4, port + handle->base); -+ else -+ ret = inl(port + handle->base); -+ - return ret; - } - -@@ -804,7 +826,10 @@ pci_device_linux_sysfs_read16(struct pci_io_handle *handle, uint32_t port) - { - uint16_t ret; - -- pread(handle->fd, &ret, 2, port + handle->base); -+ if (handle->fd > -1) -+ pread(handle->fd, &ret, 2, port + handle->base); -+ else -+ ret = inw(port + handle->base); - - return ret; - } -@@ -814,7 +839,10 @@ pci_device_linux_sysfs_read8(struct pci_io_handle *handle, uint32_t port) - { - uint8_t ret; - -- pread(handle->fd, &ret, 1, port + handle->base); -+ if (handle->fd > -1) -+ pread(handle->fd, &ret, 1, port + handle->base); -+ else -+ ret = inb(port + handle->base); - - return ret; - } -@@ -823,21 +851,30 @@ static void - pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port, - uint32_t data) - { -- pwrite(handle->fd, &data, 4, port + handle->base); -+ if (handle->fd > -1) -+ pwrite(handle->fd, &data, 4, port + handle->base); -+ else -+ outl(data, port + handle->base); - } - - static void - pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port, - uint16_t data) - { -- pwrite(handle->fd, &data, 2, port + handle->base); -+ if (handle->fd > -1) -+ pwrite(handle->fd, &data, 2, port + handle->base); -+ else -+ outw(data, port + handle->base); - } - - static void - pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port, - uint8_t data) - { -- pwrite(handle->fd, &data, 1, port + handle->base); -+ if (handle->fd > -1) -+ pwrite(handle->fd, &data, 1, port + handle->base); -+ else -+ outb(data, port + handle->base); - } - - static int --- -cgit v0.9.0.2-2-gbebe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild deleted file mode 100644 index 799789e483..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libpciaccess/libpciaccess-0.12.902-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.12.902.ebuild,v 1.1 2011/12/19 01:39:15 chithanh Exp $ - -EAPI=4 -inherit xorg-2 - -DESCRIPTION="Library providing generic access to the PCI bus and devices" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="minimal zlib" - -DEPEND="!bo) -- drm_intel_bo_wait_rendering(obj_surface->bo); -- -+ /* -+ * No need to sync explicitly, as the driver will properly sync this -+ * surface before the next operation using it as its source begins. -+ */ - return VA_STATUS_SUCCESS; - } - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch deleted file mode 100644 index b8c8483a4a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/files/va_terminate.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c -index 3d85248..c888afd 100644 ---- a/src/i965_drv_video.c -+++ b/src/i965_drv_video.c -@@ -2399,9 +2399,6 @@ i965_Terminate(VADriverContextP ctx) - if (i965_post_processing_terminate(ctx) == False) - return VA_STATUS_ERROR_UNKNOWN; - -- if (intel_driver_terminate(ctx) == False) -- return VA_STATUS_ERROR_UNKNOWN; -- - i965_destroy_heap(&i965->buffer_heap, i965_destroy_buffer); - i965_destroy_heap(&i965->image_heap, i965_destroy_image); - i965_destroy_heap(&i965->subpic_heap, i965_destroy_subpic); -@@ -2409,6 +2406,9 @@ i965_Terminate(VADriverContextP ctx) - i965_destroy_heap(&i965->context_heap, i965_destroy_context); - i965_destroy_heap(&i965->config_heap, i965_destroy_config); - -+ if (intel_driver_terminate(ctx) == False) -+ return VA_STATUS_ERROR_UNKNOWN; -+ - free(ctx->pDriverData); - ctx->pDriverData = NULL; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild deleted file mode 100644 index 2e2c3a35fd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libva-intel-driver/libva-intel-driver-1.0.19_pre2-r3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.18.ebuild,v 1.1 2012/06/08 15:31:07 aballier Exp $ - -EAPI="3" - -SCM="" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SCM=git-2 - EGIT_BRANCH=master - EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver" -fi - -inherit autotools ${SCM} multilib - -DESCRIPTION="HW video decode support for Intel integrated graphics" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi" -if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild - SRC_URI="" - S="${WORKDIR}/${PN}" -else - MY_P=${P#libva-} - SRC_URI="http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/${MY_P}.tar.bz2" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="MIT" -SLOT="0" -if [ "${PV%9999}" = "${PV}" ] ; then - KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -else - KEYWORDS="" -fi -IUSE="" - -RDEPEND=">=x11-libs/libva-1.1.0_rc1 - !=x11-libs/libdrm-2.4.23[video_cards_intel]" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/va_terminate.patch - epatch "${FILESDIR}"/no_explicit_sync_in_va_sync_surface.patch - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS NEWS README || die - find "${D}" -name '*.la' -delete -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest deleted file mode 100644 index 14aa63cb00..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libxcb-1.8.1.tar.bz2 375955 SHA256 d2f46811e950710e7e79e45615d24f2c7ec318b9de9dc717972723da58bffa0d SHA512 67cd7141b203e0f5b6f666407671bc9a9ecbc9cc53135ce56b52ec4c40daebe2ac4fb5804617d033413088b7256f34bbd726edfe8f6278b1f03fabf298cafb3b WHIRLPOOL da785782ec119c62bf13148459e2c14b73661e3df0ab9e3c8312e2fe70bd3ab38911832b1adafed2bedeebb79bed1bc4d6a6f15c31b555305f5b4a5140918903 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild deleted file mode 100644 index 5978af728f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxcb/libxcb-1.8.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.5.ebuild,v 1.2 2009/12/04 21:18:36 remi Exp $ - -EAPI=3 - -inherit xorg-2 libtool - -DESCRIPTION="X C-language Bindings library" -HOMEPAGE="http://xcb.freedesktop.org/" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb" -[[ ${PV} != 9999* ]] && \ - SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2" - -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" -IUSE="doc selinux" - -RDEPEND="x11-libs/libXau - x11-libs/libXdmcp - dev-libs/libpthread-stubs" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - dev-libs/libxslt - >=x11-proto/xcb-proto-1.7.1 - >=dev-lang/python-2.5[xml]" - -pkg_setup() { - CONFIGURE_OPTIONS="$(use_enable doc build-docs) - $(use_enable selinux) - --enable-xinput" -} - -src_prepare() { - elibtoolize -} - -src_compile() { - xorg-2_src_compile XCBPROTO_XCBINCLUDEDIR="${SYSROOT}/usr/share/xcb" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild deleted file mode 100644 index 86adbc83af..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/libxkbcommon/libxkbcommon-0.0.0_alpha1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -EGIT_REPO_URI="http://git.chromium.org/chromiumos/third_party/${PN}.git" -EGIT_COMMIT="f91afe4f3ebcac3fb65a402c6c85cf1df5e2b52a" -XORG_EAUTORECONF="yes" - -inherit xorg-2 git-2 - -SRC_URI="" - -DESCRIPTION="X.Org xkbcommon library" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND="x11-proto/xproto - >=x11-proto/kbproto-1.0.5" -DEPEND="${RDEPEND} - sys-devel/bison - sys-devel/flex" - -pkg_setup() { - xorg-2_pkg_setup - XORG_CONFIGURE_OPTIONS=( - --with-xkb-config-root=/usr/share/X11/xkb - ) -} - -src_prepare() { - # http://bugs.gentoo.org/show_bug.cgi?id=386181 - cat <<-\EOF >> makekeys/Makefile.am - CFLAGS = $(BUILD_CFLAGS) - CPPFLAGS = $(BUILD_CPPFLAGS) - LDFLAGS = $(BUILD_LDFLAGS) - EOF - - xorg-2_src_prepare -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest deleted file mode 100644 index 638475f446..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pango-1.28.4.tar.bz2 1503441 RMD160 e9dc19b62263fdbd5b58c00092220af87ed929df SHA1 e715954a5a3b358889d15b6235e1965303dbb622 SHA256 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch deleted file mode 100644 index cdbdd5024e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango-1.26.0-lib64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pango/Makefile.am -+++ pango/Makefile.am -@@ -16,6 +16,7 @@ - -DPANGO_ENABLE_BACKEND \ - -DPANGO_ENABLE_ENGINE \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ -+ -DHOST=\"$(host_triplet)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ - -DG_DISABLE_DEPRECATED \ ---- pango/modules.c -+++ pango/modules.c -@@ -353,6 +353,7 @@ - - if (!file_str) - file_str = g_build_filename (pango_get_sysconf_subdirectory (), -+ HOST, - "pango.modules", - NULL); - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules deleted file mode 100644 index 98d1fa82c3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/files/pango.modules +++ /dev/null @@ -1,35 +0,0 @@ -# Pango Modules file -# Automatically generated file, do not edit -# -# ModulesPath = /usr/@libdir@/pango/1.6.0/modules -# -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* -/usr/@libdir@/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* -/usr/@libdir@/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* -/usr/@libdir@/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* -/usr/@libdir@/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* -/usr/@libdir@/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* -/usr/@libdir@/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* -/usr/@libdir@/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* -/usr/@libdir@/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* -/usr/@libdir@/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* -/usr/@libdir@/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common: -/usr/@libdir@/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild deleted file mode 120000 index 2856591793..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4-r3.ebuild +++ /dev/null @@ -1 +0,0 @@ -pango-1.28.4.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild deleted file mode 100644 index e1ea215672..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-libs/pango/pango-1.28.4.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.1 2011/04/04 21:24:23 nirbheek Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit autotools eutils gnome2 multilib toolchain-funcs - -DESCRIPTION="Internationalized text layout and rendering library" -HOMEPAGE="http://www.pango.org/" - -LICENSE="LGPL-2 FTL" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="X doc introspection test" - -RDEPEND=">=dev-libs/glib-2.24:2 - >=media-libs/fontconfig-2.5.0:1.0 - media-libs/freetype:2 - >=x11-libs/cairo-1.7.6[X?] - X? ( - x11-libs/libXrender - x11-libs/libX11 - x11-libs/libXft )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/gtk-doc-am-1.13 - doc? ( - >=dev-util/gtk-doc-1.13 - ~app-text/docbook-xml-dtd-4.1.2 - x11-libs/libXft ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - test? ( - >=dev-util/gtk-doc-1.13 - ~app-text/docbook-xml-dtd-4.1.2 - x11-libs/libXft ) - X? ( x11-proto/xproto )" - -function multilib_enabled() { - has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] ) -} - -pkg_setup() { - tc-export CXX - G2CONF="${G2CONF} - $(use_enable introspection) - $(use_with X x) - $(use X && echo --x-includes=${SYSROOT}${EPREFIX}/usr/include) - $(use X && echo --x-libraries=${SYSROOT}${EPREFIX}/usr/$(get_libdir))" - DOCS="AUTHORS ChangeLog* NEWS README THANKS" -} - -src_prepare() { - gnome2_src_prepare - - # make config file location host specific so that a 32bit and 64bit pango - # wont fight with each other on a multilib system. Fix building for - # emul-linux-x86-gtklibs - if multilib_enabled ; then - epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch" - eautoreconf - fi - - elibtoolize # for Darwin bundles -} - -src_install() { - gnome2_src_install - find "${ED}/usr/$(get_libdir)/pango/1.6.0/modules" -name "*.la" -delete || die - if multilib_enabled; then - insinto "/etc/pango/${CHOST}" - else - insinto /etc/pango - fi - # TODO(msb): Ugly Hack fix for pango-querymodules pango-querymodules - # needs to be run on the target so we ran it on the target and stored - # the result which we copy here - sed "s:@libdir@:$(get_libdir):g" "${FILESDIR}"/pango.modules \ - >pango.modules || die - doins pango.modules || die -} - -pkg_postinst() { - if [ "${ROOT}" = "/" ] ; then - einfo "Generating modules listing..." - - local PANGO_CONFDIR= - - if multilib_enabled ; then - PANGO_CONFDIR="${EPREFIX}/etc/pango/${CHOST}" - else - PANGO_CONFDIR="${EPREFIX}/etc/pango" - fi - - mkdir -p ${PANGO_CONFDIR} - - pango-querymodules > ${PANGO_CONFDIR}/pango.modules - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest deleted file mode 100644 index 906b276480..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST unclutter-8.tar.Z 12344 RMD160 a78b6e148e7eea8f33b6fe0d6db3ad570889770d SHA1 726e829b41e9cb4d6a14cd91ca7efa02125be2be SHA256 b855a78d4465ab2f86287eacac63a73f1504b08522840aa37718776e7ec9192a diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch deleted file mode 100644 index a6ea52ae48..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-disable-tap.patch +++ /dev/null @@ -1,229 +0,0 @@ -diff --git a/Makefile b/Makefile -index 3c7b93c..30c1e5e 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,8 +28,8 @@ - MANDIR = $(MANSOURCEPATH)1 - IMAKE = imake - XLIB = $(EXTENSIONLIB) -lX11 -- -- LOCAL_LIBRARIES = $(XLIB) -+ XINPUT = -lXi -lXext -+ LOCAL_LIBRARIES = $(XLIB) $(XINPUT) - - OBJS = unclutter.o - SRCS = unclutter.c -diff --git a/unclutter.c b/unclutter.c -index 98b30af..934d49e 100644 ---- a/unclutter.c -+++ b/unclutter.c -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - #include - #include "vroot.h" - -@@ -50,12 +52,144 @@ usage(){ - -dontignoremodifiers don't ignore modifier keys\n\ - (requires -keystroke)\n\ - -not names... dont apply to windows whose wm-name begins.\n\ -- (must be last argument)"); -+ (must be last argument)\ -+ -notap "); -+ - } - - #define ALMOSTEQUAL(a,b) (abs(a-b)<=jitter) - #define ANYBUTTON (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask) - -+static const char* property_name = "Tap Paused"; -+ -+/* -+ * Method to determine version of the xinput extension -+ */ -+int xinput_version(display) -+Display *display; -+{ -+ XExtensionVersion *version; -+ static int vers = -1; -+ -+ if (vers != -1) -+ return vers; -+ -+ version = XGetExtensionVersion(display, INAME); -+ -+ if (version && (version != (XExtensionVersion*) NoSuchExtension)) { -+ vers = version->major_version; -+ XFree(version); -+ } -+ -+ return vers; -+} -+ -+/* -+ * Method to find device info for a given name (name can be device name or -+ * device id) -+ */ -+XIDeviceInfo* xi2_find_device_info(display, name) -+Display *display; -+char *name; -+{ -+ XIDeviceInfo *info; -+ int ndevices; -+ Bool is_id = True; -+ int i, id = -1; -+ -+ for (i = 0; i < strlen(name); i++) { -+ if (!isdigit(name[i])) { -+ is_id = False; -+ break; -+ } -+ } -+ -+ if (is_id) { -+ id = atoi(name); -+ } -+ -+ info = XIQueryDevice(display, XIAllDevices, &ndevices); -+ for (i = 0; i < ndevices; i++) { -+ if ((is_id && info[i].deviceid == id) -+ || (!is_id && strcmp(info[i].name, name) == 0)) { -+ return &info[i]; -+ } -+ } -+ -+ XIFreeDeviceInfo(info); -+ return NULL; -+} -+ -+/* -+ * Method to set the tap property -+ */ -+void set_tap_property(display, info, value) -+Display *display; -+XIDeviceInfo* info; -+unsigned char value; -+{ -+ // Atom for property name -+ Atom prop = XInternAtom(display, property_name, False); -+ -+ // Storage for existing property information -+ Atom type; -+ int format; -+ long unsigned int nitems, bytes; -+ unsigned char* data; -+ -+ // Get existing property to check format -+ int result = XIGetProperty(display, info->deviceid, prop, 0, 0, False, -+ AnyPropertyType, &type, &format, &nitems, &bytes, &data); -+ if (result != Success) { -+ fprintf(stderr, "Device %d property '%s' does not exist\n", -+ info->deviceid, property_name); -+ return; -+ } -+ XFree(data); -+ -+ // Check if property format is as expected -+ if (type != XA_INTEGER && format != 8 && nitems != 1) { -+ fprintf(stderr, "Device %d property '%s' is in wrong format\n", -+ info->deviceid, property_name); -+ return; -+ } -+ -+ // Change property to new value -+ XIChangeProperty(display, info->deviceid, prop, XA_INTEGER, 8, -+ PropModeReplace, &value, 1); -+} -+ -+/* -+ * Check xinput version and return touchpad device info -+ */ -+XIDeviceInfo* setup_xinput(display, touchpad_device_name) -+Display *display; -+char* touchpad_device_name; -+{ -+ int event, error, xi_opcode; -+ -+ if (!XQueryExtension(display, "XInputExtension", &xi_opcode, &event, -+ &error)) { -+ printf("X Input extension not available.\n"); -+ return 0; -+ } -+ -+ if (xinput_version(display) != XI_2_Major) { -+ fprintf(stderr, "%s extension version 2 not available\n", INAME); -+ return 0; -+ } -+ -+ XIDeviceInfo* info = xi2_find_device_info(display, touchpad_device_name); -+ if (info == NULL) { -+ fprintf(stderr, "Cannot find device named %s\n", touchpad_device_name); -+ return 0; -+ } -+ -+ set_tap_property(display, info, 0); -+ -+ return info; -+} -+ - /* Since the small window we create is a child of the window the pointer is - * in, it can be destroyed by its adoptive parent. Hence our destroywindow() - * can return an error, saying it no longer exists. Similarly, the parent -@@ -218,6 +352,7 @@ Window root; - - main(argc,argv)char **argv;{ - Display *display; -+ XIDeviceInfo *touchpad_device = 0; - int screen,oldx = -99,oldy = -99,numscreens; - int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0, - dovisible = 1, doevents = 1, onescreen = 0, dontignoremodifiers = 0; -@@ -225,6 +360,7 @@ main(argc,argv)char **argv;{ - Window *realroot; - Window root; - char *displayname = 0; -+ char *notap_device_name = 0; - struct KeyRecord* ignorekeyoverflow = NULL; - static unsigned char - ignorekeytable[SLOTCOUNT / (sizeof(unsigned char) * 8)]; -@@ -276,10 +412,18 @@ main(argc,argv)char **argv;{ - argc--,argv++; - if(argc<0)usage(); - displayname = *argv; -- }else usage(); -+ }else if(strcmp(*argv,"-notap")==0){ -+ argc--,argv++; -+ if(argc<0)usage(); -+ notap_device_name = *argv; -+ } -+ else usage(); - } - display = XOpenDisplay(displayname); - if(display==0)pexit("could not open display"); -+ if(notap_device_name != 0) { -+ touchpad_device = setup_xinput(display, notap_device_name); -+ } - numscreens = ScreenCount(display); - cursor = (Cursor*) malloc(numscreens*sizeof(Cursor)); - realroot = (Window*) malloc(numscreens*sizeof(Window)); -@@ -387,6 +531,8 @@ main(argc,argv)char **argv;{ - PointerMotionMask|ButtonPressMask|ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, None, cursor[screen], - CurrentTime)==GrabSuccess){ -+ if(touchpad_device) set_tap_property(display, touchpad_device, 1); -+ - /* wait for a button event or large cursor motion */ - XEvent event; - do{ -@@ -402,7 +548,9 @@ main(argc,argv)char **argv;{ - ALMOSTEQUAL(rooty,event.xmotion.y)) || - (event.type!=KeyPress && event.type!=MotionNotify)); - XUngrabPointer(display, CurrentTime); -+ if(touchpad_device) set_tap_property(display, touchpad_device, 0); - } -+ - }else{ - XSetWindowAttributes attributes; - XEvent event; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch deleted file mode 100644 index 5dec9a0e53..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-ignore-some-keys.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 058c02041246755a0817f7611b275dee397b6f57 Mon Sep 17 00:00:00 2001 -From: Andrew de los Reyes -Date: Wed, 22 Feb 2012 19:23:50 -0800 -Subject: [PATCH] Allow some keys to be ignored when using -keystroke. - -Generally, we want most, but not all, keystrokes to hide the -cursor. Alt-Tab is an example of a keystroke that deals with window -placement, which may happen while the user is using the mouse, so it's -nice to not hide the cursor when it is hit. Similarly, modifier keys -shouldn't hide the cursor, since a user may be trying to Alt-click or -Alt-drag. - -To address these, we create two new options: - --ignore: allows a given modifier set and keycode to be specified. It - will be ignored. This option can be called many times with many - ignore values. - - A simple lookup table is created. There are too many possible - keycodes to create a full lookup table (Afaik), so this table is - enough to hold all the common cases (keycodes 0-127 w/ Shift, Ctrl, - Alt modifiers). For overflow, a linked list of keycodes is used. - --dontignoremodifiers: Modifier keys are ignored by default now, but - with this option they can still cause the cursor to hide. ---- - unclutter.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 103 insertions(+), 3 deletions(-) - -diff --git a/unclutter.c b/unclutter.c -index 009bad5..98b30af 100644 ---- a/unclutter.c -+++ b/unclutter.c -@@ -44,6 +44,11 @@ usage(){ - -onescreen apply only to given screen of display\n\ - -visible ignore visibility events\n\ - -noevents dont send pseudo events\n\ -+ -ignore neither show nor hide when this key typed\n\ -+ (may be used multiple times;\n\ -+ requires -keystroke)\n\ -+ -dontignoremodifiers don't ignore modifier keys\n\ -+ (requires -keystroke)\n\ - -not names... dont apply to windows whose wm-name begins.\n\ - (must be last argument)"); - } -@@ -66,6 +71,80 @@ XErrorEvent *error; - (*defaulthandler)(display,error); - } - -+struct KeyRecord { -+ unsigned int state; -+ unsigned int keycode; -+ struct KeyRecord *next; -+}; -+ -+/* Returns -1 if doesn't fit in table, and should use overflow */ -+ssize_t keystoreslot(state, keycode) -+unsigned int state; -+unsigned int keycode; -+{ -+ /* 7 bits for keycode then 3 bits for state: shift, ctrl, mod1 (alt). */ -+ if (keycode > 0x7f) -+ return -1; -+ if (state & ~(ShiftMask | ControlMask | Mod1Mask)) -+ return -1; /* Doesn't fit w/ modifiers */ -+ ssize_t ret = keycode; -+ ret |= ((state & ShiftMask) ? 1 : 0) << 7; -+ ret |= ((state & ControlMask) ? 1 : 0) << 8; -+ ret |= ((state & Mod1Mask) ? 1 : 0) << 9; -+ return ret; -+} -+ -+/* 10 bits per modifier + keycode entry */ -+#define SLOTCOUNT (1 << 10) -+ -+void keystoreset(table, overflow, state, keycode) -+unsigned char *table; -+struct KeyRecord **overflow; -+unsigned int state; -+unsigned int keycode; -+{ -+ ssize_t slot = keystoreslot(state, keycode); -+ if (slot < 0) { -+ struct KeyRecord* elt = malloc(sizeof(struct KeyRecord)); -+ if (elt == NULL) { -+ fprintf(stderr, -+ "malloc failed. Some ignore key requests will not be honored.\n"); -+ return; -+ } -+ elt->state = state; -+ elt->keycode = keycode; -+ elt->next = *overflow; -+ *overflow = elt; -+ return; -+ } -+ size_t byteindex = slot / (sizeof(*table) * 8); -+ size_t bitindex = slot % (sizeof(*table) * 8); -+ table[byteindex] |= 1 << bitindex; -+} -+ -+int keystoreget(table, overflow, state, keycode) -+unsigned char *table; -+struct KeyRecord *overflow; -+unsigned int state; -+unsigned int keycode; -+{ -+ ssize_t slot = keystoreslot(state, keycode); -+ if (slot < 0) { -+ while (overflow && -+ (state != overflow->state || keycode != overflow->keycode)) -+ overflow = overflow->next; -+ return overflow != NULL; -+ } -+ size_t byteindex = slot / (sizeof(*table) * 8); -+ size_t bitindex = slot % (sizeof(*table) * 8); -+ return (table[byteindex] & (1 << bitindex)) != 0; -+} -+ -+int ismodifier(Display *display, unsigned int keycode) { -+ KeySym ks = XKeycodeToKeysym(display, keycode, 0); -+ return ks >= XK_Shift_L && ks <= XK_Hyper_R; -+} -+ - void XSelectAll(display, window, type) - Display *display; - Window window; -@@ -141,12 +220,18 @@ main(argc,argv)char **argv;{ - Display *display; - int screen,oldx = -99,oldy = -99,numscreens; - int doroot = 0, jitter = 0, idletime = 5, usegrabmethod = 0, waitagain = 0, -- dovisible = 1, doevents = 1, onescreen = 0; -+ dovisible = 1, doevents = 1, onescreen = 0, dontignoremodifiers = 0; - Cursor *cursor; - Window *realroot; - Window root; - char *displayname = 0; -- -+ struct KeyRecord* ignorekeyoverflow = NULL; -+ static unsigned char -+ ignorekeytable[SLOTCOUNT / (sizeof(unsigned char) * 8)]; -+ unsigned int modifier; -+ unsigned int keycode; -+ -+ memset(ignorekeytable, 0, sizeof(ignorekeytable)); - progname = *argv; - argc--; - while(argv++,argc-->0){ -@@ -156,6 +241,16 @@ main(argc,argv)char **argv;{ - idletime = atoi(*argv); - }else if(strcmp(*argv,"-keystroke")==0){ - idletime = -1; -+ }else if(strcmp(*argv,"-ignore")==0){ -+ argc--,argv++; -+ if(argc<0)usage(); -+ modifier = atoi(*argv); -+ argc--,argv++; -+ if(argc<0)usage(); -+ keycode = atoi(*argv); -+ keystoreset(ignorekeytable, &ignorekeyoverflow, modifier, keycode); -+ }else if(strcmp(*argv,"-dontignoremodifiers")==0){ -+ dontignoremodifiers = 1; - }else if(strcmp(*argv,"-jitter")==0){ - argc--,argv++; - if(argc<0)usage(); -@@ -236,7 +331,12 @@ main(argc,argv)char **argv;{ - continue; - } - }while(event.type != KeyPress || -- (event.xkey.state & ANYBUTTON)); -+ (event.xkey.state & ANYBUTTON) || -+ keystoreget(ignorekeytable, ignorekeyoverflow, -+ event.xkey.state & ~ANYBUTTON, -+ event.xkey.keycode) || -+ (!dontignoremodifiers && -+ ismodifier(display, event.xkey.keycode))); - oldx = event.xkey.x_root; - oldy = event.xkey.y_root; - } --- -1.7.3.4 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch deleted file mode 100644 index b4e34587a9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-keypress.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1e9863e2ae8466ba3abe9f44787d1ac5770edf19 Mon Sep 17 00:00:00 2001 -From: Andrew de los Reyes -Date: Mon, 20 Feb 2012 17:22:13 -0800 -Subject: [PATCH 1/3] Take action on KeyPress, not KeyRelease - -When using KeyRelease, it feels like there is a delay between using -the keyboard and cursor disappearing, which makes it feel unpolished. ---- - unclutter.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/unclutter.c b/unclutter.c -index 23bb99b..ab4e039 100644 ---- a/unclutter.c -+++ b/unclutter.c -@@ -180,7 +180,7 @@ main(argc,argv)char **argv;{ - realroot[screen] = XRootWindow(display,screen); - cursor[screen] = createnullcursor(display,realroot[screen]); - if(idletime<0) -- XSelectInput(display,realroot[screen],KeyReleaseMask); -+ XSelectInput(display,realroot[screen],KeyPressMask); - } - screen = DefaultScreen(display); - root = VirtualRootWindow(display,screen); -@@ -209,7 +209,7 @@ main(argc,argv)char **argv;{ - XEvent event; - do{ - XNextEvent(display,&event); -- }while(event.type != KeyRelease || -+ }while(event.type != KeyPress || - (event.xkey.state & ANYBUTTON)); - oldx = event.xkey.x_root; - oldy = event.xkey.y_root; -@@ -265,7 +265,7 @@ main(argc,argv)char **argv;{ - XEvent event; - do{ - XNextEvent(display,&event); -- }while(event.type==KeyRelease || -+ }while(event.type==KeyPress || - (event.type==MotionNotify && - ALMOSTEQUAL(rootx,event.xmotion.x) && - ALMOSTEQUAL(rooty,event.xmotion.y))); --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch deleted file mode 100644 index de3bd5cc0d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter-8-listen-to-all-windows.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f5e6e228207e82f1ff69f1d4d04f9ad53d3dfc02 Mon Sep 17 00:00:00 2001 -From: Andrew de los Reyes -Date: Mon, 20 Feb 2012 17:29:57 -0800 -Subject: [PATCH 2/3] Select keystrokes from all windows, not just root. - -To do this, we create a new function XSelectAll, that calls -XSelectInput on a tree of windows. Also, watch for CreateNotify -events, which indicate a new window is created, and when that happens, -call XSelectAll on it to get key events. ---- - unclutter.c | 41 +++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 39 insertions(+), 2 deletions(-) - -diff --git a/unclutter.c b/unclutter.c -index ab4e039..009bad5 100644 ---- a/unclutter.c -+++ b/unclutter.c -@@ -66,6 +66,26 @@ XErrorEvent *error; - (*defaulthandler)(display,error); - } - -+void XSelectAll(display, window, type) -+Display *display; -+Window window; -+unsigned long type; -+{ -+ Window parent; -+ Window *children; -+ unsigned int nchildren; -+ int status, i; -+ XSelectInput(display, window, type); -+ -+ status = XQueryTree(display, window, &window, -+ &parent, &children, &nchildren); -+ if (status == 0 || nchildren == 0) -+ return; -+ for (i = 0; i < nchildren; i++) -+ XSelectAll(display, children[i], type); -+ XFree((char *)children); -+} -+ - char **names; /* -> argv list of names to avoid */ - - /* -@@ -180,7 +200,8 @@ main(argc,argv)char **argv;{ - realroot[screen] = XRootWindow(display,screen); - cursor[screen] = createnullcursor(display,realroot[screen]); - if(idletime<0) -- XSelectInput(display,realroot[screen],KeyPressMask); -+ XSelectAll(display, realroot[screen], -+ KeyPressMask|SubstructureNotifyMask); - } - screen = DefaultScreen(display); - root = VirtualRootWindow(display,screen); -@@ -209,6 +230,11 @@ main(argc,argv)char **argv;{ - XEvent event; - do{ - XNextEvent(display,&event); -+ if (event.type == CreateNotify) { -+ XSelectAll(display, event.xcreatewindow.parent, -+ KeyPressMask|SubstructureNotifyMask); -+ continue; -+ } - }while(event.type != KeyPress || - (event.xkey.state & ANYBUTTON)); - oldx = event.xkey.x_root; -@@ -265,10 +291,16 @@ main(argc,argv)char **argv;{ - XEvent event; - do{ - XNextEvent(display,&event); -+ if (event.type == CreateNotify) { -+ XSelectAll(display, event.xcreatewindow.parent, -+ KeyPressMask|SubstructureNotifyMask); -+ continue; -+ } - }while(event.type==KeyPress || - (event.type==MotionNotify && - ALMOSTEQUAL(rootx,event.xmotion.x) && -- ALMOSTEQUAL(rooty,event.xmotion.y))); -+ ALMOSTEQUAL(rooty,event.xmotion.y)) || -+ (event.type!=KeyPress && event.type!=MotionNotify)); - XUngrabPointer(display, CurrentTime); - } - }else{ -@@ -333,6 +365,11 @@ main(argc,argv)char **argv;{ - /* wait till pointer leaves window */ - do{ - XNextEvent(display,&event); -+ if (event.type == CreateNotify) { -+ XSelectAll(display, event.xcreatewindow.parent, -+ KeyPressMask|SubstructureNotifyMask); -+ continue; -+ } - }while(event.type!=LeaveNotify && - event.type!=FocusOut && - event.type!=UnmapNotify && --- -1.7.7.3 - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf deleted file mode 100644 index 3c515abed9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/files/unclutter.conf +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -description "Unclutter (hides cursor while typing)" -author "chromium-os-dev@chromium.org" - -# This daemon maintains a connection to the X server, thus it uses -# non-standard start/stop conditions: -start on login-prompt-visible -stop on stopping ui - -respawn - -env XAUTHORITY=/home/chronos/.Xauthority -env DISPLAY=:0.0 - -script -IGNORE=" -ignore 8 23" # Alt-Tab -IGNORE="$IGNORE -ignore 4 23" # Ctrl-Tab -IGNORE="$IGNORE -ignore 0 71" # F5 (Switch Windows) -IGNORE="$IGNORE -ignore 4 71" # Ctrl-F5 (Screenshot) -IGNORE="$IGNORE -ignore 5 71" # Ctrl-Shift-F5 (Partial Screenshot) -IGNORE="$IGNORE -ignore 8 36" # Alt-Enter -IGNORE="$IGNORE -ignore 4 57" # Ctrl-N -IGNORE="$IGNORE -ignore 4 58" # Ctrl-M -IGNORE="$IGNORE -ignore 4 25" # Ctrl-W -IGNORE="$IGNORE -ignore 1 9" # Shift-Esc -for i in $(seq 10 18); do - IGNORE="$IGNORE -ignore 4 $i" # Ctrl-{1-9} - IGNORE="$IGNORE -ignore 8 $i" # Alt-{1-9} -done -TPID=`/opt/google/touchpad/tpcontrol_xinput listdev` -exec sudo -u chronos unclutter -keystroke -notap $TPID -grab $IGNORE -end script diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild deleted file mode 100644 index e4fc140927..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/unclutter/unclutter-8-r7.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/unclutter/unclutter-8-r1.ebuild,v 1.9 2007/07/22 03:41:55 dberkholz Exp $ - -inherit eutils toolchain-funcs - -S="${WORKDIR}/${PN}" -DESCRIPTION="Hides mouse pointer while not in use." -HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README" -SRC_URI="ftp://ftp.x.org/contrib/utilities/${P}.tar.Z" -SLOT="0" -LICENSE="public-domain" -KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86" -IUSE="" -RDEPEND="x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi" -DEPEND="${RDEPEND} - x11-proto/xproto" - -src_compile() { - # src_prepare fails in this ebuild, so patch here - epatch "${FILESDIR}/${P}-keypress.patch" - epatch "${FILESDIR}/${P}-listen-to-all-windows.patch" - epatch "${FILESDIR}/${P}-ignore-some-keys.patch" - epatch "${FILESDIR}/${P}-disable-tap.patch" - # This xmkmf appears unnecessary - # xmkmf -a || die "Couldn't run xmkmf" - emake -j1 CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die -} - -src_install () { - dobin unclutter - newman unclutter.man unclutter.1x - dodoc README - insinto /etc/init - doins "${FILESDIR}/unclutter.conf" -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest deleted file mode 100644 index 1b675386cb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xkeyboard-config-2.4.1.tar.bz2 813373 SHA256 f048bdd6e3d71c621b5a47a7ee72d691eda1922e0e07808b157b292e0c857a0a SHA512 3c4de68c7c2a7fd91b183198f59e8b0ed96770489531f72015a9c8fe42dc3d0a81002fd0f4f4ce1c616e4f1fdcf1868f4057f1e0f9d1685d4ec7b74148b9b9ea WHIRLPOOL a411a1b34a566127dada34f181ca60835194f9b2fb6d0024c0f476c2c449c74ef58238d0c259b63b09fb206a3355fecdd0ce9a30eaf01d5f12607b926612d8c8 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch deleted file mode 100644 index 98a46a7567..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-add-f19-24.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur xkb.orig/symbols/inet xkb/symbols/inet ---- xkb.orig/symbols/inet 2012-10-22 10:33:09.099377948 -0700 -+++ xkb/symbols/inet 2012-10-22 10:46:28.635298140 -0700 -@@ -225,6 +225,12 @@ - key { [ XF86Launch7 ] }; - key { [ XF86Launch8 ] }; - key { [ XF86Launch9 ] }; -+ key { [ F19 ] }; -+ key { [ F20 ] }; -+ key { [ F21 ] }; -+ key { [ F22 ] }; -+ key { [ F23 ] }; -+ key { [ F24 ] }; - }; - - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch deleted file mode 100644 index b2dc261bad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-colemack-neo-capslock-remap.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur xkeyboard-config-2.4.1.orig/symbols/de xkeyboard-config-2.4.1/symbols/de ---- xkeyboard-config-2.4.1.orig/symbols/de 2011-10-05 07:19:54.000000000 +0900 -+++ xkeyboard-config-2.4.1/symbols/de 2012-02-14 19:28:04.752942409 +0900 -@@ -383,6 +383,7 @@ - - include "shift(both_capslock)" - include "level3(caps_switch)" -+ include "level3(lwin_switch)" - include "level3(bksl_switch)" - include "level5(lsgt_switch)" - include "level5(ralt_switch)" -diff -ur xkeyboard-config-2.4.1.orig/symbols/us xkeyboard-config-2.4.1/symbols/us ---- xkeyboard-config-2.4.1.orig/symbols/us 2011-10-05 07:19:54.000000000 +0900 -+++ xkeyboard-config-2.4.1/symbols/us 2012-02-14 19:28:54.812726287 +0900 -@@ -789,6 +789,7 @@ - key { [ slash, question, questiondown, asciitilde ] }; - - key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; -+ key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; - key { [ minus, underscore, endash, emdash ] }; - key { [ space, space, space, nobreakspace ] }; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch deleted file mode 100644 index 07ce1dcc1a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch +++ /dev/null @@ -1,216 +0,0 @@ -From 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d Mon Sep 17 00:00:00 2001 -From: Sergey V. Udaltsov -Date: Wed, 05 Oct 2011 21:26:26 +0000 -Subject: Levels 2-4 for CTRL+ALT are propagated from level 1 - ---- -diff --git a/symbols/keypad b/symbols/keypad -index e85aaac..1bab391 100644 ---- a/symbols/keypad -+++ b/symbols/keypad -@@ -84,19 +84,19 @@ xkb_symbols "x11" { - // Ungrab cancels server/keyboard/pointer grabs - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] -+ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] - }; - - // ClsGrb kills whichever client has a grab in effect - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] -+ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] - }; - - // -VMode switches to the previous video mode - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] -+ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] - }; - - key { [ KP_Home, KP_7 ] }; -@@ -106,7 +106,7 @@ xkb_symbols "x11" { - // +VMode switches to the next video mode - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] -+ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] - }; - - key { [ KP_Left, KP_4 ] }; -@@ -242,11 +242,11 @@ xkb_symbols "legacymath" { - - key.type[Group1]="CTRL+ALT" ; - -- key { [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / -- key { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * -- key { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - -+ key { [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / -+ key { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * -+ key { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - - -- key { [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + -+ key { [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + - - }; - -@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" { - // ClsGrb kills whichever client has a grab in effect - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] -+ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] - }; - - key { [ KP_4 ] }; -@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" { - // -VMode switches to the previous video mode - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] -+ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] - }; - - key { [ KP_1 ] }; -@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" { - // +VMode switches to the next video mode - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] -+ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] - }; - - key { [ KP_0 ] }; -@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" { - // Ungrab cancels server/keyboard/pointer grabs - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] -+ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] - }; - }; -diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl -index 7d47d66..73b5af2 100644 ---- a/symbols/srvr_ctrl -+++ b/symbols/srvr_ctrl -@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" { - // Ungrab cancels server/keyboard/pointer grabs - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] -+ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] - }; - - // ClsGrb kills whichever client has a grab in effect - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] -+ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] - }; - - // -VMode switches to the previous video mode - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] -+ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] - }; - - // +VMode switches to the next video mode - key { - type="CTRL+ALT", -- symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode] -+ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode] - }; - - }; -@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" { - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ] -+ symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ] -+ symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ] -+ symbols[Group1]= [ F3, F3, F3, F3, F3 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ] -+ symbols[Group1]= [ F4, F4, F4, F4, F4 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ] -+ symbols[Group1]= [ F5, F5, F5, F5, F5 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ] -+ symbols[Group1]= [ F6, F6, F6, F6, F6 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ] -+ symbols[Group1]= [ F7, F7, F7, F7, F7 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ] -+ symbols[Group1]= [ F8, F8, F8, F8, F8 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ] -+ symbols[Group1]= [ F9, F9, F9, F9, F9 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ] -+ symbols[Group1]= [ F10, F10, F10, F10, F10 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ] -+ symbols[Group1]= [ F11, F11, F11, F11, F11 ] - }; - - key { - type="CTRL+ALT", -- symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ] -+ symbols[Group1]= [ F12, F12, F12, F12, F12 ] - }; - - }; -diff --git a/symbols/terminate b/symbols/terminate -index 96dd6e8..c74220b 100644 ---- a/symbols/terminate -+++ b/symbols/terminate -@@ -2,6 +2,6 @@ partial default modifier_keys - xkb_symbols "ctrl_alt_bksp" { - key { - type="CTRL+ALT", -- symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ] -+ symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ] - }; - }; --- -cgit v0.9.0.2-2-gbebe diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch deleted file mode 100644 index ca6405cc01..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-dvorak-deadkey.patch +++ /dev/null @@ -1,24 +0,0 @@ -With UK layouts, the grave key should operate as a dead key, -and the bar should be broken. -Additionally, vowels should be given an acute accent when AltGr is pressed. - -diff -uNr xkeyboard-config-1.7.orig/symbols/gb xkeyboard-config-1.7/symbols/gb ---- xkeyboard-config-1.7.orig/symbols/gb 2009-08-15 23:31:43.000000000 +0900 -+++ xkeyboard-config-1.7/symbols/gb 2011-05-19 12:56:47.000000000 +0900 -@@ -151,7 +151,15 @@ xkb_symbols "dvorak" { - key { [ 3, sterling, threesuperior, NoSymbol ] }; - key { [ numbersign, asciitilde ] }; - key { [ backslash, bar ] }; -- key { [ grave, notsign, bar, bar ] }; -+ key { [ deadgrave, notsign, brokenbar, brokenbar ] }; -+ key { [ a, A, aacute, Aacute ] }; -+ key { [ o, O, oacute, Oacute ] }; -+ key { [ e, E, eacute, Eacute ] }; -+ key { [ u, U, uacute, Uacute ] }; -+ key { [ i, I, iacute, Iacute ] }; -+ key { [ y, Y, yacute, Yacute ] }; -+ key { [ c, C, ccedilla, Ccedilla ] }; -+ key { [ w, W, wacute, Wacute ] }; - }; - - // Dvorak letter positions, but punctuation all in the normal UK positions. diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch deleted file mode 100644 index a0a627c9f4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-gb-extd-deadkey.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN xkeyboard-config-2.4.1.orig/symbols/gb xkeyboard-config-2.4.1/symbols/gb ---- xkeyboard-config-2.4.1.orig/symbols/gb 2012-11-22 14:40:25.858449142 +0900 -+++ xkeyboard-config-2.4.1/symbols/gb 2012-11-26 13:55:13.877729860 +0900 -@@ -75,7 +75,7 @@ - name[Group1]="English (UK, extended WinKeys)"; - - // Alphanumeric section -- key { [ dead_grave, notsign, brokenbar, NoSymbol ] }; -+ key { [ grave, notsign, brokenbar, NoSymbol ] }; - - key { [ 2, quotedbl, dead_diaeresis, onehalf ] }; - key { [ 3, sterling, threesuperior, onethird ] }; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch deleted file mode 100644 index 6034bb75c7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-no-keyboard.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur xkeyboard-config-2.4.1.orig/rules/base.xml.in xkeyboard-config-2.4.1/rules/base.xml.in ---- xkeyboard-config-2.4.1.orig/rules/base.xml.in 2011-10-05 07:19:54.000000000 +0900 -+++ xkeyboard-config-2.4.1/rules/base.xml.in 2012-02-14 19:20:13.944976247 +0900 -@@ -3708,7 +3708,8 @@ - <_shortDescription>no - <_description>Norwegian - -- nor -+ nob -+ nno - - - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch deleted file mode 100644 index b26420bb82..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-parrot-euro-sign.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -urN xkeyboard-config-2.4.1.orig/rules/compat/layoutsMapping.lst xkeyboard-config-2.4.1/rules/compat/layoutsMapping.lst ---- xkeyboard-config-2.4.1.orig/rules/compat/layoutsMapping.lst 2012-11-14 14:08:33.999093026 +0900 -+++ xkeyboard-config-2.4.1/rules/compat/layoutsMapping.lst 2012-11-14 17:03:26.637971159 +0900 -@@ -25,3 +25,6 @@ - yu srp - fr-latin9 fr(latin9) - us_intl us(alt-intl) -+# To be us(euro) as the default us keyboard layout on parrot, overwrite us -+# layout mapping to us(euro). -+us us(euro) diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch deleted file mode 100644 index 9f94cbd4a0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-capslock.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -urN xkeyboard-config-2.4.1.org/symbols/pc xkeyboard-config-2.4.1/symbols/pc ---- xkeyboard-config-2.4.1.org/symbols/pc 2013-01-17 15:09:37.104779731 +0900 -+++ xkeyboard-config-2.4.1/symbols/pc 2013-01-17 15:11:40.836636784 +0900 -@@ -19,7 +19,10 @@ - key { [ Tab, ISO_Left_Tab ] }; - key { [ Return ] }; - -- key { [ Caps_Lock ] }; -+ // Generate a non Caps_Lock symbol (F16) for to allow the user to -+ // remap the key. Chrome remaps the F16 key symbol back to VKEY_CAPITAL when -+ // needed. crbug.com/146204. -+ key { [ XF86Launch7 ] }; - - key { [ Num_Lock ] }; - -@@ -40,6 +43,9 @@ - modifier_map Lock { Caps_Lock, ISO_Lock }; - modifier_map Control{ Control_L, Control_R }; - modifier_map Mod2 { Num_Lock }; -+ // Use as Mod3. The Mod3Mask mask will be remapped to ControlMask, -+ // Mod1Mask (Alt), etc. in Chrome. crbug.com/146204 -+ modifier_map Mod3 { }; - modifier_map Mod4 { Super_L, Super_R }; - - // Fake keys for virtual<->real modifiers mapping diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch deleted file mode 100644 index 350edae348..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-remap-f15-as-mod2mask.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN xkeyboard-config-2.4.1.org/symbols/pc xkeyboard-config-2.4.1/symbols/pc ---- xkeyboard-config-2.4.1.org/symbols/pc 2013-01-17 13:51:15.974219536 +0900 -+++ xkeyboard-config-2.4.1/symbols/pc 2013-01-17 14:31:45.361168332 +0900 -@@ -42,7 +42,9 @@ - modifier_map Shift { Shift_L, Shift_R }; - modifier_map Lock { Caps_Lock, ISO_Lock }; - modifier_map Control{ Control_L, Control_R }; -- modifier_map Mod2 { Num_Lock }; -+ // Keep Num_Lock as Mod2 modifier. Mod2 is used as both NumLock modifier -+ // and diamond key modifier. -+ modifier_map Mod2 { Num_Lock, XF86Launch6 }; - // Use as Mod3. The Mod3Mask mask will be remapped to ControlMask, - // Mod1Mask (Alt), etc. in Chrome. crbug.com/146204 - modifier_map Mod3 { }; diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch deleted file mode 100644 index 9c526af13a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Thu, 19 Jan 2012 16:36:16 +1100 -Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option - -Similar to how we put the Terminate mapping behind an option rather than -enabling it by default, put the ClearGrab/CloseGrab action handlers -behind an option too, so we don't ship 'break my screensaver'. Oops. - -Signed-off-by: Daniel Stone ---- - compat/xfree86 | 15 +++++++++------ - rules/base.o_c.part | 1 + - rules/base.xml.in | 6 ++++++ - 3 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/compat/xfree86 b/compat/xfree86 -index cf4a8b2..52e661d 100644 ---- a/compat/xfree86 -+++ b/compat/xfree86 -@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic" { - action = SwitchScreen(Screen=12, !SameServer); - }; - -- interpret XF86_Ungrab { -- action = Private(type=0x86, data="Ungrab"); -- }; -- interpret XF86_ClearGrab { -- action = Private(type=0x86, data="ClsGrb"); -- }; - interpret XF86LogGrabInfo { - action = Private(type=0x86, data="PrGrbs"); - }; -@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic" { - action = Private(type=0x86, data="-VMode"); - }; - }; -+ -+partial xkb_compatibility "grab_break" { -+ interpret XF86_Ungrab { -+ action = Private(type=0x86, data="Ungrab"); -+ }; -+ interpret XF86_ClearGrab { -+ action = Private(type=0x86, data="ClsGrb"); -+ }; -+}; -diff --git a/rules/base.o_c.part b/rules/base.o_c.part -index 352f8b3..b80ab6d 100644 ---- a/rules/base.o_c.part -+++ b/rules/base.o_c.part -@@ -3,4 +3,5 @@ - grp_led:scroll = +ledscroll(group_lock) - japan:kana_lock = +japan(kana_lock) - caps:shiftlock = +ledcaps(shift_lock) -+ grab:break_actions = +xfree86(grab_break) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index 22b720f..6c17faa 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -6278,6 +6278,12 @@ - <_description>Toggle PointerKeys with Shift + NumLock. - - -+ - - - --- -1.7.8.3 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild deleted file mode 100644 index 44165037ec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r15.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild,v 1.5 2012/01/24 12:52:59 jer Exp $ - -EAPI=4 - -XORG_STATIC=no -inherit xorg-2 - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config" - -DESCRIPTION="X keyboard configuration database" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" -[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2" - -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="parrot" - -LICENSE="MIT" -SLOT="0" - -RDEPEND=">=x11-apps/xkbcomp-1.2.1 - >=x11-libs/libX11-1.4.2" -DEPEND="${RDEPEND} - x11-proto/xproto - >=dev-util/intltool-0.30 - dev-perl/XML-Parser" - -XORG_CONFIGURE_OPTIONS=( - --with-xkb-base="${EPREFIX}/usr/share/X11/xkb" - --enable-compat-rules - # do not check for runtime deps - --disable-runtime-deps - --with-xkb-rules-symlink=xorg -) - -PATCHES=( - "${FILESDIR}"/${P}-extended-function-keys.patch - "${FILESDIR}"/xorg-cve-2012-0064.patch - "${FILESDIR}"/${P}-gb-dvorak-deadkey.patch - "${FILESDIR}"/${P}-no-keyboard.patch - "${FILESDIR}"/${P}-colemack-neo-capslock-remap.patch - "${FILESDIR}"/${P}-remap-capslock.patch - "${FILESDIR}"/${P}-add-f19-24.patch - "${FILESDIR}"/${P}-gb-extd-deadkey.patch - "${FILESDIR}"/${P}-remap-f15-as-mod2mask.patch -) - -use parrot && PATCHES+=( "${FILESDIR}"/${P}-parrot-euro-sign.patch ) - -src_prepare() { - xorg-2_src_prepare - if [[ ${XORG_EAUTORECONF} != no ]]; then - intltoolize --copy --automake || die - fi -} - -src_compile() { - # cleanup to make sure .dir files are regenerated - # bug #328455 c#26 - xorg-2_src_compile clean - xorg-2_src_compile -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest deleted file mode 100644 index 668974f065..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xcb-proto-1.7.1.tar.bz2 106040 SHA256 ad5d99887d811c9817f1916d7b3f5dc6c21414c093256cbeffb945aacdc34437 SHA512 3c44ff3d353ff2b8f7525d4bbce8e03f6e102617670797f7e28f8880df44709dcdf2e15d38ad56139e1f067c5ce8b0816edb0b06474271f18f90146328bd8a57 WHIRLPOOL 5fa8c16c378ff18eac92f45304a5e8b1720eb46c4ed53c2b83f560d0d7be547b623a56d3ef35cb6e6e4cd4a7f4ebf206c2991346f1071c9fc6709834cfb92e55 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild deleted file mode 100644 index 642a7c3768..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xcb-proto/xcb-proto-1.7.1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcb-proto/xcb-proto-1.6-r2.ebuild,v 1.5 2011/12/27 21:13:20 maekke Exp $ - -EAPI=3 -PYTHON_DEPEND="2:2.5" - -inherit python xorg-2 - -DESCRIPTION="X C-language Bindings protocol headers" -HOMEPAGE="http://xcb.freedesktop.org/" -EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto" -[[ ${PV} != 9999* ]] && \ - SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2" - -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-libs/libxml2" - -pkg_setup() { - python_set_active_version 2 -} - -src_prepare() { - xorg-2_src_prepare -} - -src_install() { - xorg-2_src_install - python_clean_installation_image -} - -pkg_postinst() { - python_mod_optimize xcbgen - ewarn "Please rebuild both libxcb and xcb-util if you are upgrading from version 1.6" -} - -pkg_postrm() { - python_mod_cleanup xcbgen -} diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest deleted file mode 100644 index 9b8df2a0c3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xextproto-7.2.0.tar.bz2 207724 RMD160 f7ea5722a70d64c62f8cf0bea0b53fbf2688166a SHA1 a117fb9d7fdebee7af3f9e79efe9812e39e650a5 SHA256 d2bc4208c6b1883ebe00bc5c0048e5d825038cda56775f74bb4aa89afdc576d5 diff --git a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild deleted file mode 100644 index 6e4f504e27..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-proto/xextproto/xextproto-7.2.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-proto/xextproto/xextproto-7.2.0.ebuild,v 1.3 2011/03/16 16:14:15 scarabeus Exp $ - -EAPI=4 - -XORG_DOC=doc -inherit xorg-2 - -DESCRIPTION="X.Org XExt protocol headers" - -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" - -RDEPEND="! 0) g.width = (g.width + wcw - 1) / wcw; -+ if (wcw > 1) g.xOff = g.xOff / wcw; -+ if (width < g.xOff) width = g.xOff; - -- if (width < g.width ) width = g.width; - if (height < g.height ) height = g.height; - if (glheight < g.height - g.y) glheight = g.height - g.y; - } diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff deleted file mode 100644 index 81a3646d48..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-no-urgency-if-focused.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -NrU5 rxvt-unicode-9.06.original/src/screen.C rxvt-unicode-9.06/src/screen.C ---- rxvt-unicode-9.06.original/src/screen.C 2009-10-25 18:16:16.000000000 -0600 -+++ rxvt-unicode-9.06/src/screen.C 2009-10-25 18:17:53.000000000 -0600 -@@ -1927,11 +1927,11 @@ - # endif - XMapWindow (dpy, parent[0]); - # endif - - # if ENABLE_FRILLS -- if (option (Opt_urgentOnBell)) -+ if (option (Opt_urgentOnBell) && !focus) - set_urgency (1); - # endif - - if (option (Opt_visualBell)) - { diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch deleted file mode 100644 index b09ad99340..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/files/rxvt-unicode-9.06-popups-hangs.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/rxvtperl.xs -=================================================================== -RCS file: /schmorpforge/rxvt-unicode/src/rxvtperl.xs,v -retrieving revision 1.127 -diff -u -r1.127 rxvtperl.xs ---- src/rxvtperl.xs 30 May 2009 08:51:23 -0000 1.127 -+++ src/rxvtperl.xs 30 Jul 2009 22:19:33 -0000 -@@ -929,7 +929,9 @@ - rxvt_term::grab (Time eventtime, int sync = 0) - CODE: - { -- int mode = sync ? GrabModeSync : GrabModeAsync; -+ // TA: 20090730: Always assume Async mode here -- recent Xorg -+ // Servers don't appreciate being put in Sync mode. -+ int mode = GrabModeAsync; - - THIS->perl.grabtime = 0; - diff --git a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild deleted file mode 100644 index 414f81c9b7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.07-r1.ebuild,v 1.1 2010/02/03 05:07:45 jer Exp $ - -EAPI="2" - -inherit autotools flag-o-matic - -DESCRIPTION="rxvt clone with xft and unicode support" -HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" -SRC_URI="http://dist.schmorp.de/rxvt-unicode/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" -IUSE="minimal +truetype perl iso14755 afterimage xterm-color wcwidth +vanilla" - -# see bug #115992 for modular x deps -RDEPEND="x11-libs/libX11 - x11-libs/libXft - afterimage? ( media-libs/libafterimage ) - x11-libs/libXrender - perl? ( dev-lang/perl ) - >=sys-libs/ncurses-5.7-r3" -DEPEND="${RDEPEND} - dev-util/pkgconfig - x11-proto/xproto" - -src_prepare() { - if { use xterm-color || use wcwidth; }; then - ewarn "You enabled xterm-color or wcwidth or both." - ewarn "Please note that neither of them are supported by upstream." - ewarn "You are at your own if you run into problems." - ebeep 5 - fi - - local tdir=/usr/share/terminfo - if use xterm-color; then - epatch doc/urxvt-8.2-256color.patch - sed -e \ - 's/^\(rxvt-unicode\)/\1256/;s/colors#88/colors#256/;s/pairs#256/pairs#32767/' \ - doc/etc/rxvt-unicode.terminfo > doc/etc/rxvt-unicode256.terminfo - sed -i -e \ - "s~^\(\s\+@TIC@.*\)~\1\n\t@TIC@ -o "${D}"/${tdir} \$(srcdir)/etc/rxvt-unicode256.terminfo~" \ - doc/Makefile.in - fi - - # kill the rxvt-unicode terminfo file - #192083 - sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || - die "sed failed" - - use wcwidth && epatch doc/wcwidth.patch - - # bug #240165 - epatch "${FILESDIR}"/${PN}-9.06-no-urgency-if-focused.diff - - # ncurses will provide rxvt-unicode terminfo, so we don't install them again - # see bug #192083 - # - # According to my tests this is not (yet?) true, so keep it prepared and - # disabled until it's needed again. - #if has_version ' - fperms 0755 /usr/bin/xterm - - # restore the navy blue - sed -i -e "s:blue2$:blue:" "${D}"${DEFAULTS_DIR}/XTerm-color -}