diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2011-03-03 11:18:49 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2011-03-03 11:18:49 +0000 |
| commit | e38521c356fd5d6c69fe08009bffec1d99b156d9 (patch) | |
| tree | 154f2e37bf8dea0af4d6bd3ec243089e7d04f826 /media-gfx | |
| parent | Version bump for beta channel release. Remove old. (diff) | |
| download | gentoo-2-e38521c356fd5d6c69fe08009bffec1d99b156d9.tar.gz gentoo-2-e38521c356fd5d6c69fe08009bffec1d99b156d9.tar.bz2 gentoo-2-e38521c356fd5d6c69fe08009bffec1d99b156d9.zip | |
Version bump
(Portage version: 2.2.0_alpha25/cvs/Linux i686)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/fotoxx/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.03-makefile.patch (renamed from media-gfx/fotoxx/files/fotoxx-11.01-makefile.patch) | 31 | ||||
| -rw-r--r-- | media-gfx/fotoxx/fotoxx-11.03.ebuild (renamed from media-gfx/fotoxx/fotoxx-11.01.ebuild) | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index b2c7679a8988..0d81f9b5ba25 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/fotoxx # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.13 2011/02/09 18:16:41 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.14 2011/03/03 11:18:49 grozin Exp $ + +*fotoxx-11.03 (03 Mar 2011) + + 03 Mar 2011; Andrey Grozin <grozin@gentoo.org> -fotoxx-11.01.ebuild, + -files/fotoxx-11.01-makefile.patch, +fotoxx-11.03.ebuild, + +files/fotoxx-11.03-makefile.patch: + Version bump *fotoxx-11.02 (09 Feb 2011) diff --git a/media-gfx/fotoxx/files/fotoxx-11.01-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.03-makefile.patch index 8da631a7ad0d..1053d4a3b7b1 100644 --- a/media-gfx/fotoxx/files/fotoxx-11.01-makefile.patch +++ b/media-gfx/fotoxx/files/fotoxx-11.03-makefile.patch @@ -1,9 +1,7 @@ -Только в fotoxx-11.01.orig/: .pc -diff -r -U2 fotoxx-11.01.orig//Makefile fotoxx-11.01//Makefile ---- fotoxx-11.01.orig//Makefile 2011-01-01 19:10:53.000000000 +0600 -+++ fotoxx-11.01//Makefile 2011-01-04 20:56:03.000000000 +0600 -@@ -6,14 +6,14 @@ - +diff -r -U1 fotoxx-11.02.orig/Makefile fotoxx-11.02/Makefile +--- fotoxx-11.02.orig/Makefile 2011-02-01 16:16:20.000000000 +0600 ++++ fotoxx-11.02/Makefile 2011-02-10 00:09:50.000000000 +0600 +@@ -7,8 +7,8 @@ # defaults for parameters that may be pre-defined -CXXFLAGS ?= -O3 -g -Wall -LDFLAGS ?= -O3 -g -Wall -rdynamic @@ -16,28 +14,23 @@ diff -r -U2 fotoxx-11.01.orig//Makefile fotoxx-11.01//Makefile +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) -DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) +DOCDIR = $(PREFIX)/share/doc/$(PF) MANDIR = $(PREFIX)/share/man/man1 - ICONDIR = $(DATADIR)/icons -@@ -21,15 +21,14 @@ - +@@ -22,3 +22,3 @@ $(PROGRAM): $(PROGRAM).o zfuncs.o -- $(CXX) $(LFLAGS) -ltiff \ -- -o $(PROGRAM) $(PROGRAM).o zfuncs.o +- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o + $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS) @ ./dependencies.sh - +@@ -26,3 +26,3 @@ $(PROGRAM).o: $(SOURCE) - $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ + $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \ - -D "DATADIR=\"$(DATADIR)\"" \ - -D "DOCDIR=\"$(DOCDIR)\"" - + -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)\"" \ ++ $(CXX) $(CXXFLAGS) zfuncs.cc \ + -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" diff --git a/media-gfx/fotoxx/fotoxx-11.01.ebuild b/media-gfx/fotoxx/fotoxx-11.03.ebuild index 84eeb9f33963..b560ff6c6730 100644 --- a/media-gfx/fotoxx/fotoxx-11.01.ebuild +++ b/media-gfx/fotoxx/fotoxx-11.03.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.01.ebuild,v 1.1 2011/01/04 07:18:31 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.03.ebuild,v 1.1 2011/03/03 11:18:49 grozin Exp $ EAPI=3 inherit eutils toolchain-funcs |