summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-01-14 16:11:27 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-01-14 16:11:27 +0000
commitf770d14338dcd062ab3d07bec57667a6b0750be4 (patch)
tree6e711865e4be6dd654ad0f5e752ad1464467d10b
parentMarking rdoc-2.4.3-r1 ~ppc for bug 300739 (diff)
downloadgentoo-2-f770d14338dcd062ab3d07bec57667a6b0750be4.tar.gz
gentoo-2-f770d14338dcd062ab3d07bec57667a6b0750be4.tar.bz2
gentoo-2-f770d14338dcd062ab3d07bec57667a6b0750be4.zip
Link to -lX11 even if media-libs/imlib2 is built with USE="-X" wrt #248580, thanks to Diego E. Pettenò for reporting.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
-rw-r--r--x11-misc/wbar/ChangeLog9
-rw-r--r--x11-misc/wbar/files/wbar-1.3.3-Makefile.patch2
2 files changed, 8 insertions, 3 deletions
diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index ff5ed64f0b62..e41705493a51 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/wbar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.4 2008/06/19 11:12:31 drac Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.5 2010/01/14 16:11:26 ssuominen Exp $
+
+ 14 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+ files/wbar-1.3.3-Makefile.patch:
+ Link to -lX11 even if media-libs/imlib2 is built with USE="-X" wrt
+ #248580, thanks to Diego E. Pettenò for reporting.
19 Jun 2008; Samuli Suominen <drac@gentoo.org>
+files/wbar-1.3.3-gcc43.patch, wbar-1.3.3.ebuild:
diff --git a/x11-misc/wbar/files/wbar-1.3.3-Makefile.patch b/x11-misc/wbar/files/wbar-1.3.3-Makefile.patch
index 52e49b282951..c74caa011180 100644
--- a/x11-misc/wbar/files/wbar-1.3.3-Makefile.patch
+++ b/x11-misc/wbar/files/wbar-1.3.3-Makefile.patch
@@ -6,7 +6,7 @@ diff -ur wbar-1.3.3.orig/Makefile wbar-1.3.3/Makefile
-CXXFLAGS=`imlib2-config --cflags` -Wall -O2 #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER
-LDFLAGS=`imlib2-config --libs` -Wl,-O2
+CXXFLAGS+=`imlib2-config --cflags` -Wall #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER
-+LIBS=`imlib2-config --libs`
++LIBS=`imlib2-config --libs` -lX11
PREFIX=/usr/share/wbar