summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2014-05-01 04:13:10 +0000
committerNaohiro Aota <naota@gentoo.org>2014-05-01 04:13:10 +0000
commitee43268028bb6d9bdca4409420936b34f2c5dd81 (patch)
treec094b96f37a2cbf786ba499a07e25638d261cfd0 /app-text/xdvik
parentadd py3.4 support (diff)
downloadgentoo-2-ee43268028bb6d9bdca4409420936b34f2c5dd81.tar.gz
gentoo-2-ee43268028bb6d9bdca4409420936b34f2c5dd81.tar.bz2
gentoo-2-ee43268028bb6d9bdca4409420936b34f2c5dd81.zip
Add Xaw3d build problem patch. #508298
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'app-text/xdvik')
-rw-r--r--app-text/xdvik/ChangeLog6
-rw-r--r--app-text/xdvik/files/xdvik-22.87-xaw3d.patch22
-rw-r--r--app-text/xdvik/xdvik-22.87.ebuild3
3 files changed, 29 insertions, 2 deletions
diff --git a/app-text/xdvik/ChangeLog b/app-text/xdvik/ChangeLog
index be29440fa026..fa0d5ea26925 100644
--- a/app-text/xdvik/ChangeLog
+++ b/app-text/xdvik/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/xdvik
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.106 2014/04/23 09:19:55 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/ChangeLog,v 1.107 2014/05/01 04:13:10 naota Exp $
+
+ 01 May 2014; Naohiro Aota <naota@gentoo.org> +files/xdvik-22.87-xaw3d.patch,
+ xdvik-22.87.ebuild:
+ Add Xaw3d build problem patch. #508298
*xdvik-22.87 (23 Apr 2014)
diff --git a/app-text/xdvik/files/xdvik-22.87-xaw3d.patch b/app-text/xdvik/files/xdvik-22.87-xaw3d.patch
new file mode 100644
index 000000000000..79e7893a19b8
--- /dev/null
+++ b/app-text/xdvik/files/xdvik-22.87-xaw3d.patch
@@ -0,0 +1,22 @@
+diff --git a/events.c b/events.c
+index dbb46f0..f9990f9 100644
+--- a/events.c
++++ b/events.c
+@@ -5311,7 +5311,7 @@ xi2_emulate_action(struct xdvi_action *actp, struct xi2_valinfo *valinfo,
+ }
+
+ if (actp->proc == Act_wheel) {
+-# if XAW
++# if !MOTIF
+ if (globals.widgets.y_bar != NULL)
+ XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
+ cast_int_to_XtPointer(dist));
+@@ -5322,7 +5322,7 @@ xi2_emulate_action(struct xdvi_action *actp, struct xi2_valinfo *valinfo,
+ # endif /* MOTIF */
+ }
+ else { /* Act_hwheel */
+-# if XAW
++# if !MOTIF
+ if (globals.widgets.x_bar != NULL)
+ XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
+ cast_int_to_XtPointer(dist));
diff --git a/app-text/xdvik/xdvik-22.87.ebuild b/app-text/xdvik/xdvik-22.87.ebuild
index ec83aab779d9..bd3a1d97e186 100644
--- a/app-text/xdvik/xdvik-22.87.ebuild
+++ b/app-text/xdvik/xdvik-22.87.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.87.ebuild,v 1.1 2014/04/23 09:19:55 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.87.ebuild,v 1.2 2014/05/01 04:13:10 naota Exp $
EAPI=5
inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
@@ -37,6 +37,7 @@ S=${WORKDIR}/${P}/texk/xdvik
src_prepare() {
local i
+ epatch "${FILESDIR}"/${P}-xaw3d.patch
# Make sure system kpathsea headers are used
cd "${WORKDIR}/${P}/texk/kpathsea"
for i in *.h ; do echo "#include_next \"$i\"" > $i; done