diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2011-08-04 08:11:43 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2011-08-04 08:11:43 +0000 |
| commit | 4a1d278de807b3b71865c9a077b62a95e6f25222 (patch) | |
| tree | 450ebfee9facbd76e6ba320260965030a995b6d3 /media-gfx/fotoxx/files | |
| parent | Version bump. Remove old. (diff) | |
| download | historical-4a1d278de807b3b71865c9a077b62a95e6f25222.tar.gz historical-4a1d278de807b3b71865c9a077b62a95e6f25222.tar.bz2 historical-4a1d278de807b3b71865c9a077b62a95e6f25222.zip | |
Version bump, bug #358689 should be fixed
Package-Manager: portage-2.2.0_alpha49/cvs/Linux i686
Diffstat (limited to 'media-gfx/fotoxx/files')
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch | 45 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch (renamed from media-gfx/fotoxx/files/fotoxx-11.06-docdir.patch) | 0 | ||||
| -rw-r--r-- | media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch | 20 |
3 files changed, 20 insertions, 45 deletions
diff --git a/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch deleted file mode 100644 index 9a580117bdde..000000000000 --- a/media-gfx/fotoxx/files/fotoxx-11.06-makefile.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -r -U1 fotoxx-11.06.orig/Makefile fotoxx-11.06/Makefile ---- fotoxx-11.06.orig/Makefile 2011-06-04 20:53:41.000000000 +0700 -+++ fotoxx-11.06/Makefile 2011-06-07 03:27:17.000000000 +0700 -@@ -6,5 +6,6 @@ - # defaults for parameters that may be pre-defined --CXXFLAGS ?= -O3 -g -Wall --LDFLAGS ?= -O3 -g -Wall -rdynamic -+CXXFLAGS += -Wall -c `pkg-config --cflags gtk+-2.0` -+LDFLAGS += -rdynamic - PREFIX ?= /usr -+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` - -@@ -16,3 +17,3 @@ - LOCALESDIR = $(SHAREDIR)/locales --DOCDIR = $(PREFIX)/share/doc/fotoxx -+DOCDIR = $(PREFIX)/share/doc/$(PF) - MANDIR = $(PREFIX)/share/man/man1 -@@ -21,5 +22,2 @@ - --CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` --LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` -- - fotoxx: fotoxx.o fotoxx_area.o fotoxx_info.o fotoxx_edit.o zfuncs.o -@@ -30,15 +28,15 @@ - fotoxx.o: $(VERSION) fotoxx.h -- $(CXX) $(CFLAGS) -o fotoxx.o $(VERSION) -+ $(CXX) $(CXXFLAGS) -o fotoxx.o $(VERSION) - - fotoxx_area.o: fotoxx_area.cc fotoxx.h -- $(CXX) $(CFLAGS) fotoxx_area.cc -+ $(CXX) $(CXXFLAGS) fotoxx_area.cc - - fotoxx_info.o: fotoxx_info.cc fotoxx.h -- $(CXX) $(CFLAGS) fotoxx_info.cc -+ $(CXX) $(CXXFLAGS) fotoxx_info.cc - - fotoxx_edit.o: fotoxx_edit.cc fotoxx.h -- $(CXX) $(CFLAGS) fotoxx_edit.cc -+ $(CXX) $(CXXFLAGS) fotoxx_edit.cc - - zfuncs.o: zfuncs.cc -- $(CXX) $(CFLAGS) zfuncs.cc -+ $(CXX) $(CXXFLAGS) -DPF=\"$(PF)\" zfuncs.cc - -Только в fotoxx-11.06: Makefile~ diff --git a/media-gfx/fotoxx/files/fotoxx-11.06-docdir.patch b/media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch index 4c54ba3169a5..4c54ba3169a5 100644 --- a/media-gfx/fotoxx/files/fotoxx-11.06-docdir.patch +++ b/media-gfx/fotoxx/files/fotoxx-11.08.1-docdir.patch diff --git a/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch b/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch new file mode 100644 index 000000000000..7d0715062500 --- /dev/null +++ b/media-gfx/fotoxx/files/fotoxx-11.08.1-makefile.patch @@ -0,0 +1,20 @@ +diff -r -U1 fotoxx-11.08.1.orig/Makefile fotoxx-11.08.1/Makefile +--- fotoxx-11.08.1.orig/Makefile 2011-08-03 16:11:43.000000000 +0700 ++++ fotoxx-11.08.1/Makefile 2011-08-04 14:59:24.000000000 +0700 +@@ -5,4 +5,4 @@ + # defaults for parameters that may be pre-defined +-CXXFLAGS ?= -O3 -g -Wall +-LDFLAGS ?= -O3 -g -Wall -rdynamic ++CXXFLAGS += -Wall ++LDFLAGS += -rdynamic + PREFIX ?= /usr +@@ -15,3 +15,3 @@ + LOCALESDIR = $(SHAREDIR)/locales +-DOCDIR = $(PREFIX)/share/doc/fotoxx ++DOCDIR = $(PREFIX)/share/doc/$(PF) + MANDIR = $(PREFIX)/share/man/man1 +@@ -20,3 +20,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` |