Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2010-10-02 07:58:21 +0000
committerAndrey Grozin <grozin@gentoo.org>2010-10-02 07:58:21 +0000
commitee3afc25fcf0adfd1b449f8167b7db3d91393e2d (patch)
treeac1fea553097ecd887af7048d85095e8762a6ddb /media-gfx
parentFix patch to compile with make-3.82 wrt bug 336542. Thanks to Diego for the r... (diff)
downloadhistorical-ee3afc25fcf0adfd1b449f8167b7db3d91393e2d.tar.gz
historical-ee3afc25fcf0adfd1b449f8167b7db3d91393e2d.tar.bz2
historical-ee3afc25fcf0adfd1b449f8167b7db3d91393e2d.zip
Version bump
Package-Manager: portage-2.2_rc88/cvs/Linux i686
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/fotoxx/ChangeLog9
-rw-r--r--media-gfx/fotoxx/Manifest8
-rw-r--r--media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch (renamed from media-gfx/fotoxx/files/fotoxx-makefile.patch)28
-rw-r--r--media-gfx/fotoxx/fotoxx-10.10.ebuild (renamed from media-gfx/fotoxx/fotoxx-10.8.4.ebuild)4
4 files changed, 24 insertions, 25 deletions
diff --git a/media-gfx/fotoxx/ChangeLog b/media-gfx/fotoxx/ChangeLog
index 90ca1c73a2e1..9054e49761a0 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.7 2010/09/14 15:56:53 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/ChangeLog,v 1.8 2010/10/02 07:58:20 grozin Exp $
+
+*fotoxx-10.10 (02 Oct 2010)
+
+ 02 Oct 2010; Andrey Grozin <grozin@gentoo.org> -fotoxx-10.8.4.ebuild,
+ +fotoxx-10.10.ebuild, +files/fotoxx-10.10-makefile.patch,
+ -files/fotoxx-makefile.patch:
+ Version bump
*fotoxx-10.9.1 (14 Sep 2010)
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index cee500cfb857..a7dbb303ce9d 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,8 @@
+AUX fotoxx-10.10-makefile.patch 1328 RMD160 9f80c0fe646066d9940aa13505dffc71ef9c0996 SHA1 24061fe2cf06c1601368a1861725daaff38a2c58 SHA256 31b8b2415eed460a0177fc913a1203a108b726df697aa416f98579edabc0164d
AUX fotoxx-10.9.1-makefile.patch 1328 RMD160 9f80c0fe646066d9940aa13505dffc71ef9c0996 SHA1 24061fe2cf06c1601368a1861725daaff38a2c58 SHA256 31b8b2415eed460a0177fc913a1203a108b726df697aa416f98579edabc0164d
-AUX fotoxx-makefile.patch 1343 RMD160 c5b150f38a43ab68ee479a642112c781915f9c6d SHA1 c84f56006d9797161237d4dd1c42c527ac70f326 SHA256 2ad7d5b6050389b58f71a5c345f6db99110a0a368ed6b8fff5c69f5db2d1346d
-DIST fotoxx-10.8.4.tar.gz 1133275 RMD160 fc755d00f6f169bca7de165803a81b9511f5fb4f SHA1 3a1ead13324b5c50811247279c3de43b6e0d776a SHA256 e0827d695e68e4ae589d95695d4627ae386967e15f3bf6728589aac685b3a583
+DIST fotoxx-10.10.tar.gz 2414193 RMD160 8ab0dc6199f65fd14a1e899099623613b4e6c3c8 SHA1 10facccb8673e0748a49ae4da626ff97896fc197 SHA256 44db3f11044661879b34dd44ed137f84dfdfb986765f8e9d7cc1dc46bbe102f4
DIST fotoxx-10.9.1.tar.gz 2126611 RMD160 231c5fccd48d5a32eaa1681ec0d859f55a2d9ef1 SHA1 99df4959d4f343a324aac2aee0c7494b9aa0bf6a SHA256 8a09494cdf229eec51bd416615c604e8c04c792842612a645e0091ce17337285
-EBUILD fotoxx-10.8.4.ebuild 1192 RMD160 b34d24343d25a406e368051be3c866ae30b8604f SHA1 59a19a329f9d65d711ccd57088ca67119bfe31f0 SHA256 19d2be50efa7db30aca2a87d36c06a4a74e41da2167e891f5c4349b0336476a7
+EBUILD fotoxx-10.10.ebuild 1191 RMD160 fd6c348627017c31d3c671c285b6548cd7862288 SHA1 7c04cb8296e5f2d1ebd656edabff31a0633b496a SHA256 c1894b2dc75440aa508fa998f7ff1d6d41017febae699efb228cd047476a981c
EBUILD fotoxx-10.9.1.ebuild 1192 RMD160 f06c0f28db2091f671409c9749e92972c1e99252 SHA1 8c5a40d3de0c175a4c0ad4639e6385647d9f1b7a SHA256 545ac736fb7a44e0ae9c8a756d10a4c2ab8fca8bf0c392d03e849688da4ee83f
-MISC ChangeLog 1309 RMD160 4c6590c60e052f57ad42302db863af1f727c626b SHA1 e9effaabb0ba58ed7776cfac654d2d22cbb23f57 SHA256 eabb94081a780cc3441a2841ebaa770573df6d546ec0ad7ed467fab3c71c6721
+MISC ChangeLog 1518 RMD160 c70c217ae666a1fbce718e91f3a709e111d2b6b5 SHA1 d827985815da7deabf58e3ce1499d388c8389721 SHA256 ef9bf10fbd4f4dc181eb6651e86a06b4441eab459a00d2b42165badf8dacef44
MISC metadata.xml 868 RMD160 8264b2cc211f3c453ab9d2e119d18e543133bee9 SHA1 bf7bf564db831fb3e8474e19ddbde50631808167 SHA256 b705d0b873a5a64e431884d3d975e3634a47b3a8c5a6e1d1392d4195a4e1e219
diff --git a/media-gfx/fotoxx/files/fotoxx-makefile.patch b/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch
index ba3124cc8be0..4337f14fcfc2 100644
--- a/media-gfx/fotoxx/files/fotoxx-makefile.patch
+++ b/media-gfx/fotoxx/files/fotoxx-10.10-makefile.patch
@@ -1,14 +1,11 @@
-http://bugs.gentoo.org/329901 and misc fixes
-
---- Makefile
-+++ Makefile
-@@ -5,30 +5,30 @@
- SOURCE = $(PROGRAM)-$(VERSION).cc
-
+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 @@
# defaults for parameters that may be pre-defined
--CXXFLAGS ?= -O3 -g -Wall
+-CXXFLAGS ?= -O3 -g -Wall
-LDFLAGS ?= -O3 -g -Wall -rdynamic
-+CXXFLAGS += -Wall
++CXXFLAGS += -Wall
+LDFLAGS += -rdynamic
PREFIX ?= /usr/local
@@ -17,27 +14,22 @@ http://bugs.gentoo.org/329901 and misc fixes
+CXXFLAGS += -c `pkg-config --cflags gtk+-2.0`
+LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
- BINDIR = $(PREFIX)/bin
+@@ -16,3 +16,3 @@
DATADIR = $(PREFIX)/share/$(PROGRAM)
- ICONDIR = $(DATADIR)/icons
- DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
+DOCDIR = $(PREFIX)/share/doc/$(PF)
MANDIR = $(PREFIX)/share/man/man1
-
- $(PROGRAM): $(PROGRAM).o zfuncs.o
+@@ -23,6 +23,6 @@
@ ./dependencies.sh
- $(CXX) $(LFLAGS) -ltiff -o $(PROGRAM) $(PROGRAM).o zfuncs.o
+ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -ltiff $(LIBS)
$(PROGRAM).o: $(SOURCE)
- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \
-+ $(CXX) $(CXXFLAGS) -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.8.4.ebuild b/media-gfx/fotoxx/fotoxx-10.10.ebuild
index ae8e1eb9054e..84a0b8d0af8f 100644
--- a/media-gfx/fotoxx/fotoxx-10.8.4.ebuild
+++ b/media-gfx/fotoxx/fotoxx-10.10.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.8.4.ebuild,v 1.1 2010/08/19 03:31:11 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fotoxx/fotoxx-10.10.ebuild,v 1.1 2010/10/02 07:58:20 grozin Exp $
EAPI=3
inherit eutils toolchain-funcs
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}
x11-misc/xdg-utils"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-makefile.patch
+ epatch "${FILESDIR}"/${PF}-makefile.patch
}
src_compile() {