diff options
author | znerd <znerd@FreeBSD.org> | 2003-07-09 17:25:46 +0800 |
---|---|---|
committer | znerd <znerd@FreeBSD.org> | 2003-07-09 17:25:46 +0800 |
commit | 532f65050a0521b9bef3141694ecab7110650417 (patch) | |
tree | 59b94cd5a48d2ff26fc9064136d2837c156b86f5 /misc | |
parent | f3f437cb4c6d52b04ac4703afa238d99f71ec1d1 (diff) | |
download | freebsd-ports-gnome-532f65050a0521b9bef3141694ecab7110650417.tar.gz freebsd-ports-gnome-532f65050a0521b9bef3141694ecab7110650417.tar.zst freebsd-ports-gnome-532f65050a0521b9bef3141694ecab7110650417.zip |
Unbroken and updated to 1.2.2.
Approved by: MAINTAINER
Diffstat (limited to 'misc')
24 files changed, 4 insertions, 280 deletions
diff --git a/misc/bibletime-devel/Makefile b/misc/bibletime-devel/Makefile index c91c4ecd6b5f..555e54941462 100644 --- a/misc/bibletime-devel/Makefile +++ b/misc/bibletime-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= wvengen@stack.nl COMMENT= A powerful Bible study application for KDE3 -BROKEN= "Does not compile" - LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword .if !defined(NOPORTDOCS) RUN_DEPENDS= ${LOCALBASE}/share/doc/HTML/en/bibletime:${PORTSDIR}/misc/bibletime-doc diff --git a/misc/bibletime-devel/files/patch-Makefile.am b/misc/bibletime-devel/files/patch-Makefile.am deleted file mode 100644 index 0100057ac34c..000000000000 --- a/misc/bibletime-devel/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig Fri May 3 11:30:38 2002 -+++ Makefile.am Fri May 3 11:32:30 2002 -@@ -32,7 +32,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - MAINTAINERCLEANFILES = configure.files subdirs - diff --git a/misc/bibletime-devel/files/patch-Makefile.in b/misc/bibletime-devel/files/patch-Makefile.in deleted file mode 100644 index fe46c70fd628..000000000000 --- a/misc/bibletime-devel/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri May 3 11:30:38 2002 -+++ Makefile.in Fri May 3 11:32:25 2002 -@@ -597,7 +597,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - dist-hook: - cd $(distdir) && make -f Makefile.cvs diff --git a/misc/bibletime-devel/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp b/misc/bibletime-devel/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp deleted file mode 100644 index 95477bbb2942..000000000000 --- a/misc/bibletime-devel/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN bibletime/backend/cswordbookmoduleinfo.cpp bibletime/backend/cswordbookmoduleinfo.cpp ---- bibletime/backend/cswordbookmoduleinfo.cpp Sun Apr 7 01:12:21 2002 -+++ bibletime/backend/cswordbookmoduleinfo.cpp Wed Jun 19 17:31:40 2002 -@@ -18,6 +18,9 @@ - //BibleTime includes - #include "cswordbookmoduleinfo.h" - -+//Other includes -+#include <iostream.h> -+ - //Sword includes - #include <treekeyidx.h> - #include <treekey.h> diff --git a/misc/bibletime-devel/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp b/misc/bibletime-devel/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp deleted file mode 100644 index 209520e81ffa..000000000000 --- a/misc/bibletime-devel/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN bibletime/frontend/searchdialog/csearchdialog.cpp bibletime/frontend/searchdialog/csearchdialog.cpp ---- bibletime/frontend/searchdialog/csearchdialog.cpp Sat Apr 20 02:25:39 2002 -+++ bibletime/frontend/searchdialog/csearchdialog.cpp Thu Jun 20 09:24:54 2002 -@@ -114,7 +114,7 @@ - } - - void CSearchDialog::setModuleList(ListCSwordModuleInfo& list) { -- if (m_moduleList != list) -+ if (! (m_moduleList == list) ) - m_moduleList = list; //copy the items of "list" - - m_moduleChooser->blockSignals(true); diff --git a/misc/bibletime-devel/files/patch-bibletime::printing::cprintdialogpages.cpp b/misc/bibletime-devel/files/patch-bibletime::printing::cprintdialogpages.cpp deleted file mode 100644 index f92537c285fc..000000000000 --- a/misc/bibletime-devel/files/patch-bibletime::printing::cprintdialogpages.cpp +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN bibletime/printing/cprintdialogpages.cpp bibletime/printing/cprintdialogpages.cpp ---- bibletime/printing/cprintdialogpages.cpp Fri Apr 12 13:41:32 2002 -+++ bibletime/printing/cprintdialogpages.cpp Thu Jun 20 00:24:38 2002 -@@ -54,14 +54,14 @@ - QGridLayout *gbox = new QGridLayout( group, 4, 2, 5, 5 ); - gbox->addRowSpacing( 0, group->fontMetrics().height()-5 ); - -- const QString name[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; -+ const QString nname[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; - for( int i=0; i<4; i++ ) { - m_marginSpin[i] = new QSpinBox( group ); - m_marginSpin[i]->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - m_marginSpin[i]->setMinimumWidth( m_marginSpin[i]->fontMetrics().width("M")*10 ); - m_marginSpin[i]->setSuffix(" mm"); - -- QLabel *label = new QLabel( m_marginSpin[i], name[i], group ); -+ QLabel *label = new QLabel( m_marginSpin[i], nname[i], group ); - label->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - label->setFixedWidth( label->sizeHint().width() ); - diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile index c91c4ecd6b5f..555e54941462 100644 --- a/misc/bibletime-kde3/Makefile +++ b/misc/bibletime-kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= wvengen@stack.nl COMMENT= A powerful Bible study application for KDE3 -BROKEN= "Does not compile" - LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword .if !defined(NOPORTDOCS) RUN_DEPENDS= ${LOCALBASE}/share/doc/HTML/en/bibletime:${PORTSDIR}/misc/bibletime-doc diff --git a/misc/bibletime-kde3/files/patch-Makefile.am b/misc/bibletime-kde3/files/patch-Makefile.am deleted file mode 100644 index 0100057ac34c..000000000000 --- a/misc/bibletime-kde3/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig Fri May 3 11:30:38 2002 -+++ Makefile.am Fri May 3 11:32:30 2002 -@@ -32,7 +32,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - MAINTAINERCLEANFILES = configure.files subdirs - diff --git a/misc/bibletime-kde3/files/patch-Makefile.in b/misc/bibletime-kde3/files/patch-Makefile.in deleted file mode 100644 index fe46c70fd628..000000000000 --- a/misc/bibletime-kde3/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri May 3 11:30:38 2002 -+++ Makefile.in Fri May 3 11:32:25 2002 -@@ -597,7 +597,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - dist-hook: - cd $(distdir) && make -f Makefile.cvs diff --git a/misc/bibletime-kde3/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp b/misc/bibletime-kde3/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp deleted file mode 100644 index 95477bbb2942..000000000000 --- a/misc/bibletime-kde3/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN bibletime/backend/cswordbookmoduleinfo.cpp bibletime/backend/cswordbookmoduleinfo.cpp ---- bibletime/backend/cswordbookmoduleinfo.cpp Sun Apr 7 01:12:21 2002 -+++ bibletime/backend/cswordbookmoduleinfo.cpp Wed Jun 19 17:31:40 2002 -@@ -18,6 +18,9 @@ - //BibleTime includes - #include "cswordbookmoduleinfo.h" - -+//Other includes -+#include <iostream.h> -+ - //Sword includes - #include <treekeyidx.h> - #include <treekey.h> diff --git a/misc/bibletime-kde3/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp b/misc/bibletime-kde3/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp deleted file mode 100644 index 209520e81ffa..000000000000 --- a/misc/bibletime-kde3/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN bibletime/frontend/searchdialog/csearchdialog.cpp bibletime/frontend/searchdialog/csearchdialog.cpp ---- bibletime/frontend/searchdialog/csearchdialog.cpp Sat Apr 20 02:25:39 2002 -+++ bibletime/frontend/searchdialog/csearchdialog.cpp Thu Jun 20 09:24:54 2002 -@@ -114,7 +114,7 @@ - } - - void CSearchDialog::setModuleList(ListCSwordModuleInfo& list) { -- if (m_moduleList != list) -+ if (! (m_moduleList == list) ) - m_moduleList = list; //copy the items of "list" - - m_moduleChooser->blockSignals(true); diff --git a/misc/bibletime-kde3/files/patch-bibletime::printing::cprintdialogpages.cpp b/misc/bibletime-kde3/files/patch-bibletime::printing::cprintdialogpages.cpp deleted file mode 100644 index f92537c285fc..000000000000 --- a/misc/bibletime-kde3/files/patch-bibletime::printing::cprintdialogpages.cpp +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN bibletime/printing/cprintdialogpages.cpp bibletime/printing/cprintdialogpages.cpp ---- bibletime/printing/cprintdialogpages.cpp Fri Apr 12 13:41:32 2002 -+++ bibletime/printing/cprintdialogpages.cpp Thu Jun 20 00:24:38 2002 -@@ -54,14 +54,14 @@ - QGridLayout *gbox = new QGridLayout( group, 4, 2, 5, 5 ); - gbox->addRowSpacing( 0, group->fontMetrics().height()-5 ); - -- const QString name[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; -+ const QString nname[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; - for( int i=0; i<4; i++ ) { - m_marginSpin[i] = new QSpinBox( group ); - m_marginSpin[i]->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - m_marginSpin[i]->setMinimumWidth( m_marginSpin[i]->fontMetrics().width("M")*10 ); - m_marginSpin[i]->setSuffix(" mm"); - -- QLabel *label = new QLabel( m_marginSpin[i], name[i], group ); -+ QLabel *label = new QLabel( m_marginSpin[i], nname[i], group ); - label->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - label->setFixedWidth( label->sizeHint().width() ); - diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile index c91c4ecd6b5f..555e54941462 100644 --- a/misc/bibletime-kde4/Makefile +++ b/misc/bibletime-kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= wvengen@stack.nl COMMENT= A powerful Bible study application for KDE3 -BROKEN= "Does not compile" - LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword .if !defined(NOPORTDOCS) RUN_DEPENDS= ${LOCALBASE}/share/doc/HTML/en/bibletime:${PORTSDIR}/misc/bibletime-doc diff --git a/misc/bibletime-kde4/files/patch-Makefile.am b/misc/bibletime-kde4/files/patch-Makefile.am deleted file mode 100644 index 0100057ac34c..000000000000 --- a/misc/bibletime-kde4/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig Fri May 3 11:30:38 2002 -+++ Makefile.am Fri May 3 11:32:30 2002 -@@ -32,7 +32,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - MAINTAINERCLEANFILES = configure.files subdirs - diff --git a/misc/bibletime-kde4/files/patch-Makefile.in b/misc/bibletime-kde4/files/patch-Makefile.in deleted file mode 100644 index fe46c70fd628..000000000000 --- a/misc/bibletime-kde4/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri May 3 11:30:38 2002 -+++ Makefile.in Fri May 3 11:32:25 2002 -@@ -597,7 +597,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - dist-hook: - cd $(distdir) && make -f Makefile.cvs diff --git a/misc/bibletime-kde4/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp b/misc/bibletime-kde4/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp deleted file mode 100644 index 95477bbb2942..000000000000 --- a/misc/bibletime-kde4/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN bibletime/backend/cswordbookmoduleinfo.cpp bibletime/backend/cswordbookmoduleinfo.cpp ---- bibletime/backend/cswordbookmoduleinfo.cpp Sun Apr 7 01:12:21 2002 -+++ bibletime/backend/cswordbookmoduleinfo.cpp Wed Jun 19 17:31:40 2002 -@@ -18,6 +18,9 @@ - //BibleTime includes - #include "cswordbookmoduleinfo.h" - -+//Other includes -+#include <iostream.h> -+ - //Sword includes - #include <treekeyidx.h> - #include <treekey.h> diff --git a/misc/bibletime-kde4/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp b/misc/bibletime-kde4/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp deleted file mode 100644 index 209520e81ffa..000000000000 --- a/misc/bibletime-kde4/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN bibletime/frontend/searchdialog/csearchdialog.cpp bibletime/frontend/searchdialog/csearchdialog.cpp ---- bibletime/frontend/searchdialog/csearchdialog.cpp Sat Apr 20 02:25:39 2002 -+++ bibletime/frontend/searchdialog/csearchdialog.cpp Thu Jun 20 09:24:54 2002 -@@ -114,7 +114,7 @@ - } - - void CSearchDialog::setModuleList(ListCSwordModuleInfo& list) { -- if (m_moduleList != list) -+ if (! (m_moduleList == list) ) - m_moduleList = list; //copy the items of "list" - - m_moduleChooser->blockSignals(true); diff --git a/misc/bibletime-kde4/files/patch-bibletime::printing::cprintdialogpages.cpp b/misc/bibletime-kde4/files/patch-bibletime::printing::cprintdialogpages.cpp deleted file mode 100644 index f92537c285fc..000000000000 --- a/misc/bibletime-kde4/files/patch-bibletime::printing::cprintdialogpages.cpp +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN bibletime/printing/cprintdialogpages.cpp bibletime/printing/cprintdialogpages.cpp ---- bibletime/printing/cprintdialogpages.cpp Fri Apr 12 13:41:32 2002 -+++ bibletime/printing/cprintdialogpages.cpp Thu Jun 20 00:24:38 2002 -@@ -54,14 +54,14 @@ - QGridLayout *gbox = new QGridLayout( group, 4, 2, 5, 5 ); - gbox->addRowSpacing( 0, group->fontMetrics().height()-5 ); - -- const QString name[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; -+ const QString nname[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; - for( int i=0; i<4; i++ ) { - m_marginSpin[i] = new QSpinBox( group ); - m_marginSpin[i]->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - m_marginSpin[i]->setMinimumWidth( m_marginSpin[i]->fontMetrics().width("M")*10 ); - m_marginSpin[i]->setSuffix(" mm"); - -- QLabel *label = new QLabel( m_marginSpin[i], name[i], group ); -+ QLabel *label = new QLabel( m_marginSpin[i], nname[i], group ); - label->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - label->setFixedWidth( label->sizeHint().width() ); - diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile index c91c4ecd6b5f..555e54941462 100644 --- a/misc/bibletime/Makefile +++ b/misc/bibletime/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bibletime -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= wvengen@stack.nl COMMENT= A powerful Bible study application for KDE3 -BROKEN= "Does not compile" - LIB_DEPENDS= sword.1:${PORTSDIR}/misc/sword .if !defined(NOPORTDOCS) RUN_DEPENDS= ${LOCALBASE}/share/doc/HTML/en/bibletime:${PORTSDIR}/misc/bibletime-doc diff --git a/misc/bibletime/files/patch-Makefile.am b/misc/bibletime/files/patch-Makefile.am deleted file mode 100644 index 0100057ac34c..000000000000 --- a/misc/bibletime/files/patch-Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig Fri May 3 11:30:38 2002 -+++ Makefile.am Fri May 3 11:32:30 2002 -@@ -32,7 +32,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - MAINTAINERCLEANFILES = configure.files subdirs - diff --git a/misc/bibletime/files/patch-Makefile.in b/misc/bibletime/files/patch-Makefile.in deleted file mode 100644 index fe46c70fd628..000000000000 --- a/misc/bibletime/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Fri May 3 11:30:38 2002 -+++ Makefile.in Fri May 3 11:32:25 2002 -@@ -597,7 +597,7 @@ - cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files - - install-data-local: -- chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R -+ chmod -R 755 $(DESTDIR)$(kde_datadir)/bibletime - - dist-hook: - cd $(distdir) && make -f Makefile.cvs diff --git a/misc/bibletime/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp b/misc/bibletime/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp deleted file mode 100644 index 95477bbb2942..000000000000 --- a/misc/bibletime/files/patch-bibletime::backend::cswordbookmoduleinfo.cpp +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN bibletime/backend/cswordbookmoduleinfo.cpp bibletime/backend/cswordbookmoduleinfo.cpp ---- bibletime/backend/cswordbookmoduleinfo.cpp Sun Apr 7 01:12:21 2002 -+++ bibletime/backend/cswordbookmoduleinfo.cpp Wed Jun 19 17:31:40 2002 -@@ -18,6 +18,9 @@ - //BibleTime includes - #include "cswordbookmoduleinfo.h" - -+//Other includes -+#include <iostream.h> -+ - //Sword includes - #include <treekeyidx.h> - #include <treekey.h> diff --git a/misc/bibletime/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp b/misc/bibletime/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp deleted file mode 100644 index 209520e81ffa..000000000000 --- a/misc/bibletime/files/patch-bibletime::frontend::searchdialog::csearchdialog.cpp +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN bibletime/frontend/searchdialog/csearchdialog.cpp bibletime/frontend/searchdialog/csearchdialog.cpp ---- bibletime/frontend/searchdialog/csearchdialog.cpp Sat Apr 20 02:25:39 2002 -+++ bibletime/frontend/searchdialog/csearchdialog.cpp Thu Jun 20 09:24:54 2002 -@@ -114,7 +114,7 @@ - } - - void CSearchDialog::setModuleList(ListCSwordModuleInfo& list) { -- if (m_moduleList != list) -+ if (! (m_moduleList == list) ) - m_moduleList = list; //copy the items of "list" - - m_moduleChooser->blockSignals(true); diff --git a/misc/bibletime/files/patch-bibletime::printing::cprintdialogpages.cpp b/misc/bibletime/files/patch-bibletime::printing::cprintdialogpages.cpp deleted file mode 100644 index f92537c285fc..000000000000 --- a/misc/bibletime/files/patch-bibletime::printing::cprintdialogpages.cpp +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN bibletime/printing/cprintdialogpages.cpp bibletime/printing/cprintdialogpages.cpp ---- bibletime/printing/cprintdialogpages.cpp Fri Apr 12 13:41:32 2002 -+++ bibletime/printing/cprintdialogpages.cpp Thu Jun 20 00:24:38 2002 -@@ -54,14 +54,14 @@ - QGridLayout *gbox = new QGridLayout( group, 4, 2, 5, 5 ); - gbox->addRowSpacing( 0, group->fontMetrics().height()-5 ); - -- const QString name[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; -+ const QString nname[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") }; - for( int i=0; i<4; i++ ) { - m_marginSpin[i] = new QSpinBox( group ); - m_marginSpin[i]->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - m_marginSpin[i]->setMinimumWidth( m_marginSpin[i]->fontMetrics().width("M")*10 ); - m_marginSpin[i]->setSuffix(" mm"); - -- QLabel *label = new QLabel( m_marginSpin[i], name[i], group ); -+ QLabel *label = new QLabel( m_marginSpin[i], nname[i], group ); - label->setFixedHeight( m_marginSpin[i]->sizeHint().height() ); - label->setFixedWidth( label->sizeHint().width() ); - |