diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2014-06-11 14:48:38 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2014-06-11 14:48:38 +0000 |
| commit | efeaa57afce709d4f637c33e1ac46990cd2e55a6 (patch) | |
| tree | 37636373a3672568ada2c4c78fac0b79f511df84 | |
| parent | Remove older versions (diff) | |
| download | gentoo-2-efeaa57afce709d4f637c33e1ac46990cd2e55a6.tar.gz gentoo-2-efeaa57afce709d4f637c33e1ac46990cd2e55a6.tar.bz2 gentoo-2-efeaa57afce709d4f637c33e1ac46990cd2e55a6.zip | |
Version bump
(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)
| -rw-r--r-- | media-gfx/fotoxx/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-14.06.1.patch (renamed from media-gfx/fotoxx/files/fotoxx-14.04.patch) | 31 | ||||
| -rw-r--r-- | media-gfx/fotoxx/fotoxx-14.06.1.ebuild (renamed from media-gfx/fotoxx/fotoxx-14.04.ebuild) | 2 |
3 files changed, 27 insertions, 15 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog index 30562c3e1e08..d3e728c97352 100644 --- a/media-gfx/fotoxx/ChangeLog +++ b/media-gfx/fotoxx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/fotoxx # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.62 2014/05/05 11:17:23 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.63 2014/06/11 14:48:37 grozin Exp $ + +*fotoxx-14.06.1 (11 Jun 2014) + + 11 Jun 2014; Andrey Grozin <grozin@gentoo.org> -fotoxx-14.04.ebuild, + +fotoxx-14.06.1.ebuild, -files/fotoxx-14.04.patch, + +files/fotoxx-14.06.1.patch: + Version bump *fotoxx-14.05 (05 May 2014) diff --git a/media-gfx/fotoxx/files/fotoxx-14.04.patch b/media-gfx/fotoxx/files/fotoxx-14.06.1.patch index 1b62ca5ef2cb..b69ef95afd33 100644 --- a/media-gfx/fotoxx/files/fotoxx-14.04.patch +++ b/media-gfx/fotoxx/files/fotoxx-14.06.1.patch @@ -1,12 +1,12 @@ -diff -r -U1 fotoxx-14.04.orig/Makefile fotoxx-14.04/Makefile ---- fotoxx-14.04.orig/Makefile 2014-04-01 13:09:32.000000000 +0700 -+++ fotoxx-14.04/Makefile 2014-04-03 03:13:14.752618591 +0700 +diff -r -U1 fotoxx-14.06.1.orig/Makefile fotoxx-14.06.1/Makefile +--- fotoxx-14.06.1.orig/Makefile 2014-06-06 17:40:42.000000000 +0700 ++++ fotoxx-14.06.1/Makefile 2014-06-12 01:33:21.967129937 +0700 @@ -5,5 +5,4 @@ # defaults for parameters that may be pre-defined --CXXFLAGS ?= -O2 -Wall -ggdb -Wno-deprecated-declarations +-CXXFLAGS ?= -O2 -Wall -ggdb - -LDFLAGS ?= -rdynamic -+CXXFLAGS += -Wall -Wno-deprecated-declarations ++CXXFLAGS += -Wall +LDFLAGS += -rdynamic PREFIX ?= /usr @@ -16,3 +15,3 @@ @@ -14,31 +14,36 @@ diff -r -U1 fotoxx-14.04.orig/Makefile fotoxx-14.04/Makefile -DOCDIR = $(PREFIX)/share/doc/fotoxx +DOCDIR = $(PREFIX)/share/doc/$(PF) MANDIR = $(PREFIX)/share/man/man1 -@@ -20,4 +19,4 @@ +@@ -21,4 +20,4 @@ -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` -LIBS = `pkg-config --libs gtk+-3.0` +CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0` +LIBS = `pkg-config --libs gtk+-3.0` -lpthread -@@ -79,3 +78,2 @@ +@@ -80,3 +79,2 @@ rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz - xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) rm -f $(DESTDIR)$(MENUFILE) -@@ -99,5 +97,2 @@ +@@ -87,2 +85,3 @@ + mkdir -p $(DESTDIR)$(DOCDIR) ++ mkdir -p $(DESTDIR)$(APPDATADIR) + mkdir -p $(DESTDIR)$(MANDIR) +@@ -101,6 +100,2 @@ rm -f fotoxx.1.gz - # menu (desktop) file - cp -f desktop $(DESTDIR)$(MENUFILE) +- # chmod +x $(DESTDIR)$(MENUFILE) - xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE) -@@ -108,3 +103,2 @@ +@@ -111,3 +106,2 @@ rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz - xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) rm -f $(DESTDIR)$(MENUFILE) -diff -r -U1 fotoxx-14.04.orig/zfuncs.cc fotoxx-14.04/zfuncs.cc ---- fotoxx-14.04.orig/zfuncs.cc 2014-04-01 13:09:32.000000000 +0700 -+++ fotoxx-14.04/zfuncs.cc 2014-04-03 03:16:43.485604505 +0700 -@@ -3995,3 +3995,3 @@ +diff -r -U1 fotoxx-14.06.1.orig/zfuncs.cc fotoxx-14.06.1/zfuncs.cc +--- fotoxx-14.06.1.orig/zfuncs.cc 2014-06-06 17:40:42.000000000 +0700 ++++ fotoxx-14.06.1/zfuncs.cc 2014-06-12 01:31:16.672135206 +0700 +@@ -3864,3 +3864,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/$(PF) diff --git a/media-gfx/fotoxx/fotoxx-14.04.ebuild b/media-gfx/fotoxx/fotoxx-14.06.1.ebuild index 1f54bc5f4594..c296bd239ffd 100644 --- a/media-gfx/fotoxx/fotoxx-14.04.ebuild +++ b/media-gfx/fotoxx/fotoxx-14.06.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.04.ebuild,v 1.1 2014/04/02 16:28:07 grozin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.06.1.ebuild,v 1.1 2014/06/11 14:48:37 grozin Exp $ EAPI=4 |