summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2014-05-05 11:17:23 +0000
committerAndrey Grozin <grozin@gentoo.org>2014-05-05 11:17:23 +0000
commit69653a4211db08cf85d1ab3975181c8fe07aec98 (patch)
treecf62c28167d1aff0a739fea055fdddebd19cd3f8 /media-gfx
parentVersion bump (diff)
downloadgentoo-2-69653a4211db08cf85d1ab3975181c8fe07aec98.tar.gz
gentoo-2-69653a4211db08cf85d1ab3975181c8fe07aec98.tar.bz2
gentoo-2-69653a4211db08cf85d1ab3975181c8fe07aec98.zip
Version bump
(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/fotoxx/ChangeLog8
-rw-r--r--media-gfx/fotoxx/files/fotoxx-14.05.patch (renamed from media-gfx/fotoxx/files/fotoxx-14.02.2.patch)30
-rw-r--r--media-gfx/fotoxx/fotoxx-14.05.ebuild (renamed from media-gfx/fotoxx/fotoxx-14.02.2.ebuild)2
3 files changed, 24 insertions, 16 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index fe0749bb5cc8..30562c3e1e08 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,12 @@
# 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.61 2014/04/02 16:28:07 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.62 2014/05/05 11:17:23 grozin Exp $
+
+*fotoxx-14.05 (05 May 2014)
+
+ 05 May 2014; Andrey Grozin <grozin@gentoo.org> -fotoxx-14.02.2.ebuild,
+ +fotoxx-14.05.ebuild, -files/fotoxx-14.02.2.patch, +files/fotoxx-14.05.patch:
+ Version bump
*fotoxx-14.04 (02 Apr 2014)
diff --git a/media-gfx/fotoxx/files/fotoxx-14.02.2.patch b/media-gfx/fotoxx/files/fotoxx-14.05.patch
index c37df02558b5..b202d0e66065 100644
--- a/media-gfx/fotoxx/files/fotoxx-14.02.2.patch
+++ b/media-gfx/fotoxx/files/fotoxx-14.05.patch
@@ -1,43 +1,45 @@
-diff -r -U1 fotoxx-13.08.1.orig/Makefile fotoxx-13.08.1/Makefile
---- fotoxx-13.08.1.orig/Makefile 2013-08-13 15:53:00.000000000 +0700
-+++ fotoxx-13.08.1/Makefile 2013-08-16 04:37:03.009099149 +0700
-@@ -5,4 +5,4 @@
+diff -r -U1 fotoxx-14.05.orig/Makefile fotoxx-14.05/Makefile
+--- fotoxx-14.05.orig/Makefile 2014-05-01 02:17:41.000000000 +0700
++++ fotoxx-14.05/Makefile 2014-05-05 21:46:49.059555103 +0700
+@@ -5,5 +5,4 @@
# defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O2 -Wall -ggdb
+-CXXFLAGS ?= -O2 -Wall -ggdb
+-
-LDFLAGS ?= -rdynamic
+CXXFLAGS += -Wall -Wno-deprecated-declarations
+LDFLAGS += -rdynamic
PREFIX ?= /usr
-@@ -15,3 +15,3 @@
+@@ -16,3 +15,3 @@
LOCALESDIR = $(SHAREDIR)/locales
-DOCDIR = $(PREFIX)/share/doc/fotoxx
+DOCDIR = $(PREFIX)/share/doc/$(PF)
MANDIR = $(PREFIX)/share/man/man1
-@@ -19,4 +19,4 @@
+@@ -20,4 +19,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
-@@ -78,3 +78,2 @@
+@@ -79,3 +78,2 @@
rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
rm -f $(DESTDIR)$(MENUFILE)
-@@ -97,5 +96,2 @@
+@@ -99,6 +97,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)
-@@ -106,3 +102,2 @@
+@@ -109,3 +103,2 @@
rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
rm -f $(DESTDIR)$(MENUFILE)
-diff -r -U1 fotoxx-13.08.1.orig/zfuncs.cc fotoxx-13.08.1/zfuncs.cc
---- fotoxx-13.08.1.orig/zfuncs.cc 2013-08-13 15:53:00.000000000 +0700
-+++ fotoxx-13.08.1/zfuncs.cc 2013-08-16 04:31:58.882119673 +0700
-@@ -3947,3 +3947,3 @@
+diff -r -U1 fotoxx-14.05.orig/zfuncs.cc fotoxx-14.05/zfuncs.cc
+--- fotoxx-14.05.orig/zfuncs.cc 2014-05-01 02:17:41.000000000 +0700
++++ fotoxx-14.05/zfuncs.cc 2014-05-05 21:48:23.160551146 +0700
+@@ -3995,3 +3995,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.02.2.ebuild b/media-gfx/fotoxx/fotoxx-14.05.ebuild
index 35bb6b1969b4..572f7a3c0542 100644
--- a/media-gfx/fotoxx/fotoxx-14.02.2.ebuild
+++ b/media-gfx/fotoxx/fotoxx-14.05.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.02.2.ebuild,v 1.1 2014/02/21 15:28:32 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.05.ebuild,v 1.1 2014/05/05 11:17:23 grozin Exp $
EAPI=4