summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-01-19 13:25:59 +0000
committerJustin Lecher <jlec@gentoo.org>2011-01-19 13:25:59 +0000
commit9466c3823f8908aa4f5c504728b4280ffcaa5189 (patch)
tree0ee5225da9c2f742ef070a2920fd65722adecb60
parentTrim down 1.6.2 branch by culling vulnerable ebuild for security bug #352059.... (diff)
downloadhistorical-9466c3823f8908aa4f5c504728b4280ffcaa5189.tar.gz
historical-9466c3823f8908aa4f5c504728b4280ffcaa5189.tar.bz2
historical-9466c3823f8908aa4f5c504728b4280ffcaa5189.zip
Parallel compilation fix, 352119
Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64
-rw-r--r--x11-libs/libxdl_view/ChangeLog6
-rw-r--r--x11-libs/libxdl_view/Manifest16
-rw-r--r--x11-libs/libxdl_view/files/4.2-as-needed.patch7
-rw-r--r--x11-libs/libxdl_view/files/4.2-impl-dec.patch2
4 files changed, 23 insertions, 8 deletions
diff --git a/x11-libs/libxdl_view/ChangeLog b/x11-libs/libxdl_view/ChangeLog
index eff5ce2df1c0..90bf6725d2be 100644
--- a/x11-libs/libxdl_view/ChangeLog
+++ b/x11-libs/libxdl_view/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libxdl_view
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/ChangeLog,v 1.4 2011/01/16 10:51:16 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxdl_view/ChangeLog,v 1.5 2011/01/19 13:25:59 jlec Exp $
+
+ 19 Jan 2011; Justin Lecher <jlec@gentoo.org> files/4.2-as-needed.patch,
+ files/4.2-impl-dec.patch:
+ Parallel compilation fix, 352119
16 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
libxdl_view-4.2-r1.ebuild:
diff --git a/x11-libs/libxdl_view/Manifest b/x11-libs/libxdl_view/Manifest
index d4cc883b8bd7..d9269a2f555f 100644
--- a/x11-libs/libxdl_view/Manifest
+++ b/x11-libs/libxdl_view/Manifest
@@ -1,6 +1,16 @@
-AUX 4.2-as-needed.patch 569 RMD160 75164d775e504d2bb9fbb5379d2955108e045fa8 SHA1 0d34799ed70f53061d1e9949441b3441314202a0 SHA256 65139c7caa367e3cb05ec15d70117d0507bcc0676de77daf8aca55e26ac1903e
-AUX 4.2-impl-dec.patch 364 RMD160 440566246312e0392bb80fcfa45bdd2b8107e30e SHA1 14fb1f9b4599a5fc024e8e733bbe94a87ffc8649 SHA256 d9ec6995fc6fb62f2e2e456ba80883b5390a665935e48da388f8695531904f13
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.2-as-needed.patch 602 RMD160 e181d9dce76e0322535464711743a4fcffb49dd4 SHA1 52ce52f2363adec171a253f4a41d0dcbcb5adee9 SHA256 5c9c1af28efd93c52e2596a160ee8ed6afa55df0f27119363cf17b075311ec99
+AUX 4.2-impl-dec.patch 372 RMD160 c76d7b40519ded9d63b7747247c3b99e73e4401a SHA1 d2072ea5e1b140412d51781f68b776a5694699e5 SHA256 6937e8a39031ea92265fec7111de2d695319cdca44f5dbc6a3c737b0dcc950a1
DIST libxdl_view-4.2.tar.gz 857566 RMD160 4be84af2e7cb9190137132cb53c68b8f53f372bc SHA1 f5eac63e2c3a7cc5d8c836d8c880ed8cbb3d0235 SHA256 826adc9c6d6706ffc6f9b52e6f7871e3ebf397837010a75daa971812f162d0b3
EBUILD libxdl_view-4.2-r1.ebuild 743 RMD160 5b6bba6fa21193c601beaaefff0085c87d4f3204 SHA1 7aa837316c96255389eb75b6248121307ad0be4f SHA256 d583c332bd4d7a5ce468a3628c7e5e474fb429ee3ba107774c638394739bc0ac
-MISC ChangeLog 854 RMD160 06644d4dcbd6f0832854592a6c5a95d162f936e8 SHA1 5a4f7233a5764348ca8a88e8067c0184315043e4 SHA256 7b02a32292f4fd50521c0a568dcd141394cdbdd390fe4d333c6a41b2a14656c1
+MISC ChangeLog 986 RMD160 56e26a7f4d6734a68996f3381e06521ca89349c4 SHA1 1f48af4460b05d06d55ffc2e4791758441602637 SHA256 68405224586955a867571b17fc545587629148a8238928df514d242f37f6c5ff
MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk025mwACgkQgAnW8HDreRbL2QCfSRa7QnWgQjhUKGEI7v8Wc7+V
+t+kAnjX7pKWh8mFLi2+CGz8bzJa21u5M
+=g32r
+-----END PGP SIGNATURE-----
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 e45a43c85ba2..6f06d73f9a86 100644
--- a/x11-libs/libxdl_view/files/4.2-as-needed.patch
+++ b/x11-libs/libxdl_view/files/4.2-as-needed.patch
@@ -1,15 +1,16 @@
diff --git a/Makefile.am b/Makefile.am
-index 347bb21..aa41ba3 100644
+index 347bb21..cbb04db 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -19,7 +21,10 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la
+@@ -19,7 +19,11 @@ 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_LIBADD = -lX11 -lXt -lm
+
libxdl_viewextra_la_LDFLAGS = -version-info 0:0:0
-+libxdl_viewextra_la_LIBADD = -lm -L$(srcdir)/.libs -lxdl_view
++libxdl_viewextra_la_DEPENDENCIES = libxdl_view.la
++libxdl_viewextra_la_LIBADD = -lm -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
index 2880719083d7..418143777338 100644
--- a/x11-libs/libxdl_view/files/4.2-impl-dec.patch
+++ b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
@@ -6,7 +6,7 @@ index 347bb21..aa41ba3 100644
## Process this file with automake.
-+CFLAGS += -std=c99
++CFLAGS += -std=c99 -L.libs
+
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 \