diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2010-11-10 05:45:45 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2010-11-10 05:45:45 +0000 |
| commit | 5f5a7d428f0b35a774ee560150865b5d416bc1fd (patch) | |
| tree | d22a76f2374413dcab8065572636ec691ee5ffaa /media-gfx/fotoxx | |
| parent | Added patch for gcc-4.5 build issue, bug #329083, thank David Carlos Manuelda... (diff) | |
| download | gentoo-2-5f5a7d428f0b35a774ee560150865b5d416bc1fd.tar.gz gentoo-2-5f5a7d428f0b35a774ee560150865b5d416bc1fd.tar.bz2 gentoo-2-5f5a7d428f0b35a774ee560150865b5d416bc1fd.zip | |
Version bump
(Portage version: 2.2.0_alpha4/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.11.2-makefile.patch (renamed from media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch) | 22 | ||||
| -rw-r--r-- | media-gfx/fotoxx/fotoxx-10.11.2.ebuild (renamed from media-gfx/fotoxx/fotoxx-10.10.ebuild) | 2 |
3 files changed, 24 insertions, 9 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index 9c997c5968d9..1ff7c3ee7864 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.9 2010/10/15 12:40:08 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.10 2010/11/10 05:45:45 grozin Exp $ + +*fotoxx-10.11.2 (10 Nov 2010) + + 10 Nov 2010; Andrey Grozin <grozin@gentoo.org> -fotoxx-10.10.ebuild, + -files/fotoxx-10.10-makefile.patch, +fotoxx-10.11.2.ebuild, + +files/fotoxx-10.11.2-makefile.patch: + Version bump *fotoxx-10.10.2 (15 Oct 2010) diff --git a/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch b/media-gfx/fotoxx/files/fotoxx-10.11.2-makefile.patch index 4337f14fcfc2..464cfed9cf71 100644 --- a/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch +++ b/media-gfx/fotoxx/files/fotoxx-10.11.2-makefile.patch @@ -1,7 +1,10 @@ -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 @@ +Index: fotoxx-10.11.2/Makefile +=================================================================== +--- fotoxx-10.11.2.orig/Makefile ++++ fotoxx-10.11.2/Makefile +@@ -5,30 +5,30 @@ VERSION = 10.11.2 + SOURCE = $(PROGRAM)-$(VERSION).cc + # defaults for parameters that may be pre-defined -CXXFLAGS ?= -O3 -g -Wall -LDFLAGS ?= -O3 -g -Wall -rdynamic @@ -14,12 +17,15 @@ diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile +CXXFLAGS += -c `pkg-config --cflags gtk+-2.0` +LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` -@@ -16,3 +16,3 @@ + BINDIR = $(PREFIX)/bin DATADIR = $(PREFIX)/share/$(PROGRAM) -DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) +DOCDIR = $(PREFIX)/share/doc/$(PF) MANDIR = $(PREFIX)/share/man/man1 -@@ -23,6 +23,6 @@ + ICONDIR = $(DATADIR)/icons + DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop + + $(PROGRAM): $(PROGRAM).o zfuncs.o @ ./dependencies.sh - $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o + $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS) @@ -28,8 +34,10 @@ diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile - $(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)\"" + + install: $(PROGRAM) diff --git a/media-gfx/fotoxx/fotoxx-10.10.ebuild b/media-gfx/fotoxx/fotoxx-10.11.2.ebuild index 84a0b8d0af8f..2bb3fe400430 100644 --- a/media-gfx/fotoxx/fotoxx-10.10.ebuild +++ b/media-gfx/fotoxx/fotoxx-10.11.2.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.10.ebuild,v 1.1 2010/10/02 07:58:20 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.11.2.ebuild,v 1.1 2010/11/10 05:45:45 grozin Exp $ EAPI=3 inherit eutils toolchain-funcs |