Patch to fix an error, see bug #155113

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 109 insertions, 15 deletions

diff --git a/app-text/kbibtex/ChangeLog b/app-text/kbibtex/ChangeLog
index 7077b2d98c86..e65ce4e81adc 100644
--- a/app-text/kbibtex/ChangeLog
+++ b/app-text/kbibtex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/kbibtex
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/ChangeLog,v 1.15 2006/11/01 15:05:33 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/ChangeLog,v 1.16 2006/11/14 17:54:12 caleb Exp $
+
+*kbibtex-0.1.5-r1 (14 Nov 2006)
+
+  14 Nov 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/kbibtex-0.1.5-viewdocument.patch, +kbibtex-0.1.5-r1.ebuild:
+  Patch to fix an error, see bug #155113
 
   01 Nov 2006; Marcus D. Hanwell <cryos@gentoo.org> -kbibtex-0.1.4.ebuild:
   Removed old version.
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 5524d49236d6..80907582b72a 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,15 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kbibtex-0.1.5-viewdocument.patch 2446 RMD160 21e847435e775e8a22df68e1c099c66a5e61a79a SHA1 ca29fa5428494c9509d924543b0e915c07281075 SHA256 cd3bac08ce1d01bc0c37181ffaca63769e4cb702bb8a3fc57efd3dacaf4e2631
+MD5 afe161f8783346b3606dfd5a337918ac files/kbibtex-0.1.5-viewdocument.patch 2446
+RMD160 21e847435e775e8a22df68e1c099c66a5e61a79a files/kbibtex-0.1.5-viewdocument.patch 2446
+SHA256 cd3bac08ce1d01bc0c37181ffaca63769e4cb702bb8a3fc57efd3dacaf4e2631 files/kbibtex-0.1.5-viewdocument.patch 2446
 DIST kbibtex-0.1.5.tar.bz2 556109 RMD160 7a7c6ce9ff4b392104e0b35eb888eaa7e7a20383 SHA1 a89331c3d9621995d9cd8f91fae470237ea2eca4 SHA256 588cbd5055c0baea950263c8d768c13c69ef72c54543137dea4d88fb7e4f8f13
+EBUILD kbibtex-0.1.5-r1.ebuild 706 RMD160 7681caee02d21f13df1229ef9b6e94b3d6c73acd SHA1 a89d6ce2dfad34f936f65651667f1166d5141baa SHA256 a26e6f095d265e22831c5ec2b4dfb598fb222cb069d6367adee5ff825b4714c3
+MD5 827020f7048fd34be1609d21d35a598b kbibtex-0.1.5-r1.ebuild 706
+RMD160 7681caee02d21f13df1229ef9b6e94b3d6c73acd kbibtex-0.1.5-r1.ebuild 706
+SHA256 a26e6f095d265e22831c5ec2b4dfb598fb222cb069d6367adee5ff825b4714c3 kbibtex-0.1.5-r1.ebuild 706
 EBUILD kbibtex-0.1.5.ebuild 608 RMD160 d4624b04e45a01b29006ddd2730ecfc46eb7c030 SHA1 2e7e1de516b868858c5bab5afd4a471ca82a2049 SHA256 03cf818bd0f61dc3feef27b17d86ac817caa9fc742fcabcfd7cdf2660ecc5c1a
 MD5 d154867580ab80723240f15d97b7e6b7 kbibtex-0.1.5.ebuild 608
 RMD160 d4624b04e45a01b29006ddd2730ecfc46eb7c030 kbibtex-0.1.5.ebuild 608
 SHA256 03cf818bd0f61dc3feef27b17d86ac817caa9fc742fcabcfd7cdf2660ecc5c1a kbibtex-0.1.5.ebuild 608
-MISC ChangeLog 2366 RMD160 44627dcb44b2165af5e9c3e8520557e1c7c41cb3 SHA1 99ece48876cb3cba7e722f5c8a172aafd737a3c2 SHA256 05019a45536c88adeb10f039e21c290bdb85dd79b00674b77ec3ac4ef524d0a5
-MD5 f031622bd0cb1fb5d7835856abf34eb8 ChangeLog 2366
-RMD160 44627dcb44b2165af5e9c3e8520557e1c7c41cb3 ChangeLog 2366
-SHA256 05019a45536c88adeb10f039e21c290bdb85dd79b00674b77ec3ac4ef524d0a5 ChangeLog 2366
+MISC ChangeLog 2557 RMD160 5a73f1027694c96b4ac30e6ff8b0c9d205f5d132 SHA1 d04811d5bf9dae332dc9db67fc8060f53f258835 SHA256 ed1e4c3ed3520b1e9caee349102b8c932c0c2f8ce87f3540ff6f5a8acf3c33dc
+MD5 8c0ecd434a015d77420c168f68a035e2 ChangeLog 2557
+RMD160 5a73f1027694c96b4ac30e6ff8b0c9d205f5d132 ChangeLog 2557
+SHA256 ed1e4c3ed3520b1e9caee349102b8c932c0c2f8ce87f3540ff6f5a8acf3c33dc ChangeLog 2557
 MISC metadata.xml 408 RMD160 5ef8f5474f5f8f6120ad041015ba55ec8d890ca9 SHA1 7a8f9ffd0bc2878e664289478b887c57c32561e4 SHA256 46b1b928281ac18a06115173b246580b95e0cc9724ec7e9a9dfc757925bfb0b6
 MD5 636e395cdc2eb9b72ab00fa7ea45ad0f metadata.xml 408
 RMD160 5ef8f5474f5f8f6120ad041015ba55ec8d890ca9 metadata.xml 408
@@ -17,10 +22,6 @@ SHA256 46b1b928281ac18a06115173b246580b95e0cc9724ec7e9a9dfc757925bfb0b6 metadata
 MD5 d43c6632ddec01532dd535c7502de8e5 files/digest-kbibtex-0.1.5 244
 RMD160 edfde7c0e0b295fb9ed762450ced06986ca78cfb files/digest-kbibtex-0.1.5 244
 SHA256 8abf5b53527bc6f0e26c7025014a20420a7f91e9ef37f5677a4c5044823ee8a3 files/digest-kbibtex-0.1.5 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFSLfHntT9W3vfTuoRAojXAKCx8O3gda8twwNEZgiZDs89CuPPGACfRiRk
-K384DRZX1oG1yRTAzJhQ9r4=
-=UhDH
------END PGP SIGNATURE-----
+MD5 d43c6632ddec01532dd535c7502de8e5 files/digest-kbibtex-0.1.5-r1 244
+RMD160 edfde7c0e0b295fb9ed762450ced06986ca78cfb files/digest-kbibtex-0.1.5-r1 244
+SHA256 8abf5b53527bc6f0e26c7025014a20420a7f91e9ef37f5677a4c5044823ee8a3 files/digest-kbibtex-0.1.5-r1 244
diff --git a/app-text/kbibtex/files/digest-kbibtex-0.1.5-r1 b/app-text/kbibtex/files/digest-kbibtex-0.1.5-r1
new file mode 100644
index 000000000000..c1bbfb4304e4
--- /dev/null
+++ b/app-text/kbibtex/files/digest-kbibtex-0.1.5-r1
@@ -0,0 +1,3 @@
+MD5 83a8c1cade06837431b6ebe79d13ef7b kbibtex-0.1.5.tar.bz2 556109
+RMD160 7a7c6ce9ff4b392104e0b35eb888eaa7e7a20383 kbibtex-0.1.5.tar.bz2 556109
+SHA256 588cbd5055c0baea950263c8d768c13c69ef72c54543137dea4d88fb7e4f8f13 kbibtex-0.1.5.tar.bz2 556109
diff --git a/app-text/kbibtex/files/kbibtex-0.1.5-viewdocument.patch b/app-text/kbibtex/files/kbibtex-0.1.5-viewdocument.patch
new file mode 100644
index 000000000000..f00aceb5d319
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.1.5-viewdocument.patch
@@ -0,0 +1,56 @@
+Index: src/documentwidget.h
+===================================================================
+--- src/documentwidget.h	(Revision 308)
++++ src/documentwidget.h	(Revision 310)
+@@ -106,6 +106,7 @@
+         int m_newElementCounter;
+         EditMode m_editMode;
+         KActionMenu *m_viewDocumentActionMenu;
++        QStringList m_viewDocumentActionMenuURLs;
+         KActionMenu *m_searchWebsitesActionMenu;
+         KAction *m_find;
+         KAction *m_findNext;
+Index: src/documentwidget.cpp
+===================================================================
+--- src/documentwidget.cpp	(Revision 308)
++++ src/documentwidget.cpp	(Revision 310)
+@@ -471,13 +471,13 @@
+         m_listViewElements->setFactory( factory, client );
+         m_sourceView->setFactory( factory, client );
+ 
++        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
+         if ( m_viewDocumentActionMenu != NULL )
+             connect( m_viewDocumentActionMenu->popupMenu(), SIGNAL( activated( int ) ), this, SLOT( slotViewDocument( int ) ) );
+ 
+         m_copyReference = client->action( "edit_copyref" );
+         m_find = client->action( "edit_find" );
+         m_findNext = client->action( "edit_find_next" );
+-        m_viewDocumentActionMenu = dynamic_cast<KActionMenu*>( client->action( "view_document" ) );
+         m_listViewElements->setViewShowColumnsMenu( dynamic_cast<KActionMenu*>( client->action( "view_showcolumns" ) ) );
+         m_searchWebsitesActionMenu = dynamic_cast<KActionMenu*>( client->action( "search_document_online" ) );
+     }
+@@ -486,6 +486,7 @@
+     {
+         KPopupMenu * popup = m_viewDocumentActionMenu->popupMenu();
+         popup->clear();
++        m_viewDocumentActionMenuURLs.clear();
+ 
+         BibTeX::Element * currentElement = NULL;
+ 
+@@ -517,6 +518,7 @@
+                         popup->insertItem( SmallIcon( "html" ), prettyURL );
+                     else
+                         popup->insertItem( prettyURL );
++                    m_viewDocumentActionMenuURLs.append( prettyURL );
+                 }
+                 m_viewDocumentActionMenu->setEnabled( TRUE );
+             }
+@@ -908,7 +910,7 @@
+ 
+     void DocumentWidget::slotViewDocument( int id )
+     {
+-        kapp->invokeBrowser( m_viewDocumentActionMenu->popupMenu() ->text( id ) );
++        kapp->invokeBrowser( m_viewDocumentActionMenuURLs[ m_viewDocumentActionMenu->popupMenu() ->indexOf( id ) ] );
+     }
+ 
+ }
diff --git a/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild b/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..243052f147ad
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kbibtex/kbibtex-0.1.5-r1.ebuild,v 1.1 2006/11/14 17:54:12 caleb Exp $
+
+inherit kde eutils
+
+DESCRIPTION="BibTeX editor for KDE"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~fischer/kbibtex/"
+SRC_URI="http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/libxml2-2.6.22
+	>=dev-libs/libxslt-1.1.15"
+RDEPEND="${DEPEND}
+	virtual/tetex
+	>=dev-tex/bibtex2html-1.70"
+
+need-kde 3.3
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} 
+	epatch ${FILESDIR}/kbibtex-0.1.5-viewdocument.patch 
+}