diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2010-10-02 07:58:21 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2010-10-02 07:58:21 +0000 |
| commit | 3d536625be0ed25404ebcdd8c4e3c80c0a338800 (patch) | |
| tree | 99a6cd917e98c200e9201d9aa376a09f2f5269ff /media-gfx/fotoxx | |
| parent | Fix patch to compile with make-3.82 wrt bug 336542. Thanks to Diego for the r... (diff) | |
| download | gentoo-2-3d536625be0ed25404ebcdd8c4e3c80c0a338800.tar.gz gentoo-2-3d536625be0ed25404ebcdd8c4e3c80c0a338800.tar.bz2 gentoo-2-3d536625be0ed25404ebcdd8c4e3c80c0a338800.zip | |
Version bump
(Portage version: 2.2_rc88/cvs/Linux i686)
Diffstat (limited to 'media-gfx/fotoxx')
| -rw-r--r-- | media-gfx/fotoxx/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch (renamed from media-gfx/fotoxx/files/fotoxx-makefile.patch) | 28 | ||||
| -rw-r--r-- | media-gfx/fotoxx/fotoxx-10.10.ebuild (renamed from media-gfx/fotoxx/fotoxx-10.8.4.ebuild) | 4 |
3 files changed, 20 insertions, 21 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index 90ca1c73a2e1..9054e49761a0 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,13 @@ # 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.7 2010/09/14 15:56:53 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.8 2010/10/02 07:58:20 grozin Exp $ + +*fotoxx-10.10 (02 Oct 2010) + + 02 Oct 2010; Andrey Grozin <grozin@gentoo.org> -fotoxx-10.8.4.ebuild, + +fotoxx-10.10.ebuild, +files/fotoxx-10.10-makefile.patch, + -files/fotoxx-makefile.patch: + Version bump *fotoxx-10.9.1 (14 Sep 2010) diff --git a/media-gfx/fotoxx/files/fotoxx-makefile.patch b/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch index ba3124cc8be0..4337f14fcfc2 100644 --- a/media-gfx/fotoxx/files/fotoxx-makefile.patch +++ b/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch @@ -1,14 +1,11 @@ -http://bugs.gentoo.org/329901 and misc fixes - ---- Makefile -+++ Makefile -@@ -5,30 +5,30 @@ - SOURCE = $(PROGRAM)-$(VERSION).cc - +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 +-CXXFLAGS ?= -O3 -g -Wall -LDFLAGS ?= -O3 -g -Wall -rdynamic -+CXXFLAGS += -Wall ++CXXFLAGS += -Wall +LDFLAGS += -rdynamic PREFIX ?= /usr/local @@ -17,27 +14,22 @@ http://bugs.gentoo.org/329901 and misc fixes +CXXFLAGS += -c `pkg-config --cflags gtk+-2.0` +LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` - BINDIR = $(PREFIX)/bin +@@ -16,3 +16,3 @@ DATADIR = $(PREFIX)/share/$(PROGRAM) - ICONDIR = $(DATADIR)/icons - DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop -DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) +DOCDIR = $(PREFIX)/share/doc/$(PF) MANDIR = $(PREFIX)/share/man/man1 - - $(PROGRAM): $(PROGRAM).o zfuncs.o +@@ -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) \ ++ $(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)\"" - - install: $(PROGRAM) diff --git a/media-gfx/fotoxx/fotoxx-10.8.4.ebuild b/media-gfx/fotoxx/fotoxx-10.10.ebuild index ae8e1eb9054e..84a0b8d0af8f 100644 --- a/media-gfx/fotoxx/fotoxx-10.8.4.ebuild +++ b/media-gfx/fotoxx/fotoxx-10.10.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.4.ebuild,v 1.1 2010/08/19 03:31:11 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.10.ebuild,v 1.1 2010/10/02 07:58:20 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() { |