rpms/kbibtex/FC-6 kbibtex-0.1.5-filteredselection.patch, NONE, 1.1 kbibtex-0.1.5-gcc4.2.patch, NONE, 1.1 kbibtex-0.1.5-viewdocument.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 kbibtex.spec, 1.6, 1.7 sources, 1.4, 1.5
Christian Nolte (noltec)
fedora-extras-commits at redhat.com
Tue Dec 5 22:37:51 UTC 2006
Author: noltec
Update of /cvs/extras/rpms/kbibtex/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26169
Modified Files:
.cvsignore kbibtex.spec sources
Added Files:
kbibtex-0.1.5-filteredselection.patch
kbibtex-0.1.5-gcc4.2.patch kbibtex-0.1.5-viewdocument.patch
Log Message:
- Synced with devel branch to fix BUG #216007
kbibtex-0.1.5-filteredselection.patch:
--- NEW FILE kbibtex-0.1.5-filteredselection.patch ---
Index: src/documentlistview.cpp
===================================================================
--- src/documentlistview.cpp (Revision 301)
+++ src/documentlistview.cpp (Revision 302)
@@ -221,10 +221,13 @@
while ( it.current() )
{
DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
- m_bibtexFile->deleteElement( kblvi->element() );
- it++;
- takeItem( kblvi );
- delete ( kblvi );
+ if ( kblvi->isVisible() )
+ {
+ m_bibtexFile->deleteElement( kblvi->element() );
+ it++;
+ takeItem( kblvi );
+ delete ( kblvi );
+ }
}
if ( above )
@@ -246,7 +249,7 @@
{
DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
BibTeX::Entry *entry = dynamic_cast<BibTeX::Entry*>( kblvi->element() );
- if ( entry != NULL )
+ if ( entry != NULL && kblvi->isVisible() )
{
if ( !refs.isEmpty() )
refs.append( "," );
@@ -621,7 +624,8 @@
while ( it.current() )
{
DocumentListViewItem * kblvi = dynamic_cast<DocumentListViewItem*>( it.current() );
- exporter->save( &buffer, kblvi->element() );
+ if ( kblvi->isVisible() )
+ exporter->save( &buffer, kblvi->element() );
it++;
}
delete exporter;
kbibtex-0.1.5-gcc4.2.patch:
--- NEW FILE kbibtex-0.1.5-gcc4.2.patch ---
Index: src/fileimporter.h
===================================================================
--- src/fileimporter.h (Revision 307)
+++ src/fileimporter.h (Arbeitskopie)
@@ -39,7 +39,7 @@
~FileImporter();
File* load ( const QString& text );
- virtual File* load( QIODevice *iodevice ) = NULL;
+ virtual File* load( QIODevice *iodevice ) = 0;
static bool guessCanDecode( const QString & ) { return FALSE; };
kbibtex-0.1.5-viewdocument.patch:
--- NEW FILE kbibtex-0.1.5-viewdocument.patch ---
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 ) ] );
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 18 Oct 2006 12:05:17 -0000 1.4
+++ .cvsignore 5 Dec 2006 22:37:21 -0000 1.5
@@ -1 +1,4 @@
kbibtex-0.1.5.tar.bz2
+kbibtex-0.1.5-filteredselection.patch
+kbibtex-0.1.5-gcc4.2.patch
+kbibtex-0.1.5-viewdocument.patch
Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-6/kbibtex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kbibtex.spec 18 Oct 2006 12:05:17 -0000 1.6
+++ kbibtex.spec 5 Dec 2006 22:37:21 -0000 1.7
@@ -1,12 +1,15 @@
Name: kbibtex
Version: 0.1.5
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: A BibTeX editor for KDE
Group: Applications/Editors
License: GPL
URL: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
Source0: http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
+Patch0: kbibtex-0.1.5-filteredselection.patch
+Patch1: kbibtex-0.1.5-gcc4.2.patch
+Patch2: kbibtex-0.1.5-viewdocument.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -19,7 +22,9 @@
%prep
%setup -q
-
+%patch0 -p0 -b .filteredselection
+%patch1 -p0 -b .gcc4.2
+%patch2 -p0 -b .viewdocument
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -36,15 +41,15 @@
#
# Replace original .desktop files with proper ones
#
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
- --delete-original \
+desktop-file-install --vendor fedora \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --add-category X-Fedora \
+ --delete-original \
${RPM_BUILD_ROOT}%{_datadir}/services/kbibtex_part.desktop
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
+desktop-file-install --vendor fedora \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --add-category X-Fedora \
--delete-original \
${RPM_BUILD_ROOT}%{_datadir}/applnk/Office/kbibtex.desktop
@@ -114,6 +119,12 @@
%{_datadir}/applications/fedora-kbibtex_part.desktop
%changelog
+* Tue Dec 05 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-4
+- Bumped release ver. to solve the violated upgrade path (BUG #216007)
+
+* Sun Oct 29 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-2
+- latest released patches (filteredselection,gcc4.2,viewdocument)
+
* Wed Oct 18 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.5-1
- Update to 0.1.5
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 18 Oct 2006 12:05:17 -0000 1.4
+++ sources 5 Dec 2006 22:37:21 -0000 1.5
@@ -1 +1,4 @@
83a8c1cade06837431b6ebe79d13ef7b kbibtex-0.1.5.tar.bz2
+bb97a4924c4bea973ea02800e699d701 kbibtex-0.1.5-filteredselection.patch
+2d94fa24173073a02948d66946df60c0 kbibtex-0.1.5-gcc4.2.patch
+afe161f8783346b3606dfd5a337918ac kbibtex-0.1.5-viewdocument.patch
More information about the scm-commits
mailing list