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-12.06.1.patch fotoxx-12.04.patch
Date: Sat, 02 Jun 2012 17:22:14
Message-Id: 20120602172154.D8AF82004C@flycatcher.gentoo.org
1 grozin 12/06/02 17:21:54
2
3 Added: fotoxx-12.06.1.patch
4 Removed: fotoxx-12.04.patch
5 Log:
6 Version bump
7
8 (Portage version: 2.2.0_alpha108/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 media-gfx/fotoxx/files/fotoxx-12.06.1.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-12.06.1.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fotoxx/files/fotoxx-12.06.1.patch?rev=1.1&content-type=text/plain
15
16 Index: fotoxx-12.06.1.patch
17 ===================================================================
18 diff -r -U1 fotoxx-12.03.orig/Makefile fotoxx-12.03/Makefile
19 --- fotoxx-12.03.orig/Makefile 2012-03-01 01:57:48.000000000 +0700
20 +++ fotoxx-12.03/Makefile 2012-03-03 03:56:44.000000000 +0700
21 @@ -5,4 +5,4 @@
22 # defaults for parameters that may be pre-defined
23 -CXXFLAGS ?= -O3 -g -Wall -Wno-deprecated-declarations
24 -LDFLAGS ?= -O3 -g -Wall -rdynamic
25 +CXXFLAGS += -Wall -Wno-deprecated-declarations
26 +LDFLAGS += -rdynamic
27 PREFIX ?= /usr
28 @@ -14,3 +14,3 @@
29 LOCALESDIR = $(SHAREDIR)/locales
30 -DOCDIR = $(PREFIX)/share/doc/fotoxx
31 +DOCDIR = $(PREFIX)/share/doc/$(PF)
32 MANDIR = $(PREFIX)/share/man/man1
33 @@ -18,3 +18,3 @@
34
35 -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
36 +CFLAGS = $(CXXFLAGS) -c -DPF=\"$(PF)\" `pkg-config --cflags gtk+-3.0`
37 LIBS = `pkg-config --libs gtk+-3.0`
38 @@ -77,5 +77,2 @@
39 rm -f fotoxx.1.gz
40 - # menu (desktop) file
41 - cp -f desktop $(DESTDIR)$(MENUFILE)
42 - xdg-desktop-menu install $(DESTDIR)$(MENUFILE)
43
44 diff -r -U1 fotoxx-12.03.orig/zfuncs.cc fotoxx-12.03/zfuncs.cc
45 --- fotoxx-12.03.orig/zfuncs.cc 2012-03-01 01:57:48.000000000 +0700
46 +++ fotoxx-12.03/zfuncs.cc 2012-03-03 03:58:13.000000000 +0700
47 @@ -3194,3 +3194,3 @@
48 strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales
49 - strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname
50 + strncatv(zdocdir,199,work,"/share/doc/",PF,null); // /prefix/share/doc/${PF}