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-14.05.patch fotoxx-14.02.2.patch
Date: Mon, 05 May 2014 11:17:28
Message-Id: 20140505111723.4E5D02004C@flycatcher.gentoo.org
1 grozin 14/05/05 11:17:23
2
3 Added: fotoxx-14.05.patch
4 Removed: fotoxx-14.02.2.patch
5 Log:
6 Version bump
7
8 (Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)
9
10 Revision Changes Path
11 1.1 media-gfx/fotoxx/files/fotoxx-14.05.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-14.05.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-14.05.patch?rev=1.1&content-type=text/plain
15
16 Index: fotoxx-14.05.patch
17 ===================================================================
18 diff -r -U1 fotoxx-14.05.orig/Makefile fotoxx-14.05/Makefile
19 --- fotoxx-14.05.orig/Makefile 2014-05-01 02:17:41.000000000 +0700
20 +++ fotoxx-14.05/Makefile 2014-05-05 21:46:49.059555103 +0700
21 @@ -5,5 +5,4 @@
22 # defaults for parameters that may be pre-defined
23 -CXXFLAGS ?= -O2 -Wall -ggdb
24 -
25 -LDFLAGS ?= -rdynamic
26 +CXXFLAGS += -Wall -Wno-deprecated-declarations
27 +LDFLAGS += -rdynamic
28 PREFIX ?= /usr
29 @@ -16,3 +15,3 @@
30 LOCALESDIR = $(SHAREDIR)/locales
31 -DOCDIR = $(PREFIX)/share/doc/fotoxx
32 +DOCDIR = $(PREFIX)/share/doc/$(PF)
33 MANDIR = $(PREFIX)/share/man/man1
34 @@ -20,4 +19,4 @@
35
36 -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
37 -LIBS = `pkg-config --libs gtk+-3.0`
38 +CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
39 +LIBS = `pkg-config --libs gtk+-3.0` -lpthread
40
41 @@ -79,3 +78,2 @@
42 rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
43 - xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
44 rm -f $(DESTDIR)$(MENUFILE)
45 @@ -99,6 +97,2 @@
46 rm -f fotoxx.1.gz
47 - # menu (desktop) file
48 - cp -f desktop $(DESTDIR)$(MENUFILE)
49 - chmod +x $(DESTDIR)$(MENUFILE)
50 - xdg-desktop-menu install --novendor $(DESTDIR)$(MENUFILE)
51
52 @@ -109,3 +103,2 @@
53 rm -f $(DESTDIR)$(MANDIR)/fotoxx.1.gz
54 - xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
55 rm -f $(DESTDIR)$(MENUFILE)
56 diff -r -U1 fotoxx-14.05.orig/zfuncs.cc fotoxx-14.05/zfuncs.cc
57 --- fotoxx-14.05.orig/zfuncs.cc 2014-05-01 02:17:41.000000000 +0700
58 +++ fotoxx-14.05/zfuncs.cc 2014-05-05 21:48:23.160551146 +0700
59 @@ -3995,3 +3995,3 @@
60 strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales
61 - strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname
62 + strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/$(PF)