From 97a5b509ecca7e1e533ad7f6b91dc66121e0bd06 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 9 Jan 2010 14:41:59 +0000 Subject: Version bump to 1.3.7. (Portage version: 2.2_rc61/cvs/Linux x86_64) --- app-cdr/isomaster/ChangeLog | 10 +++- .../files/isomaster-1.3.7-noiniparser.patch | 69 ++++++++++++++++++++++ app-cdr/isomaster/isomaster-1.3.7.ebuild | 47 +++++++++++++++ 3 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch create mode 100644 app-cdr/isomaster/isomaster-1.3.7.ebuild (limited to 'app-cdr') diff --git a/app-cdr/isomaster/ChangeLog b/app-cdr/isomaster/ChangeLog index 0ad632a38775..fb5ef82030c3 100644 --- a/app-cdr/isomaster/ChangeLog +++ b/app-cdr/isomaster/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-cdr/isomaster -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.14 2009/06/20 13:04:57 ssuominen Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.15 2010/01/09 14:41:59 idl0r Exp $ + +*isomaster-1.3.7 (09 Jan 2010) + + 09 Jan 2010; Christian Ruppert +isomaster-1.3.7.ebuild, + +files/isomaster-1.3.7-noiniparser.patch: + Version bump to 1.3.7. 20 Jun 2009; Samuli Suominen isomaster-1.3.5.ebuild: diff --git a/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch b/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch new file mode 100644 index 000000000000..9ee607b2e43b --- /dev/null +++ b/app-cdr/isomaster/files/isomaster-1.3.7-noiniparser.patch @@ -0,0 +1,69 @@ +diff -Naurp -p isomaster-1.3.7.orig/Makefile isomaster-1.3.7/Makefile +--- isomaster-1.3.7.orig/Makefile 2010-01-09 14:18:00.333993253 +0100 ++++ isomaster-1.3.7/Makefile 2010-01-09 15:17:31.047246400 +0100 +@@ -65,21 +65,18 @@ OBJECTS = isomaster.o window.o browser.o + + all: translations isomaster.desktop isomaster + +-isomaster: $(OBJECTS) lib iniparser ++isomaster: $(OBJECTS) lib + @echo 'Linking isomaster' +- @$(CC) $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) `pkg-config --libs gtk+-2.0` -o isomaster ++ @$(CC) $(LDFLAGS) $(OBJECTS) bk/bk.a `pkg-config --libs gtk+-2.0` -liniparser -o isomaster + + # static pattern rule + $(OBJECTS): %.o: %.c %.h bk/bk.h Makefile + @echo 'Compiling' $< +- @$(CC) $< $(CFLAGS) $(CPPFLAGS) -c -o $@ ++ @$(CC) $(CFLAGS) $(CPPFLAGS) $< -c -o $@ + + lib: + cd bk && $(MAKE) + +-iniparser: +- cd iniparser-2.17 && $(MAKE) +- + translations: + ifndef WITHOUT_NLS + cd po && $(MAKE) +@@ -94,7 +91,6 @@ bk-doc: + + clean: + cd bk && $(MAKE) clean +- cd iniparser-2.17 && $(MAKE) clean + ifndef WITHOUT_NLS + cd po && $(MAKE) clean + endif +diff -Naurp -p isomaster-1.3.7.orig/settings.c isomaster-1.3.7/settings.c +--- isomaster-1.3.7.orig/settings.c 2010-01-09 14:18:00.329993692 +0100 ++++ isomaster-1.3.7/settings.c 2010-01-09 15:19:29.052995022 +0100 +@@ -607,7 +607,7 @@ void loadSettings(void) + GBLappSettings.recentlyOpen[i] = NULL; + if(GBLsettingsDictionary != NULL) + { +- char configNameStr[20] = "ui:recentlyopen"; ++ char configNameStr[46] = "ui:recentlyopen"; + snprintf(configNameStr + 15, 20, "%d", i); + + tempStr = iniparser_getstring(GBLsettingsDictionary, +@@ -892,7 +892,7 @@ void writeSettings(void) + + for(int i = 0; i < 5; i++) + { +- char configNameStr[20] = "ui:recentlyopen"; ++ char configNameStr[46] = "ui:recentlyopen"; + snprintf(configNameStr + 15, 20, "%d", i); + + iniparser_setstr(GBLsettingsDictionary, configNameStr, +diff -Naurp -p isomaster-1.3.7.orig/settings.h isomaster-1.3.7/settings.h +--- isomaster-1.3.7.orig/settings.h 2010-01-09 14:18:00.330993252 +0100 ++++ isomaster-1.3.7/settings.h 2010-01-09 14:34:59.495995595 +0100 +@@ -4,7 +4,7 @@ + #include + + #include "isomaster.h" +-#include "iniparser-2.17/src/iniparser.h" ++#include + + #define ISOMASTER_DEFAULT_WINDOW_WIDTH 500 + #define ISOMASTER_DEFAULT_WINDOW_HEIGHT 550 diff --git a/app-cdr/isomaster/isomaster-1.3.7.ebuild b/app-cdr/isomaster/isomaster-1.3.7.ebuild new file mode 100644 index 000000000000..2275066eded6 --- /dev/null +++ b/app-cdr/isomaster/isomaster-1.3.7.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.7.ebuild,v 1.1 2010/01/09 14:41:59 idl0r Exp $ + +EAPI=2 +inherit eutils toolchain-funcs + +DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images" +HOMEPAGE="http://littlesvr.ca/isomaster" +SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" +IUSE="nls" + +RDEPEND=">=x11-libs/gtk+-2:2 + dev-libs/iniparser" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +MYFLAGS="" + +pkg_setup() { + MYFLAGS="PREFIX=/usr" + + if ! use nls; then + MYFLAGS="${MYFLAGS} WITHOUT_NLS=1" + fi +} + +src_prepare() { + epatch "${FILESDIR}/${P}-noiniparser.patch" +} + +# bug 274361 +src_configure() { :; } + +src_compile() { + tc-export CC + emake ${MYFLAGS} || die "emake failed" +} + +src_install() { + emake ${MYFLAGS} DESTDIR="${D}" install || die "emake install failed" + dodoc {CHANGELOG,CREDITS,README,TODO}.TXT +} -- cgit v1.2.3-65-gdbad