summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2014-08-03 08:04:02 +0000
committerAndrey Grozin <grozin@gentoo.org>2014-08-03 08:04:02 +0000
commit6e0b4d1ef7d5500b2bd623bdd660600a9dc48d71 (patch)
treed46da67afad7250462e967edad4c519cd0cdcd3b /media-gfx/fotoxx
parentRemove old (diff)
downloadgentoo-2-6e0b4d1ef7d5500b2bd623bdd660600a9dc48d71.tar.gz
gentoo-2-6e0b4d1ef7d5500b2bd623bdd660600a9dc48d71.tar.bz2
gentoo-2-6e0b4d1ef7d5500b2bd623bdd660600a9dc48d71.zip
Version bump
(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)
Diffstat (limited to 'media-gfx/fotoxx')
-rw-r--r--media-gfx/fotoxx/ChangeLog8
-rw-r--r--media-gfx/fotoxx/files/fotoxx-14.08.patch (renamed from media-gfx/fotoxx/files/fotoxx-14.05.patch)34
-rw-r--r--media-gfx/fotoxx/fotoxx-14.08.ebuild (renamed from media-gfx/fotoxx/fotoxx-14.05.ebuild)2
3 files changed, 27 insertions, 17 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index d3e728c97352..81c748d92443 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.63 2014/06/11 14:48:37 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.64 2014/08/03 08:04:02 grozin Exp $
+
+*fotoxx-14.08 (03 Aug 2014)
+
+ 03 Aug 2014; Andrey Grozin <grozin@gentoo.org> -fotoxx-14.05.ebuild,
+ +fotoxx-14.08.ebuild, -files/fotoxx-14.05.patch, +files/fotoxx-14.08.patch:
+ Version bump
*fotoxx-14.06.1 (11 Jun 2014)
diff --git a/media-gfx/fotoxx/files/fotoxx-14.05.patch b/media-gfx/fotoxx/files/fotoxx-14.08.patch
index b202d0e66065..820ef1834ecd 100644
--- a/media-gfx/fotoxx/files/fotoxx-14.05.patch
+++ b/media-gfx/fotoxx/files/fotoxx-14.08.patch
@@ -1,12 +1,12 @@
-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
+diff -r -U1 fotoxx-14.08.orig/Makefile fotoxx-14.08/Makefile
+--- fotoxx-14.08.orig/Makefile 2014-08-01 18:26:48.000000000 +0700
++++ fotoxx-14.08/Makefile 2014-08-03 16:11:40.201653715 +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
++CXXFLAGS += -Wall
+LDFLAGS += -rdynamic
PREFIX ?= /usr
@@ -16,3 +15,3 @@
@@ -14,32 +14,36 @@ diff -r -U1 fotoxx-14.05.orig/Makefile fotoxx-14.05/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`
+-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 @@
+@@ -73,3 +72,2 @@
rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
rm -f $(DESTDIR)$(MENUFILE)
-@@ -99,6 +97,2 @@
+@@ -80,2 +78,3 @@
+ mkdir -p $(DESTDIR)$(DOCDIR)
++ mkdir -p $(DESTDIR)$(APPDATADIR)
+ mkdir -p $(DESTDIR)$(MANDIR)
+@@ -94,6 +93,2 @@
rm -f fotoxx.1.gz
- # menu (desktop) file
- cp -f desktop $(DESTDIR)$(MENUFILE)
-- chmod +x $(DESTDIR)$(MENUFILE)
+- # chmod +x $(DESTDIR)$(MENUFILE)
- xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE)
-@@ -109,3 +103,2 @@
+@@ -104,3 +99,2 @@
rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
rm -f $(DESTDIR)$(MENUFILE)
-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 @@
+diff -r -U1 fotoxx-14.08.orig/zfuncs.cc fotoxx-14.08/zfuncs.cc
+--- fotoxx-14.08.orig/zfuncs.cc 2014-08-01 18:26:48.000000000 +0700
++++ fotoxx-14.08/zfuncs.cc 2014-08-03 16:13:01.706650287 +0700
+@@ -3973,3 +3973,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.05.ebuild b/media-gfx/fotoxx/fotoxx-14.08.ebuild
index 572f7a3c0542..b1ffd26cf8f8 100644
--- a/media-gfx/fotoxx/fotoxx-14.05.ebuild
+++ b/media-gfx/fotoxx/fotoxx-14.08.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.05.ebuild,v 1.1 2014/05/05 11:17:23 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-14.08.ebuild,v 1.1 2014/08/03 08:04:02 grozin Exp $
EAPI=4