summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-11-29 12:33:11 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-11-29 12:33:11 +0000
commitb393772386426e0162b90cefe25d4a95a850f4e5 (patch)
tree9cf46f778939fc166b5544a94a3a5b19c90bb61d /x11-libs/libXrender
parentPass -DPULSEAUDIO=OFF where it doesn't work properly. (diff)
downloadgentoo-2-b393772386426e0162b90cefe25d4a95a850f4e5.tar.gz
gentoo-2-b393772386426e0162b90cefe25d4a95a850f4e5.tar.bz2
gentoo-2-b393772386426e0162b90cefe25d4a95a850f4e5.zip
Apply patch for doc placement. Per bug #294454.
(Portage version: 2.2_rc53/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/libXrender')
-rw-r--r--x11-libs/libXrender/ChangeLog7
-rw-r--r--x11-libs/libXrender/files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch27
-rw-r--r--x11-libs/libXrender/libXrender-0.9.5.ebuild8
3 files changed, 39 insertions, 3 deletions
diff --git a/x11-libs/libXrender/ChangeLog b/x11-libs/libXrender/ChangeLog
index f2782cc2d42e..f07844fbf34a 100644
--- a/x11-libs/libXrender/ChangeLog
+++ b/x11-libs/libXrender/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/libXrender
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/ChangeLog,v 1.58 2009/10/03 12:04:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/ChangeLog,v 1.59 2009/11/29 12:33:10 scarabeus Exp $
+
+ 29 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ +files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch,
+ libXrender-0.9.5.ebuild:
+ Apply patch for doc placement. Per bug #294454.
*libXrender-0.9.5 (03 Oct 2009)
diff --git a/x11-libs/libXrender/files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch b/x11-libs/libXrender/files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch
new file mode 100644
index 000000000000..9573a2c7a982
--- /dev/null
+++ b/x11-libs/libXrender/files/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch
@@ -0,0 +1,27 @@
+From 260d288027d9cdcd6944a6bb16d0e1f596550552 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <scarabeus@gentoo.org>
+Date: Sun, 29 Nov 2009 13:28:41 +0100
+Subject: [PATCH] Make libXrender use docdir for documentation placement.
+
+---
+ Makefile.am | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a15b64d..3c98504 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,8 +24,8 @@ SUBDIRS = src
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xrender.pc
+
+-renderdocdir = $(datadir)/doc/$(PACKAGE)
+-dist_renderdoc_DATA = doc/libXrender.txt
++docdir = $(datadir)/doc/$(PACKAGE)
++dist_doc_DATA = doc/libXrender.txt
+
+ EXTRA_DIST = xrender.pc.in ChangeLog
+ MAINTAINERCLEANFILES = ChangeLog
+--
+1.6.5.3
+
diff --git a/x11-libs/libXrender/libXrender-0.9.5.ebuild b/x11-libs/libXrender/libXrender-0.9.5.ebuild
index 7ce292f47df7..c2c097b50a71 100644
--- a/x11-libs/libXrender/libXrender-0.9.5.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.5.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.5.ebuild,v 1.1 2009/10/03 12:04:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.5.ebuild,v 1.2 2009/11/29 12:33:10 scarabeus Exp $
# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
inherit x-modular
@@ -15,3 +15,7 @@ RDEPEND="x11-libs/libX11
>=x11-proto/renderproto-0.9.3
x11-proto/xproto"
DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/0001-Make-libXrender-use-docdir-for-documentation-placeme.patch"
+)