diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2012-03-02 21:26:14 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2012-03-02 21:26:14 +0000 |
| commit | d0b82998dd746440659dedd7a7c29e90c24006a1 (patch) | |
| tree | d03626cbe0ee450735efb8ee162feb68b4d36b4e /media-gfx | |
| parent | Marking traceroute-2.0.18 ppc64 for bug 400431 (diff) | |
| download | gentoo-2-d0b82998dd746440659dedd7a7c29e90c24006a1.tar.gz gentoo-2-d0b82998dd746440659dedd7a7c29e90c24006a1.tar.bz2 gentoo-2-d0b82998dd746440659dedd7a7c29e90c24006a1.zip | |
Version bump
(Portage version: 2.2.0_alpha89/cvs/Linux i686)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/fotoxx/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-12.03.patch (renamed from media-gfx/fotoxx/files/fotoxx-12.01.2.patch) | 28 | ||||
| -rw-r--r-- | media-gfx/fotoxx/fotoxx-12.03.ebuild (renamed from media-gfx/fotoxx/fotoxx-12.01.2.ebuild) | 4 |
3 files changed, 23 insertions, 17 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index 6a26f3a343e9..516f1f3da74c 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/fotoxx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.28 2012/02/04 15:06:14 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.29 2012/03/02 21:26:14 grozin Exp $ + +*fotoxx-12.03 (02 Mar 2012) + + 02 Mar 2012; Andrey Grozin <grozin@gentoo.org> -fotoxx-12.01.2.ebuild, + -files/fotoxx-12.01.2.patch, +fotoxx-12.03.ebuild, +files/fotoxx-12.03.patch: + Version bump *fotoxx-12.02 (04 Feb 2012) diff --git a/media-gfx/fotoxx/files/fotoxx-12.01.2.patch b/media-gfx/fotoxx/files/fotoxx-12.03.patch index 163173bdd0b6..d1ce6b3261fd 100644 --- a/media-gfx/fotoxx/files/fotoxx-12.01.2.patch +++ b/media-gfx/fotoxx/files/fotoxx-12.03.patch @@ -1,11 +1,11 @@ -diff -r -U1 fotoxx-11.12.1.orig/Makefile fotoxx-11.12.1/Makefile ---- fotoxx-11.12.1.orig/Makefile 2011-12-02 21:10:01.000000000 +0700 -+++ fotoxx-11.12.1/Makefile 2011-12-04 15:26:12.000000000 +0700 +diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile +--- fotoxx-12.03.orig/Makefile 2012-03-01 01:57:48.000000000 +0700 ++++ fotoxx-12.03/Makefile 2012-03-03 03:56:44.000000000 +0700 @@ -5,4 +5,4 @@ # defaults for parameters that may be pre-defined --CXXFLAGS ?= -O3 -g -Wall +-CXXFLAGS ?= -O3 -g -Wall -Wno-deprecated-declarations -LDFLAGS ?= -O3 -g -Wall -rdynamic -+CXXFLAGS += -Wall ++CXXFLAGS += -Wall -Wno-deprecated-declarations +LDFLAGS += -rdynamic PREFIX ?= /usr @@ -14,3 +14,3 @@ @@ -15,20 +15,20 @@ diff -r -U1 fotoxx-11.12.1.orig/Makefile fotoxx-11.12.1/Makefile MANDIR = $(PREFIX)/share/man/man1 @@ -18,3 +18,3 @@ --CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` -+CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-2.0` - LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` -@@ -75,5 +75,2 @@ +-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` ++CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0` + LIBS = `pkg-config --libs gtk+-3.0` +@@ -77,5 +77,2 @@ rm -f fotoxx.1.gz - # menu (desktop) file - cp -f desktop $(DESTDIR)$(MENUFILE) - xdg-desktop-menu install $(DESTDIR)$(MENUFILE) -diff -r -U1 fotoxx-11.12.1.orig/zfuncs.cc fotoxx-11.12.1/zfuncs.cc ---- fotoxx-11.12.1.orig/zfuncs.cc 2011-12-02 21:10:01.000000000 +0700 -+++ fotoxx-11.12.1/zfuncs.cc 2011-12-04 15:28:27.000000000 +0700 -@@ -3123,3 +3123,3 @@ +diff -r -U1 fotoxx-12.03.orig/zfuncs.cc fotoxx-12.03/zfuncs.cc +--- fotoxx-12.03.orig/zfuncs.cc 2012-03-01 01:57:48.000000000 +0700 ++++ fotoxx-12.03/zfuncs.cc 2012-03-03 03:58:13.000000000 +0700 +@@ -3194,3 +3194,3 @@ strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales - strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname -+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/appname ++ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/${PF} diff --git a/media-gfx/fotoxx/fotoxx-12.01.2.ebuild b/media-gfx/fotoxx/fotoxx-12.03.ebuild index 3a53603ac94a..7743ca5bd8f4 100644 --- a/media-gfx/fotoxx/fotoxx-12.01.2.ebuild +++ b/media-gfx/fotoxx/fotoxx-12.03.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.01.2.ebuild,v 1.1 2012/01/06 10:45:28 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-12.03.ebuild,v 1.1 2012/03/02 21:26:14 grozin Exp $ EAPI=3 inherit eutils toolchain-funcs @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="x11-libs/gtk+:2 +DEPEND="x11-libs/gtk+:3 media-libs/tiff" RDEPEND="${DEPEND} media-libs/exiftool |