summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2010-09-14 15:56:54 +0000
committerAndrey Grozin <grozin@gentoo.org>2010-09-14 15:56:54 +0000
commit43528db05fe221eab05daa6a55b8a4fd23e5ec66 (patch)
treec2ceb2a61a3a8a8eefb5d929a9601e22cad0ffea /media-gfx/fotoxx
parentAutomated update of use.local.desc (diff)
downloadgentoo-2-43528db05fe221eab05daa6a55b8a4fd23e5ec66.tar.gz
gentoo-2-43528db05fe221eab05daa6a55b8a4fd23e5ec66.tar.bz2
gentoo-2-43528db05fe221eab05daa6a55b8a4fd23e5ec66.zip
Version bump
(Portage version: 2.2_rc80/cvs/Linux i686)
Diffstat (limited to 'media-gfx/fotoxx')
-rw-r--r--media-gfx/fotoxx/ChangeLog8
-rw-r--r--media-gfx/fotoxx/files/fotoxx-10.9.1-makefile.patch35
-rw-r--r--media-gfx/fotoxx/fotoxx-10.9.1.ebuild (renamed from media-gfx/fotoxx/fotoxx-10.8.ebuild)4
3 files changed, 44 insertions, 3 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 741d1a8e3338..90ca1c73a2e1 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/fotoxx
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.6 2010/08/19 03:31:11 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.7 2010/09/14 15:56:53 grozin Exp $
+
+*fotoxx-10.9.1 (14 Sep 2010)
+
+ 14 Sep 2010; Andrey Grozin <grozin@gentoo.org> -fotoxx-10.8.ebuild,
+ +fotoxx-10.9.1.ebuild, +files/fotoxx-10.9.1-makefile.patch:
+ Version bump
*fotoxx-10.8.4 (19 Aug 2010)
diff --git a/media-gfx/fotoxx/files/fotoxx-10.9.1-makefile.patch b/media-gfx/fotoxx/files/fotoxx-10.9.1-makefile.patch
new file mode 100644
index 000000000000..4337f14fcfc2
--- /dev/null
+++ b/media-gfx/fotoxx/files/fotoxx-10.9.1-makefile.patch
@@ -0,0 +1,35 @@
+diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile
+--- fotoxx-10.9.1.orig//Makefile 2010-09-09 18:12:15.000000000 +0700
++++ fotoxx-10.9.1//Makefile 2010-09-15 06:25:29.000000000 +0700
+@@ -7,8 +7,8 @@
+ # defaults for parameters that may be pre-defined
+-CXXFLAGS ?= -O3 -g -Wall
+-LDFLAGS ?= -O3 -g -Wall -rdynamic
++CXXFLAGS += -Wall
++LDFLAGS += -rdynamic
+ PREFIX ?= /usr/local
+
+-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0`
+-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0`
++CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
++LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
+
+@@ -16,3 +16,3 @@
+ DATADIR = $(PREFIX)/share/$(PROGRAM)
+-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
++DOCDIR = $(PREFIX)/share/doc/$(PF)
+ MANDIR = $(PREFIX)/share/man/man1
+@@ -23,6 +23,6 @@
+ @ ./dependencies.sh
+- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
++ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
+
+ $(PROGRAM).o: $(SOURCE)
+- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \
++ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
+@@ -30,3 +30,3 @@
+ zfuncs.o: zfuncs.cc
+- $(CXX) $(CFLAGS) zfuncs.cc \
++ $(CXX) $(CXXFLAGS) zfuncs.cc \
+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
diff --git a/media-gfx/fotoxx/fotoxx-10.8.ebuild b/media-gfx/fotoxx/fotoxx-10.9.1.ebuild
index 64cc185412c0..b701be34013e 100644
--- a/media-gfx/fotoxx/fotoxx-10.8.ebuild
+++ b/media-gfx/fotoxx/fotoxx-10.9.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.8.ebuild,v 1.1 2010/08/03 10:26:31 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.9.1.ebuild,v 1.1 2010/09/14 15:56:53 grozin Exp $
EAPI=3
inherit eutils toolchain-funcs
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}
x11-misc/xdg-utils"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-makefile.patch
+ epatch "${FILESDIR}"/${PF}-makefile.patch
}
src_compile() {