Fix for implict declarations and underlinking

(Portage version: 2.1.9.24/cvs/Linux x86_64)

4 files changed, 35 insertions, 10 deletions

diff --git a/x11-libs/libxdl_view/ChangeLog b/x11-libs/libxdl_view/ChangeLog
index cb1b76e2ddd5..8ef65f64391d 100644
--- a/x11-libs/libxdl_view/ChangeLog
+++ b/x11-libs/libxdl_view/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libxdl_view
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/ChangeLog,v 1.2 2010/03/29 19:47:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/ChangeLog,v 1.3 2010/11/11 17:56:21 jlec Exp $
+
+*libxdl_view-4.2-r1 (11 Nov 2010)
+
+  11 Nov 2010; Justin Lecher <jlec@gentoo.org> files/4.2-as-needed.patch,
+  -libxdl_view-4.2.ebuild, +files/4.2-impl-dec.patch,
+  +libxdl_view-4.2-r1.ebuild:
+  Fix for implict declarations and underlinking
 
   29 Mar 2010; Justin Lecher <jlec@gentoo.org> libxdl_view-4.2.ebuild:
   Keyworded for ~x86-linux ~amd64-linux
diff --git a/x11-libs/libxdl_view/files/4.2-as-needed.patch b/x11-libs/libxdl_view/files/4.2-as-needed.patch
index d5c93dda4816..e45a43c85ba2 100644
--- a/x11-libs/libxdl_view/files/4.2-as-needed.patch
+++ b/x11-libs/libxdl_view/files/4.2-as-needed.patch
@@ -1,12 +1,15 @@
-diff -ur libxdl_view-4.2.orig/Makefile.am libxdl_view-4.2/Makefile.am
---- libxdl_view-4.2.orig/Makefile.am	2009-03-02 22:13:10.000000000 -0800
-+++ libxdl_view-4.2/Makefile.am	2009-03-02 22:14:11.000000000 -0800
-@@ -18,7 +18,7 @@
- 
+diff --git a/Makefile.am b/Makefile.am
+index 347bb21..aa41ba3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +21,10 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la
  ## The initial value of this was a mistake!
  ## See the libtool doc.
--libxdl_view_la_LDFLAGS = -version-info 2:0:0
-+libxdl_view_la_LDFLAGS = -version-info 2:0:0 -lX11 -lXt
+ libxdl_view_la_LDFLAGS = -version-info 2:0:0
++libxdl_view_la_LIBADD = -lX11 -lXt -lm
++
  libxdl_viewextra_la_LDFLAGS = -version-info 0:0:0
++libxdl_viewextra_la_LIBADD = -lm -L$(srcdir)/.libs -lxdl_view
  
  EXTRA_DIST = doc/xdl_view_icon.gif doc/xdl_view_top.gif			 \
+   doc/xdl_view_top.html doc/xdl_view_updates.html			 \
diff --git a/x11-libs/libxdl_view/files/4.2-impl-dec.patch b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
new file mode 100644
index 000000000000..2880719083d7
--- /dev/null
+++ b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 347bb21..aa41ba3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,6 +3,8 @@
+ 
+ ## Process this file with automake.
+ 
++CFLAGS += -std=c99
++
+ libxdl_view_la_SOURCES = xdl_base_fr.c xdl_blank_obj.c xdl_image.c \
+   xdl_bg.c xdl_img_rd.c xdl_film_img.c xdl_io_window.c \
+   xdl_menu_area.c xdl_text_tab.c xdl_panel_itm.c \
diff --git a/x11-libs/libxdl_view/libxdl_view-4.2.ebuild b/x11-libs/libxdl_view/libxdl_view-4.2-r1.ebuild
index 1626fd5b7dd0..184373e038ef 100644
--- a/x11-libs/libxdl_view/libxdl_view-4.2.ebuild
+++ b/x11-libs/libxdl_view/libxdl_view-4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/libxdl_view-4.2.ebuild,v 1.2 2010/03/29 19:47:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/libxdl_view-4.2-r1.ebuild,v 1.1 2010/11/11 17:56:21 jlec Exp $
 
 EAPI="2"
 
@@ -19,7 +19,9 @@ RDEPEND="x11-libs/libXt"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/4.2-as-needed.patch
+	epatch \
+		"${FILESDIR}"/${PV}-impl-dec.patch \
+		"${FILESDIR}"/${PV}-as-needed.patch
 	eautoreconf
 }