summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2011-11-06 09:20:22 +0000
committerAndrey Grozin <grozin@gentoo.org>2011-11-06 09:20:22 +0000
commite07417841d7f6755f32fdbce10ea7b0821a865a3 (patch)
treebf7ca1b729aa89f44a1811a80841aece3f2bffd6 /media-gfx
parentFix maintainer email (diff)
downloadgentoo-2-e07417841d7f6755f32fdbce10ea7b0821a865a3.tar.gz
gentoo-2-e07417841d7f6755f32fdbce10ea7b0821a865a3.tar.bz2
gentoo-2-e07417841d7f6755f32fdbce10ea7b0821a865a3.zip
Version bump
(Portage version: 2.2.0_alpha72/cvs/Linux i686)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/fotoxx/ChangeLog9
-rw-r--r--media-gfx/fotoxx/files/fotoxx-11.11.1.patch (renamed from media-gfx/fotoxx/files/fotoxx-11.09.patch)26
-rw-r--r--media-gfx/fotoxx/fotoxx-11.11.1.ebuild (renamed from media-gfx/fotoxx/fotoxx-11.09.ebuild)2
3 files changed, 21 insertions, 16 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index a88463408bc7..788ea40a927d 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.23 2011/10/12 04:50:19 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.24 2011/11/06 09:20:22 grozin Exp $
+
+*fotoxx-11.11.1 (06 Nov 2011)
+
+ 06 Nov 2011; Andrey Grozin <grozin@gentoo.org> -fotoxx-11.09.ebuild,
+ -files/fotoxx-11.09.patch, +fotoxx-11.11.1.ebuild,
+ +files/fotoxx-11.11.1.patch:
+ Version bump
*fotoxx-11.10 (12 Oct 2011)
diff --git a/media-gfx/fotoxx/files/fotoxx-11.09.patch b/media-gfx/fotoxx/files/fotoxx-11.11.1.patch
index 325910bdce57..b58706807488 100644
--- a/media-gfx/fotoxx/files/fotoxx-11.09.patch
+++ b/media-gfx/fotoxx/files/fotoxx-11.11.1.patch
@@ -1,6 +1,6 @@
-diff -r -U1 fotoxx-11.09.orig/Makefile fotoxx-11.09/Makefile
---- fotoxx-11.09.orig/Makefile 2011-09-05 05:32:59.000000000 +0700
-+++ fotoxx-11.09/Makefile 2011-09-22 18:20:29.000000000 +0700
+diff -U1 -r fotoxx-11.11.1.orig/Makefile fotoxx-11.11.1/Makefile
+--- fotoxx-11.11.1.orig/Makefile 2011-11-05 12:30:36.000000000 +0700
++++ fotoxx-11.11.1/Makefile 2011-11-06 16:06:23.000000000 +0700
@@ -5,4 +5,4 @@
# defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O3 -g -Wall
@@ -8,28 +8,26 @@ diff -r -U1 fotoxx-11.09.orig/Makefile fotoxx-11.09/Makefile
+CXXFLAGS += -Wall
+LDFLAGS += -rdynamic
PREFIX ?= /usr
-@@ -15,3 +15,3 @@
+@@ -14,3 +14,3 @@
LOCALESDIR = $(SHAREDIR)/locales
-DOCDIR = $(PREFIX)/share/doc/fotoxx
+DOCDIR = $(PREFIX)/share/doc/$(PF)
MANDIR = $(PREFIX)/share/man/man1
-@@ -19,3 +19,3 @@
+@@ -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`
-@@ -71,7 +71,2 @@
+@@ -73,5 +73,2 @@
rm -f fotoxx.1.gz
-- # menu (desktop) file (absolute paths to get around rpmbuild problem)
-- cp -f data/desktop $(DESTDIR)$(MENUFILE)
-- echo Exec=/usr/bin/fotoxx >> $(DESTDIR)$(MENUFILE)
-- echo Icon=/usr/share/fotoxx/icons/fotoxx.png >> $(DESTDIR)$(MENUFILE)
+- # menu (desktop) file
+- cp -f desktop $(DESTDIR)$(MENUFILE)
- xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
-diff -r -U1 fotoxx-11.09.orig/zfuncs.cc fotoxx-11.09/zfuncs.cc
---- fotoxx-11.09.orig/zfuncs.cc 2011-09-05 05:32:59.000000000 +0700
-+++ fotoxx-11.09/zfuncs.cc 2011-09-22 18:14:46.000000000 +0700
-@@ -3066,3 +3066,3 @@
+diff -U1 -r fotoxx-11.11.1.orig/zfuncs.cc fotoxx-11.11.1/zfuncs.cc
+--- fotoxx-11.11.1.orig/zfuncs.cc 2011-11-05 12:30:36.000000000 +0700
++++ fotoxx-11.11.1/zfuncs.cc 2011-11-06 16:08:26.000000000 +0700
+@@ -3119,3 +3119,3 @@
strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /installoc/share/appname/locales
- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /installoc/share/doc/appname
+ strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /installoc/share/doc/appname
diff --git a/media-gfx/fotoxx/fotoxx-11.09.ebuild b/media-gfx/fotoxx/fotoxx-11.11.1.ebuild
index a3fa44082662..a6dad33892f0 100644
--- a/media-gfx/fotoxx/fotoxx-11.09.ebuild
+++ b/media-gfx/fotoxx/fotoxx-11.11.1.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.09.ebuild,v 1.1 2011/09/22 11:31:17 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-11.11.1.ebuild,v 1.1 2011/11/06 09:20:22 grozin Exp $
EAPI=3
inherit eutils toolchain-funcs