summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2009-09-24 07:39:45 +0000
committerRémi Cardona <remi@gentoo.org>2009-09-24 07:39:45 +0000
commitfc68c9f5d3f30c45b85aea7c438e77b772886121 (patch)
treedf25594441ccd348f0cfcf7b9113f43b37dcb46b
parentx11-libs/libXScrnSaver: add missing scrnsaverproto dep (fixes bug #227901) (diff)
downloadgentoo-2-fc68c9f5d3f30c45b85aea7c438e77b772886121.tar.gz
gentoo-2-fc68c9f5d3f30c45b85aea7c438e77b772886121.tar.bz2
gentoo-2-fc68c9f5d3f30c45b85aea7c438e77b772886121.zip
x11-apps/xf86dga: remove useless deps on libXt, libXaw and libXmu (fixes bug #227895)
(Portage version: 2.1.6.13/cvs/Linux x86_64)
-rw-r--r--x11-apps/xf86dga/ChangeLog6
-rw-r--r--x11-apps/xf86dga/files/xf86dga-1.0.2-fix-deps.patch59
-rw-r--r--x11-apps/xf86dga/xf86dga-1.0.2.ebuild8
3 files changed, 70 insertions, 3 deletions
diff --git a/x11-apps/xf86dga/ChangeLog b/x11-apps/xf86dga/ChangeLog
index c96c4387b34b..9d32cbb035ec 100644
--- a/x11-apps/xf86dga/ChangeLog
+++ b/x11-apps/xf86dga/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-apps/xf86dga
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.27 2009/07/07 01:37:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.28 2009/09/24 07:39:44 remi Exp $
+
+ 24 Sep 2009; Rémi Cardona <remi@gentoo.org> xf86dga-1.0.2.ebuild,
+ +files/xf86dga-1.0.2-fix-deps.patch:
+ remove useless deps on libXt, libXaw and libXmu (fixes bug #227895)
07 Jul 2009; Jeroen Roovers <jer@gentoo.org> xf86dga-1.0.2.ebuild:
Stable for HPPA too.
diff --git a/x11-apps/xf86dga/files/xf86dga-1.0.2-fix-deps.patch b/x11-apps/xf86dga/files/xf86dga-1.0.2-fix-deps.patch
new file mode 100644
index 000000000000..8f5339d14a3e
--- /dev/null
+++ b/x11-apps/xf86dga/files/xf86dga-1.0.2-fix-deps.patch
@@ -0,0 +1,59 @@
+From 4e4c9f023d84e37de412f1f484615edca6628549 Mon Sep 17 00:00:00 2001
+From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Sun, 16 Mar 2008 23:33:57 +0000
+Subject: xf86dga doesn't require Xt, Xmu and Xaw.
+
+ Remove inclusion of Xt/Xmu/Xaw headers and update includes to match
+missing libc and libX11 protypes.
+---
+diff --git a/configure.ac b/configure.ac
+index c9113c4..ad6543c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XF86DGA, x11 xxf86dga xt xaw7 xmu)
++PKG_CHECK_MODULES(XF86DGA, x11 xxf86dga)
+ AC_SUBST(XF86DGA_CFLAGS)
+ AC_SUBST(XF86DGA_LIBS)
+
+diff --git a/dga.c b/dga.c
+index 7305ecd..eb1ec6e 100644
+--- a/dga.c
++++ b/dga.c
+@@ -1,26 +1,16 @@
+ /* $XFree86: xc/programs/xf86dga/dga.c,v 3.19 2001/10/28 03:34:32 tsi Exp $ */
+
+-#include <X11/Xos.h>
+-#include <X11/Intrinsic.h>
+-#include <X11/Shell.h>
+-#include <X11/StringDefs.h>
+-#include <X11/Xatom.h>
+-#include <X11/Xaw/Form.h>
+-#include <X11/Xaw/Scrollbar.h>
+-#include <X11/Xaw/Label.h>
+-#include <X11/Xaw/Command.h>
+-#include <X11/Xaw/AsciiText.h>
+-#include <X11/Xaw/Box.h>
+-#include <X11/Xaw/Toggle.h>
+-#include <X11/Xmu/StdSel.h>
+-#include <X11/Xmd.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
+ #include <X11/extensions/xf86dga.h>
++#include <sys/time.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+-
++#include <unistd.h>
+
+
+ #define MINMAJOR 0
+--
+cgit v0.8.2
diff --git a/x11-apps/xf86dga/xf86dga-1.0.2.ebuild b/x11-apps/xf86dga/xf86dga-1.0.2.ebuild
index 85918d3abcd0..8c9467037d09 100644
--- a/x11-apps/xf86dga/xf86dga-1.0.2.ebuild
+++ b/x11-apps/xf86dga/xf86dga-1.0.2.ebuild
@@ -1,16 +1,20 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-1.0.2.ebuild,v 1.13 2009/07/07 01:37:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-1.0.2.ebuild,v 1.14 2009/09/24 07:39:44 remi Exp $
# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
inherit x-modular
DESCRIPTION="test program for the XFree86-DGA extension"
+
KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd"
IUSE=""
+
RDEPEND="x11-libs/libX11
x11-libs/libXxf86dga"
DEPEND="${RDEPEND}
x11-proto/xf86dgaproto"
+
+PATCHES=( "${FILESDIR}/xf86dga-1.0.2-fix-deps.patch" )