app-cdr/isomaster: 1.3.8

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

6 files changed, 242 insertions, 5 deletions

diff --git a/app-cdr/isomaster/ChangeLog b/app-cdr/isomaster/ChangeLog
index f941f202cbb3..f59e113c9789 100644
--- a/app-cdr/isomaster/ChangeLog
+++ b/app-cdr/isomaster/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/isomaster
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.16 2010/06/03 14:25:22 beandog Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/ChangeLog,v 1.17 2012/01/07 18:42:47 sping Exp $
+
+*isomaster-1.3.8 (07 Jan 2012)
+
+  07 Jan 2012; Sebastian Pipping <sping@gentoo.org> +isomaster-1.3.8.ebuild,
+  +files/isomaster-1.3.8-gtk_file_chooser_get_current.patch,
+  +files/isomaster-1.3.8-unbundle-iniparser.patch, metadata.xml:
+  Bump to 1.3.8 + bugfix patch (bug #377589)
 
 *isomaster-1.3.7-r1 (03 Jun 2010)
 
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 8a9355dd0854..e94e6c415c8f 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,8 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX isomaster-1.3.5-ldflags.diff 543 RMD160 5aa66133975b3cf20f7de71f126ca4aea300fae9 SHA1 a7450a8afb96b9bcef7aa1422b49bf126d769cab SHA256 783c31804f54faa234c33d0dc86fc71946151db075ccc452866fe15482dd6161
 AUX isomaster-1.3.7-noiniparser.patch 2459 RMD160 82377c449de27e5bc8cbcddd98eeafe470d2963d SHA1 46ee742bc2594558118203ddcf61c80b2327930b SHA256 ab7fd1854d0fecc7a48545eaefcfedfaa5039fae53839030f8ba1a45c09e9b6d
+AUX isomaster-1.3.8-gtk_file_chooser_get_current.patch 3508 RMD160 b5865eea5c9847e5ba3779fa283ced40a345c582 SHA1 e093984e7108a37531486c35e08c37f80999a3d2 SHA256 9cc3f1c2d01ed61b4274f9939af30666ea4695829a106b81c46a08225a4cbe16
+AUX isomaster-1.3.8-unbundle-iniparser.patch 1661 RMD160 e6791e4e77ee2535f4d2639ed8c3aaf6073bdcac SHA1 258994c28b113d1d754d0916575e21df3c842bcc SHA256 387f4f7a614a6aa114fef7b9b7a62053d2864964434ae822bc3997d16be91045
 DIST isomaster-1.3.5.tar.bz2 196042 RMD160 813c729b5308e725cbcfea688de343260bae63c5 SHA1 76adcae894a169365e43eaac30f4a7c3926fa78c SHA256 27b9b53d5e361b56a6e302131af2dc97f7135f74786637e6244e075606226597
 DIST isomaster-1.3.7.tar.bz2 211673 RMD160 9efdd239c82072510fca2630120bd302b89a8d1c SHA1 b3fb70a0e71c6f8aafb42c7f26367966ea269bcc SHA256 258b1ce0a9da35dc172c7d44866056c6873bd2992984af1e84deb25f4a7b47f7
+DIST isomaster-1.3.8.tar.bz2 216102 RMD160 dcb7d84a2f6f6840bba865524680c9364e67e4d5 SHA1 3b5cce19899f63dd943930a2abc43812e6a08ff1 SHA256 9a6e8c5356cac3253501976f49c6b971d088da0fbfb6641d304ea8eda06ab30b
 EBUILD isomaster-1.3.5.ebuild 881 RMD160 2532408437e6172688b208e74b177afb1d9df990 SHA1 e4acd2dce48c14987cc790154f22fb1034b7d089 SHA256 5bb0dfcb18a2d69969413616f0d92792e01d6eb8a46473f83d1f777a247489fb
 EBUILD isomaster-1.3.7-r1.ebuild 1152 RMD160 fee4cb2ff9f98a3b8bd23996497bd17e982e9649 SHA1 e988f257660556457cc2b9352761e76a52a4fe9e SHA256 dad39cf51bf2703e65b617834fbe1691353327ebdfa76649d827e0a7550eb74d
-MISC ChangeLog 2721 RMD160 64a7517971d094e85f1d189373c3963c6e6bcd02 SHA1 d0b6f78b3e3c17f164ea99f95db3e41a5ee3dc05 SHA256 12451e792de1ac14f13485e4abd7406d3408300c3979f70379af3387934c44b7
-MISC metadata.xml 166 RMD160 02ca0a5d9279c1b52c3887f5a1f52f3feb002af9 SHA1 b9fccc7c24aa717c30efef068fd544a692f264f6 SHA256 ce62d1e5b04e01d03a732ee6d33b3d500810de8e55af4a527c970e5b475735d8
+EBUILD isomaster-1.3.8.ebuild 1253 RMD160 01aba5442c110db9ad4a8df4767b7b7ad69e9ffa SHA1 0f0ada304c5ea4e4553901a21e1b3eaba13d4d56 SHA256 5cee0e343fdf5a08933eba28ca09d74c01da43af994d0db5fc4f6022bd718ec2
+MISC ChangeLog 3000 RMD160 47c8b607a94f9ee125b2d19f6246ffa26ec58480 SHA1 dc23c950cadc930dcd2ca226a93f45aaba68c5d7 SHA256 816bcecefed1eeb866a48c356a003c397b04392f6ffcd8766936c0c5350cb81a
+MISC metadata.xml 263 RMD160 23ac63910e182a037747a2e728cd360aea8931f3 SHA1 284748c7bbc9927feb894853669ca84a001651db SHA256 96a4922aeb9ae48b6e2725364ebc5016efe37a26e53b265c3bd693975eb737c8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk8IkhYACgkQsAvGakAaFgCkxACgtwiQy4skf5TU+sluhhTc78G8
+jOoAn0YZjbE1SL1Zm/S8BSouB38HBgAx
+=oeVi
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch b/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch
new file mode 100644
index 000000000000..ca8d178e369a
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.8-gtk_file_chooser_get_current.patch
@@ -0,0 +1,99 @@
+From eabb3f85d12121409f901d64c556a9f579c11864 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 7 Jan 2012 19:30:52 +0100
+Subject: [PATCH] Handle NULL return from
+ gtk_file_chooser_get_current_folder()
+
+---
+ isobrowser.c |   53 ++++++++++++++++++++++++++++++++++-------------------
+ 1 files changed, 34 insertions(+), 19 deletions(-)
+
+diff --git a/isobrowser.c b/isobrowser.c
+index c03548b..e108f03 100644
+--- a/isobrowser.c
++++ b/isobrowser.c
+@@ -9,6 +9,7 @@
+ * Andrew Smith, http://littlesvr.ca/misc/contactandrew.php
+ *
+ * Contributors:
++* Sebastian Pipping <sebastian@pipping.org>
+ * 
+ ******************************************************************************/
+ 
+@@ -1454,19 +1455,26 @@ gboolean openIsoCbk(GtkMenuItem* menuItem, gpointer data)
+         
+         /* RECORD last iso dir */
+         char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+-        
+-        if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
++        if(lastIsoDir)
++        {
++            if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
++            {
++                free(GBLappSettings.lastIsoDir);
++                GBLappSettings.lastIsoDir = NULL;
++            }
++
++            if(GBLappSettings.lastIsoDir == NULL)
++                GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
++
++            strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
++
++            g_free(lastIsoDir);
++        }
++        else /* e.g. when opening a file from the <Recently used> view */
+         {
+             free(GBLappSettings.lastIsoDir);
+             GBLappSettings.lastIsoDir = NULL;
+         }
+-        
+-        if(GBLappSettings.lastIsoDir == NULL)
+-            GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
+-        
+-        strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
+-        
+-        g_free(lastIsoDir);
+         /* END RECORD last iso dir */
+     }
+     
+@@ -1758,20 +1766,27 @@ gboolean saveIsoCbk(GtkWidget *widget, GdkEvent *event)
+         
+         /* RECORD last iso dir */
+         char* lastIsoDir = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog));
+-        
+-        if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
++        if(lastIsoDir)
++        {
++            if(GBLappSettings.lastIsoDir != NULL && strlen(lastIsoDir) > strlen(GBLappSettings.lastIsoDir))
++            {
++                free(GBLappSettings.lastIsoDir);
++                GBLappSettings.lastIsoDir = NULL;
++            }
++
++            if(GBLappSettings.lastIsoDir == NULL)
++                GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
++
++            strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
++
++            g_free(lastIsoDir);
++        }
++        else /* e.g. when opening a file from the <Recently used> view */
+         {
+             free(GBLappSettings.lastIsoDir);
+             GBLappSettings.lastIsoDir = NULL;
+         }
+-        
+-        if(GBLappSettings.lastIsoDir == NULL)
+-            GBLappSettings.lastIsoDir = malloc(strlen(lastIsoDir) + 1);
+-        
+-        strcpy(GBLappSettings.lastIsoDir, lastIsoDir);
+-        
+-        g_free(lastIsoDir);
+-        /* END RECORD iso save dir */
++        /* END RECORD last iso dir */
+         
+         askedToAddExtension = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(addExtensionCheckbox));
+     }
+-- 
+1.7.8.3
+
diff --git a/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch b/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch
new file mode 100644
index 000000000000..5d3746897942
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.8-unbundle-iniparser.patch
@@ -0,0 +1,61 @@
+From 598606c7b96e421ffbcb09ccd9aac61fa83cd0fe Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 7 Jan 2012 17:42:13 +0100
+Subject: [PATCH] Unbundle iniparser, fix use of compile/link flags
+
+---
+ Makefile |   10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 363a36a..c0434fb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,21 +65,18 @@ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.
+ 
+ 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 --git a/settings.h b/settings.h
+index fda67b7..e619e0c 100644
+--- a/settings.h
++++ b/settings.h
+@@ -4,7 +4,7 @@
+ #include <stdbool.h>
+ 
+ #include "isomaster.h"
+-#include "iniparser-2.17/src/iniparser.h"
++#include <iniparser.h>
+ 
+ #define ISOMASTER_DEFAULT_WINDOW_WIDTH 500
+ #define ISOMASTER_DEFAULT_WINDOW_HEIGHT 550
+-- 
+1.7.8.3
diff --git a/app-cdr/isomaster/isomaster-1.3.8.ebuild b/app-cdr/isomaster/isomaster-1.3.8.ebuild
new file mode 100644
index 000000000000..c865e3feb347
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/isomaster/isomaster-1.3.8.ebuild,v 1.1 2012/01/07 18:42:47 sping 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"
+		MYFLAGS="${MYFLAGS} MYDOCPATH=/usr/share/doc/${PF}/bkisofs"
+		MYFLAGS="${MYFLAGS} ICONPATH=/usr/share/pixmaps/${PN}"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-unbundle-iniparser.patch
+	rm -R iniparser-2.17 || die
+
+	epatch "${FILESDIR}"/${P}-gtk_file_chooser_get_current.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 || die
+}
diff --git a/app-cdr/isomaster/metadata.xml b/app-cdr/isomaster/metadata.xml
index 3ca6ae763b34..588a5b809eff 100644
--- a/app-cdr/isomaster/metadata.xml
+++ b/app-cdr/isomaster/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
+	<herd>media-optical</herd>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
 </pkgmetadata>