summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2010-12-03 14:51:17 +0000
committerAndrey Grozin <grozin@gentoo.org>2010-12-03 14:51:17 +0000
commit237556ccfff0a4197204df74492c3cd6b426dc3d (patch)
treed3b620f61d7e083c9fc113a875be7bb8c9c69c02 /media-gfx/fotoxx
parentversion bump; thx to M.Lange on bug #307689 (diff)
downloadhistorical-237556ccfff0a4197204df74492c3cd6b426dc3d.tar.gz
historical-237556ccfff0a4197204df74492c3cd6b426dc3d.tar.bz2
historical-237556ccfff0a4197204df74492c3cd6b426dc3d.zip
Version bump
Package-Manager: portage-2.2.0_alpha6/cvs/Linux i686
Diffstat (limited to 'media-gfx/fotoxx')
-rw-r--r--media-gfx/fotoxx/ChangeLog9
-rw-r--r--media-gfx/fotoxx/Manifest8
-rw-r--r--media-gfx/fotoxx/files/fotoxx-10.12-makefile.patch (renamed from media-gfx/fotoxx/files/fotoxx-10.10.2-makefile.patch)22
-rw-r--r--media-gfx/fotoxx/fotoxx-10.12.ebuild (renamed from media-gfx/fotoxx/fotoxx-10.10.2.ebuild)2
4 files changed, 28 insertions, 13 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 1ff7c3ee7864..f942211d34fa 100644
--- a/media-gfx/fotoxx/ChangeLog
+++ b/media-gfx/fotoxx/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-gfx/fotoxx
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.10 2010/11/10 05:45:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.11 2010/12/03 14:51:08 grozin Exp $
+
+*fotoxx-10.12 (03 Dec 2010)
+
+ 03 Dec 2010; Andrey Grozin <grozin@gentoo.org> -fotoxx-10.10.2.ebuild,
+ -files/fotoxx-10.10.2-makefile.patch, +fotoxx-10.12.ebuild,
+ +files/fotoxx-10.12-makefile.patch:
+ Version bump
*fotoxx-10.11.2 (10 Nov 2010)
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index ae74d9d88472..fb2b433ee380 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,8 @@
-AUX fotoxx-10.10.2-makefile.patch 1328 RMD160 9f80c0fe646066d9940aa13505dffc71ef9c0996 SHA1 24061fe2cf06c1601368a1861725daaff38a2c58 SHA256 31b8b2415eed460a0177fc913a1203a108b726df697aa416f98579edabc0164d
AUX fotoxx-10.11.2-makefile.patch 1457 RMD160 c72c6be530be93604d958fcdace39de1284aec5f SHA1 4550a6fc44eb4ae5b6276d32170a5c5fd84f246d SHA256 2b33e9589d27d3affe61af7d98985792b0771e8cc3d597830814a0fd0576419b
-DIST fotoxx-10.10.2.tar.gz 2445398 RMD160 77dafb53d4b153ec7c4a410ed3f351e937f9036b SHA1 122a8e42e9cb4374a8321f0106ac2c1fa6187fd2 SHA256 862ca4a227cdb8af4a666ae3a76c35f671f90660a7fded0df47eb42b55e45814
+AUX fotoxx-10.12-makefile.patch 1457 RMD160 c72c6be530be93604d958fcdace39de1284aec5f SHA1 4550a6fc44eb4ae5b6276d32170a5c5fd84f246d SHA256 2b33e9589d27d3affe61af7d98985792b0771e8cc3d597830814a0fd0576419b
DIST fotoxx-10.11.2.tar.gz 1023803 RMD160 5ba371dc7ca7f7fe2fb8190b0e9f57967e2938c8 SHA1 62ab00f7d58ae6eea286c7614cdb2149a0bd09d2 SHA256 9159417582eab853b5e259403da9824133956f0743cee485b66aaf1a86f7e80c
-EBUILD fotoxx-10.10.2.ebuild 1193 RMD160 a605c74a147ffd85916fef35425f43b901025db0 SHA1 6194e0380f2b314b909ac54436021c873b817a4e SHA256 d0774dfe524dda0ec9f09122492cf7fa7dd30174d1dab91f671aa2b0d4890532
+DIST fotoxx-10.12.tar.gz 1006640 RMD160 751cd00887d57c8219db3f75165a3120793c60ed SHA1 a9608b75495be69b17c72763b598565145ea5741 SHA256 40a0a85d306f7b87bccc2045c4decdf300d61027e4cf14b8b2b94e58198c1681
EBUILD fotoxx-10.11.2.ebuild 1193 RMD160 2895a0557c4147ba838e1fdebbe10d5b02a54edd SHA1 6aa2ae12d84796d51107c5ab388813e1428c18fe SHA256 4e2a7c2d49b99e427b516162080d9dd5cee85e0bff03b49fc5222c1aa93aae10
-MISC ChangeLog 1961 RMD160 7bdcde33480d54d0c060100a50489b6cb7e9d397 SHA1 ae34124b2f3acad0083fbdc53fdb43d36edd7e01 SHA256 2b2f69f50e70cbd6e1d5122123ec45e130e4b1ca1f896f9ed4436eb09e9d92a2
+EBUILD fotoxx-10.12.ebuild 1191 RMD160 a9a491cc118ae1fef1d68af10e23a8c6adf05a2e SHA1 222ce915445df777161e58e820086780f80a918b SHA256 0c5de84248c435c8babb26e402b65a85c447cb8377ceb2ad8041f2095f44190e
+MISC ChangeLog 2179 RMD160 9d1a7a639587d6e6825246cd11a76dd81b434cba SHA1 23a6eefc7b1baca9c5e676add3b974d43d190221 SHA256 2d561aeae2daa6f5d7a58976c96bd7cc08ec2b8801adf8095ba5e50b8d40e7f9
MISC metadata.xml 868 RMD160 8264b2cc211f3c453ab9d2e119d18e543133bee9 SHA1 bf7bf564db831fb3e8474e19ddbde50631808167 SHA256 b705d0b873a5a64e431884d3d975e3634a47b3a8c5a6e1d1392d4195a4e1e219
diff --git a/media-gfx/fotoxx/files/fotoxx-10.10.2-makefile.patch b/media-gfx/fotoxx/files/fotoxx-10.12-makefile.patch
index 4337f14fcfc2..464cfed9cf71 100644
--- a/media-gfx/fotoxx/files/fotoxx-10.10.2-makefile.patch
+++ b/media-gfx/fotoxx/files/fotoxx-10.12-makefile.patch
@@ -1,7 +1,10 @@
-diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile
---- fotoxx-10.9.1.orig//Makefile 2010-09-09 18:12:15.000000000 +0700
-+++ fotoxx-10.9.1//Makefile 2010-09-15 06:25:29.000000000 +0700
-@@ -7,8 +7,8 @@
+Index: fotoxx-10.11.2/Makefile
+===================================================================
+--- fotoxx-10.11.2.orig/Makefile
++++ fotoxx-10.11.2/Makefile
+@@ -5,30 +5,30 @@ VERSION = 10.11.2
+ SOURCE = $(PROGRAM)-$(VERSION).cc
+
# defaults for parameters that may be pre-defined
-CXXFLAGS ?= -O3 -g -Wall
-LDFLAGS ?= -O3 -g -Wall -rdynamic
@@ -14,12 +17,15 @@ diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile
+CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
-@@ -16,3 +16,3 @@
+ BINDIR = $(PREFIX)/bin
DATADIR = $(PREFIX)/share/$(PROGRAM)
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
+DOCDIR = $(PREFIX)/share/doc/$(PF)
MANDIR = $(PREFIX)/share/man/man1
-@@ -23,6 +23,6 @@
+ ICONDIR = $(DATADIR)/icons
+ DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop
+
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
@ ./dependencies.sh
- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
+ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
@@ -28,8 +34,10 @@ diff -U1 -r fotoxx-10.9.1.orig//Makefile fotoxx-10.9.1//Makefile
- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \
+ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
-@@ -30,3 +30,3 @@
+
zfuncs.o: zfuncs.cc
- $(CXX) $(CFLAGS) zfuncs.cc \
+ $(CXX) $(CXXFLAGS) zfuncs.cc \
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
+
+ install: $(PROGRAM)
diff --git a/media-gfx/fotoxx/fotoxx-10.10.2.ebuild b/media-gfx/fotoxx/fotoxx-10.12.ebuild
index f98a53e6f641..3a201c8e5771 100644
--- a/media-gfx/fotoxx/fotoxx-10.10.2.ebuild
+++ b/media-gfx/fotoxx/fotoxx-10.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.10.2.ebuild,v 1.1 2010/10/15 12:40:08 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.12.ebuild,v 1.1 2010/12/03 14:51:10 grozin Exp $
EAPI=3
inherit eutils toolchain-funcs