summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-25 18:09:44 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-25 18:09:44 +0000
commitf125f25c611263ff419bae7d1d06fdd9c65e8a5a (patch)
treee6027152731458f52abd18fcc6c77ed8b2ba586c /dev-libs/libmirage
parentppc/ppc64/x86 stable wrt #399403 (diff)
downloadhistorical-f125f25c611263ff419bae7d1d06fdd9c65e8a5a.tar.gz
historical-f125f25c611263ff419bae7d1d06fdd9c65e8a5a.tar.bz2
historical-f125f25c611263ff419bae7d1d06fdd9c65e8a5a.zip
Fix segfault in mirage_session_add_language(). Bypass unnecessary gtk-doc configure check (bug #399701, thanks to Piotr Mitas et al. for reporting).
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/libmirage')
-rw-r--r--dev-libs/libmirage/ChangeLog11
-rw-r--r--dev-libs/libmirage/Manifest12
-rw-r--r--dev-libs/libmirage/files/libmirage-1.5.0-gtk-doc.patch32
-rw-r--r--dev-libs/libmirage/files/libmirage-1.5.0-session-initialize-language.patch25
-rw-r--r--dev-libs/libmirage/libmirage-1.5.0-r1.ebuild (renamed from dev-libs/libmirage/libmirage-1.5.0.ebuild)15
5 files changed, 88 insertions, 7 deletions
diff --git a/dev-libs/libmirage/ChangeLog b/dev-libs/libmirage/ChangeLog
index f0936d041b90..f7baf60a0649 100644
--- a/dev-libs/libmirage/ChangeLog
+++ b/dev-libs/libmirage/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for dev-libs/libmirage
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.17 2012/01/22 00:29:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/ChangeLog,v 1.18 2012/01/25 18:09:44 tetromino Exp $
+
+*libmirage-1.5.0-r1 (25 Jan 2012)
+
+ 25 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ -libmirage-1.5.0.ebuild, +libmirage-1.5.0-r1.ebuild,
+ +files/libmirage-1.5.0-gtk-doc.patch,
+ +files/libmirage-1.5.0-session-initialize-language.patch:
+ Fix segfault in mirage_session_add_language(). Bypass unnecessary gtk-doc
+ configure check (bug #399701, thanks to Piotr Mitas et al. for reporting).
*libmirage-1.5.0 (22 Jan 2012)
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index c184807adb49..99e024e0126b 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,18 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX libmirage-1.5.0-gtk-doc.patch 1026 RMD160 5cbfe7c9a4b77b566250a8a1442b3ba5dc7680da SHA1 8ddab7d24981c16ecf7751cf69455cf300eaa6ce SHA256 af830916818f5d4369178e08326bd6986d0d88ff92855ee4fce8f66bb9e109bb
+AUX libmirage-1.5.0-session-initialize-language.patch 907 RMD160 eeeadc09784aa991be4f7ffb00915ffac05b5918 SHA1 8909eb139a6c3465338a13032f5426f1614924ee SHA256 d86139d52b7537b9344409595084526c363319aac6d70e35e58a05791018c14a
DIST libmirage-1.2.0.tar.bz2 455128 RMD160 392798a2c1b8158b0420cf69471427c1ab03abe2 SHA1 f0d0567f1314526201b85193f65c315577e89faf SHA256 1cc5ab447502d9cd124c0a0c1a369397141dad83fcfd93f19de9dc3a203d8850
DIST libmirage-1.4.0.tar.gz 731906 RMD160 32da3fd0fd467a6f851a6a31b5a4a3d257431134 SHA1 a058efb0ad095741e12e8ecca0f104b2e7911dea SHA256 c89ddcf52de0049c25703ecb7c2c9317c13957df6925b69e471e98f34c202220
DIST libmirage-1.5.0.tar.bz2 509179 RMD160 27fae03fbea0d4134f7bc211c3b4f88742bbc124 SHA1 d05ecf6fa644a54a1e193c60e5db4b1f03ac53fa SHA256 3ba50c49e6e2a888175a4d5749ac557a53e37c1f409ce76d8e8adfd702c586a6
EBUILD libmirage-1.2.0.ebuild 754 RMD160 de43bc275c5e870a060960400ed91c14172ce10b SHA1 f8e6b3301a2ee9fec66ad94204b266ad83060f71 SHA256 5c9654dd9a4c5c1289bcf3725432a418fee660aec1eb4b0ca5f298f3dc732811
EBUILD libmirage-1.4.0.ebuild 693 RMD160 f790faf2bff61daf169c9734eb8594bdee876018 SHA1 9995224317a49731c03b44e5f24be97a9f52e320 SHA256 c6cd2538268334322d433cb09c6e4e217a70d5750d96d7e0523b2ec54ea3bbb8
-EBUILD libmirage-1.5.0.ebuild 683 RMD160 7f4aa21c455c9c0a6e88e32dfa165f2de0c3cd9b SHA1 f7b4cdf1aebad87fdc75cc76c80e11b3217cd35e SHA256 0974cce5f53b85b7696c25b9beddc08da52cbfd357d85180fe32ee40bc95e8d7
-MISC ChangeLog 3428 RMD160 984780461572dbd05a27f7f179b43ac7c9ffc385 SHA1 8575f4027338fe2aa93faa13839720e7d0fe660d SHA256 7522a9944787b87547d624baf616511d3aeeeac0d58dee37fcc553f84e32ffb1
+EBUILD libmirage-1.5.0-r1.ebuild 1073 RMD160 901d9155e93e21f41cde2df33ef0462e1050f9ec SHA1 ac2e668edfbb71e6e8324e0e7dac4153e54b89eb SHA256 cdeb42236a46c31c7e6ae3e4467a85a65b684a36360d046c2c437fd1d65b2a8a
+MISC ChangeLog 3831 RMD160 cfd16110bb7141adf39950efd0c78c0b528ee28e SHA1 939553123705fc8f1601411d672df115a7e6dae6 SHA256 4648073bdf9ed8b7e7405dc1dd5b0d3bd7f2097968778bd419183edf913a9ffe
MISC metadata.xml 240 RMD160 0e579a0eee987b510062c61fb213844574fee876 SHA1 0dcf565094dc7c485f71651d488cc41dfbca1132 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk8bWHkACgkQdjK8w9WeBnC3QgEAoiJzdukKo4Dp532vFziXbyAo
-euEzTkW0A+3kDhlmACoA/i1ZpkJ+K4+CfGfkSO3j4m0t+Sp+kYepjXpuhorStwki
-=llNg
+iF4EAREIAAYFAk8gRW0ACgkQdjK8w9WeBnDY1QEAoxVSV0xzbzvaXeqeXxu+8YlO
+O2yDuY0spYkTZCMrnYkA/26i8lSEdfvIaWzaB5I8MOLAyjj+4JW2ZLjQUqsDTCQ2
+=vwmL
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libmirage/files/libmirage-1.5.0-gtk-doc.patch b/dev-libs/libmirage/files/libmirage-1.5.0-gtk-doc.patch
new file mode 100644
index 000000000000..1ecbe3113edd
--- /dev/null
+++ b/dev-libs/libmirage/files/libmirage-1.5.0-gtk-doc.patch
@@ -0,0 +1,32 @@
+From 2d4b5e248cbcc3ebe64577dc29cf8756926ddf7e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 25 Jan 2012 11:26:55 -0500
+Subject: [PATCH] libMirage: configure: do not check for gtk-doc.pc
+
+GTK_DOC_CHECK is sufficient. The unusual gtk-doc.pc-based check
+needlessly prevents libmirage from configuring with --disable-gtk-doc
+(which is the default) if the full gtk-doc package is not installed.
+---
+ libmirage/configure.ac | 6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
+
+diff --git a/libmirage/configure.ac b/libmirage/configure.ac
+index e74b0a0..3224f59 100644
+--- a/libmirage/configure.ac
++++ b/libmirage/configure.ac
+@@ -57,12 +57,6 @@ AC_HEADER_STDC
+ AC_SYS_LARGEFILE
+
+ # Gtk-doc check
+-PKG_CHECK_EXISTS(gtk-doc >= 1.4, [have_gtkdoc="yes"], [have_gtkdoc="no"])
+-AC_MSG_CHECKING([for gtk-doc])
+-AC_MSG_RESULT(${have_gtkdoc})
+-if test ${have_gtkdoc} = "no"; then
+- AC_MSG_ERROR("*** gtk-doc not found ***")
+-fi
+ GTK_DOC_CHECK([1.4])
+
+ # Libraries check
+--
+1.7.8.4
+
diff --git a/dev-libs/libmirage/files/libmirage-1.5.0-session-initialize-language.patch b/dev-libs/libmirage/files/libmirage-1.5.0-session-initialize-language.patch
new file mode 100644
index 000000000000..88bebafccd11
--- /dev/null
+++ b/dev-libs/libmirage/files/libmirage-1.5.0-session-initialize-language.patch
@@ -0,0 +1,25 @@
+From becadab262724fa9b6652581bfa121b9eb738a21 Mon Sep 17 00:00:00 2001
+From: Rok Mandeljc <rok.mandeljc@gmail.com>
+Date: Sun, 22 Jan 2012 18:25:54 +0100
+Subject: [PATCH] libMirage: Session: initialize pointer
+
+---
+ libmirage/src/libmirage/mirage-session.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libmirage/src/libmirage/mirage-session.c b/libmirage/src/libmirage/mirage-session.c
+index 7eb6ba9..1c42e9e 100644
+--- a/libmirage/src/libmirage/mirage-session.c
++++ b/libmirage/src/libmirage/mirage-session.c
+@@ -1404,7 +1404,7 @@ gboolean mirage_session_for_each_language (MIRAGE_Session *self, MIRAGE_Callback
+ static gboolean set_cdtext_data (gint langcode, gint type, gint track, guint8 *data, gint len, MIRAGE_Session *self)
+ {
+ gboolean succeeded;
+- GObject *language;
++ GObject *language = NULL;
+
+ if (track == 0) {
+ /* Session */
+--
+1.7.8.4
+
diff --git a/dev-libs/libmirage/libmirage-1.5.0.ebuild b/dev-libs/libmirage/libmirage-1.5.0-r1.ebuild
index da64172d3307..b5f1717e7fa8 100644
--- a/dev-libs/libmirage/libmirage-1.5.0.ebuild
+++ b/dev-libs/libmirage/libmirage-1.5.0-r1.ebuild
@@ -1,9 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-1.5.0.ebuild,v 1.1 2012/01/22 00:29:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmirage/libmirage-1.5.0-r1.ebuild,v 1.1 2012/01/25 18:09:44 tetromino Exp $
EAPI="4"
+inherit autotools eutils
+
DESCRIPTION="CD and DVD image access library"
HOMEPAGE="http://cdemu.org"
SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
@@ -17,7 +19,18 @@ RDEPEND=">=dev-libs/glib-2.28:2
>=media-libs/libsndfile-1.0
sys-libs/zlib"
DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
dev-util/pkgconfig"
+# eautoreconf needs dev-util/gtk-doc-am
+
+src_prepare() {
+ # In next release, prevents mirage_session_add_language() crash
+ epatch "${FILESDIR}/${P}-session-initialize-language.patch"
+
+ # bug #399701, https://sourceforge.net/tracker/?func=detail&aid=3479700&group_id=93175&atid=603423
+ epatch "${FILESDIR}/${P}-gtk-doc.patch"
+ eautoreconf
+}
src_configure() {
econf \