1 |
ssuominen 10/05/11 06:58:51 |
2 |
|
3 |
Modified: ChangeLog slim-1.3.1_p20091114.ebuild |
4 |
Log: |
5 |
Use pkg-config to find libpng wrt #319065 by Rafael G. Martins. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.49 x11-misc/slim/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.49&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.49&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.48&r2=1.49 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v |
18 |
retrieving revision 1.48 |
19 |
retrieving revision 1.49 |
20 |
diff -u -r1.48 -r1.49 |
21 |
--- ChangeLog 10 May 2010 12:43:34 -0000 1.48 |
22 |
+++ ChangeLog 11 May 2010 06:58:51 -0000 1.49 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for x11-misc/slim |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.48 2010/05/10 12:43:34 ssuominen Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.49 2010/05/11 06:58:51 ssuominen Exp $ |
28 |
+ |
29 |
+ 11 May 2010; Samuli Suominen <ssuominen@g.o> |
30 |
+ slim-1.3.1_p20091114.ebuild: |
31 |
+ Use pkg-config to find libpng wrt #319065 by Rafael G. Martins. |
32 |
|
33 |
10 May 2010; Samuli Suominen <ssuominen@g.o> |
34 |
slim-1.3.1_p20091114.ebuild: |
35 |
|
36 |
|
37 |
|
38 |
1.8 x11-misc/slim/slim-1.3.1_p20091114.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild?rev=1.8&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild?rev=1.8&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild?r1=1.7&r2=1.8 |
43 |
|
44 |
Index: slim-1.3.1_p20091114.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v |
47 |
retrieving revision 1.7 |
48 |
retrieving revision 1.8 |
49 |
diff -u -r1.7 -r1.8 |
50 |
--- slim-1.3.1_p20091114.ebuild 10 May 2010 12:43:34 -0000 1.7 |
51 |
+++ slim-1.3.1_p20091114.ebuild 11 May 2010 06:58:51 -0000 1.8 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.7 2010/05/10 12:43:34 ssuominen Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.1_p20091114.ebuild,v 1.8 2010/05/11 06:58:51 ssuominen Exp $ |
57 |
|
58 |
EAPI=2 |
59 |
|
60 |
@@ -24,6 +24,7 @@ |
61 |
media-libs/jpeg |
62 |
pam? ( virtual/pam )" |
63 |
RDEPEND="${DEPEND} |
64 |
+ dev-util/pkgconfig |
65 |
x11-apps/sessreg |
66 |
screenshot? ( media-gfx/imagemagick ) |
67 |
branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" |
68 |
@@ -35,7 +36,8 @@ |
69 |
-e "s:^CC=.*:CC=$(tc-getCC) ${CFLAGS}:" \ |
70 |
-e "s:^MANDIR=.*:MANDIR=/usr/share/man:" \ |
71 |
-e "s:^\t\(.*\)\ \$(LDFLAGS)\ \(.*\):\t\1\ \2\ \$(LDFLAGS):g" \ |
72 |
- -e "s:lpng12:lpng:" \ |
73 |
+ -e "s:-I/usr/include/libpng12:$(pkg-config --cflags-only-I libpng):" \ |
74 |
+ -e "s:-lpng12:$(pkg-config --libs-only-l libpng):" \ |
75 |
-r -e "s:^LDFLAGS=(.*):LDFLAGS=\1 ${LDFLAGS}:" \ |
76 |
Makefile || die "sed failed in Makefile" |
77 |
epatch "${FILESDIR}/${PN}-1.3.1-config.diff" |