Gentoo Archives: gentoo-commits

From: "Andrey Grozin (grozin)" <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/fotoxx/files: fotoxx-13.06.patch
Date: Wed, 05 Jun 2013 14:32:19
Message-Id: 20130605143215.C81AF2171E@flycatcher.gentoo.org
1 grozin 13/06/05 14:32:15
2
3 Added: fotoxx-13.06.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.2.0_alpha177/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)
8
9 Revision Changes Path
10 1.1 media-gfx/fotoxx/files/fotoxx-13.06.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-13.06.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-13.06.patch?rev=1.1&content-type=text/plain
14
15 Index: fotoxx-13.06.patch
16 ===================================================================
17 diff -r -U1 fotoxx-13.03.orig/Makefile fotoxx-13.03/Makefile
18 --- fotoxx-13.03.orig/Makefile 2013-03-01 13:33:56.000000000 +0700
19 +++ fotoxx-13.03/Makefile 2013-03-22 12:47:39.000000000 +0700
20 @@ -5,4 +5,4 @@
21 # defaults for parameters that may be pre-defined
22 -CXXFLAGS ?= -O3 -g -Wall
23 -LDFLAGS ?= -O3 -g -Wall -rdynamic
24 +CXXFLAGS += -Wall -Wno-deprecated-declarations
25 +LDFLAGS += -rdynamic
26 PREFIX ?= /usr
27 @@ -15,3 +15,3 @@
28 LOCALESDIR = $(SHAREDIR)/locales
29 -DOCDIR = $(PREFIX)/share/doc/fotoxx
30 +DOCDIR = $(PREFIX)/share/doc/$(PF)
31 MANDIR = $(PREFIX)/share/man/man1
32 @@ -19,4 +19,4 @@
33
34 -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
35 -LIBS = `pkg-config --libs gtk+-3.0`
36 +CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
37 +LIBS = `pkg-config --libs gtk+-3.0` -lpthread
38
39 @@ -84,5 +84,2 @@
40 rm -f fotoxx.1.gz
41 - # menu (desktop) file
42 - cp -f desktop $(DESTDIR)$(MENUFILE)
43 - xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
44
45 @@ -93,3 +90,2 @@
46 rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
47 - xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
48 rm -f $(DESTDIR)$(MENUFILE)
49 diff -r -U1 fotoxx-13.03.orig/zfuncs.cc fotoxx-13.03/zfuncs.cc
50 --- fotoxx-13.03.orig/zfuncs.cc 2013-03-01 13:33:56.000000000 +0700
51 +++ fotoxx-13.03/zfuncs.cc 2013-03-22 12:46:16.000000000 +0700
52 @@ -3917,3 +3917,3 @@
53 strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales
54 - strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname
55 + strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/$(PF)