summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Holland <robh@gentoo.org>2003-06-04 23:39:06 +0000
committerRob Holland <robh@gentoo.org>2003-06-04 23:39:06 +0000
commita172ef268368b2d68bc875cbd784373106b0fbe1 (patch)
tree5c80617faa8d02fe0485b7d773324dfd82e5545a
parentfixed a diff. Thanks to Georgi Georgiev. closes #16385. (diff)
downloadgentoo-2-a172ef268368b2d68bc875cbd784373106b0fbe1.tar.gz
gentoo-2-a172ef268368b2d68bc875cbd784373106b0fbe1.tar.bz2
gentoo-2-a172ef268368b2d68bc875cbd784373106b0fbe1.zip
fixed a diff. Thanks to Georgi Georgiev. closes #16385.
-rw-r--r--x11-plugins/wmsmixer/ChangeLog6
-rw-r--r--x11-plugins/wmsmixer/Manifest2
-rw-r--r--x11-plugins/wmsmixer/files/makefile.diff21
3 files changed, 16 insertions, 13 deletions
diff --git a/x11-plugins/wmsmixer/ChangeLog b/x11-plugins/wmsmixer/ChangeLog
index ce2bb280ff91..c9a66675c96f 100644
--- a/x11-plugins/wmsmixer/ChangeLog
+++ b/x11-plugins/wmsmixer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/wmsmixer
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.2 2003/02/12 09:43:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.3 2003/06/04 23:38:57 robh Exp $
+
+ 05 Jun 2003; robh <robh@gentoo.org> files/makefile.diff:
+ corrected diff. thanks to: Georgi Georgiev <chutz@chubaka.net>
+ closes #16385.
*wmsmixer-0.5 (04 Oct 2002)
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index f515752b650f..dcb20025caed 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1,5 +1,5 @@
MD5 f583ed0ad62e9cdeaa2e53ae5f46f89c wmsmixer-0.5.ebuild 822
-MD5 7a68679eca4bf202b5bd5569b0e245d5 ChangeLog 565
+MD5 319a4333d92b7d120b5745711c355311 ChangeLog 563
MD5 2a88cef104773c371d0b8d96362d47d5 files/digest-wmsmixer-0.5 63
MD5 4c7cf285cf1f40d571ff7e80783bc3bd files/makefile.diff 750
MD5 2888240d41fcb8a0569feba2cb252dfa files/gcc3.diff 398
diff --git a/x11-plugins/wmsmixer/files/makefile.diff b/x11-plugins/wmsmixer/files/makefile.diff
index c9be8c5f6bc8..cabae38dac92 100644
--- a/x11-plugins/wmsmixer/files/makefile.diff
+++ b/x11-plugins/wmsmixer/files/makefile.diff
@@ -1,21 +1,21 @@
---- Makefile.orig 2002-10-04 10:53:52.000000000 -0500
-+++ Makefile 2002-10-04 11:01:50.000000000 -0500
-@@ -150,12 +150,12 @@
-
+--- Makefile 2003-05-27 03:46:06.000000000 +0900
++++ Makefile.new 2003-05-27 03:48:27.000000000 +0900
+@@ -154,12 +154,12 @@
+ # from top Makefile
BOOTSTRAPCFLAGS =
-- CC = gcc
-+ CC = g++
- AS = as
+- CC = gcc -m32
++ CC = g++ -m32
+ AS = gcc -m32 -c -x assembler
.SUFFIXES: .cc
-- CXX = c++
-+ CXX = g++
+- CXX = c++ -m32
++ CXX = g++ -m32
CXXFILT = c++filt
CXXLIB =
-@@ -887,13 +887,6 @@
+@@ -958,13 +958,6 @@
fi
$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) wmsmixer $(DESTDIR)$(BINDIR)/wmsmixer
@@ -28,4 +28,3 @@
-
cleandir::
$(RM) wmsmixer.$(MANNEWSUFFIX)
-