summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2010-08-11 12:54:39 +0000
committerJim Ramsay <lack@gentoo.org>2010-08-11 12:54:39 +0000
commit651b4b5b42cafc5e06db9dfecdda1f377c97fad4 (patch)
treeb1661964926eeb7939d76c7ae55457679154e3af /x11-plugins/gkrellmss
parentPatch to respect LDFLAGS (Bug #331809) (diff)
downloadgentoo-2-651b4b5b42cafc5e06db9dfecdda1f377c97fad4.tar.gz
gentoo-2-651b4b5b42cafc5e06db9dfecdda1f377c97fad4.tar.bz2
gentoo-2-651b4b5b42cafc5e06db9dfecdda1f377c97fad4.zip
Patchfile cleanup
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins/gkrellmss')
-rw-r--r--x11-plugins/gkrellmss/ChangeLog6
-rw-r--r--x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch4
-rw-r--r--x11-plugins/gkrellmss/files/gkrellmss-patch-2.3.diff22
3 files changed, 7 insertions, 25 deletions
diff --git a/x11-plugins/gkrellmss/ChangeLog b/x11-plugins/gkrellmss/ChangeLog
index e3be60ff1d3b..fc2a081bf53a 100644
--- a/x11-plugins/gkrellmss/ChangeLog
+++ b/x11-plugins/gkrellmss/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/gkrellmss
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/ChangeLog,v 1.33 2010/08/11 12:45:34 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellmss/ChangeLog,v 1.34 2010/08/11 12:54:39 lack Exp $
+
+ 11 Aug 2010; Jim Ramsay <lack@gentoo.org> -files/gkrellmss-patch-2.3.diff,
+ files/gkrellmss-2.6-Respect-LDFLAGS.patch:
+ Patchfile cleanup
*gkrellmss-2.6-r2 (11 Aug 2010)
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
index dbb034435ecb..59f1d0a200f9 100644
--- a/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
+++ b/x11-plugins/gkrellmss/files/gkrellmss-2.6-Respect-LDFLAGS.patch
@@ -1,5 +1,5 @@
-From e33eeeec5d922b79f18e0c39a7f80ef3c44ccc7e Mon Sep 17 00:00:00 2001
-From: Jim Ramsay <jim.ramsay@motorola.com>
+From 88d25e2e4fe3edbb832d0bb2b44cd705b060360a Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <lack@gentoo.org>
Date: Wed, 11 Aug 2010 08:37:20 -0400
Subject: [PATCH] Respect LDFLAGS
diff --git a/x11-plugins/gkrellmss/files/gkrellmss-patch-2.3.diff b/x11-plugins/gkrellmss/files/gkrellmss-patch-2.3.diff
deleted file mode 100644
index 3115c1e31f86..000000000000
--- a/x11-plugins/gkrellmss/files/gkrellmss-patch-2.3.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.orig 2002-10-26 20:48:59.000000000 -0700
-+++ src/Makefile 2003-01-10 19:24:22.000000000 -0700
-@@ -16,7 +16,7 @@
-
- FFTW_LIB_DIR ?=
-
--FFTW_LIB = $(FFTW_LIB_DIR) -lrfftw -lfftw
-+FFTW_LIB = $(FFTW_LIB_DIR) -ldrfftw -ldfftw
-
- FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
- LIBS = $(GTK_LIB) $(SD_LIB) $(FFTW_LIB) -lm
---- src/gkrellmss.h.orig 2002-11-25 12:44:25.000000000 -0700
-+++ src/gkrellmss.h 2003-01-10 19:23:35.000000000 -0700
-@@ -22,7 +22,7 @@
-
- #include <gkrellm2/gkrellm.h>
- #include <math.h>
--#include <rfftw.h>
-+#include <drfftw.h>
-
-
- #if !defined(GKRELLM_VERSION_MAJOR) || (GKRELLM_VERSION_MAJOR<2)