From 9dffa2ed7b6ad215ff0452a549af77ab85b73b7d Mon Sep 17 00:00:00 2001 From: lofi Date: Tue, 12 Sep 2006 23:26:52 +0000 Subject: KDE 3.5.4 / KOffice 1.5.2 --- editors/koffice-kde3/Makefile | 2 +- editors/koffice-kde3/distinfo | 6 +- .../patch-kexi_kexidb_drivers_sqlite2-Makefile.in | 33 ----------- .../files/patch-kexi_plugins_forms-Makefile.in | 14 ----- .../files/patch-kexi_plugins_reports-Makefile.in | 42 -------------- .../patch-krita_plugins_filters_cimg-Makefile.in | 11 ---- editors/koffice-kde3/files/patch-post-1.5.1-kexi | 65 ---------------------- 7 files changed, 4 insertions(+), 169 deletions(-) delete mode 100644 editors/koffice-kde3/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in delete mode 100644 editors/koffice-kde3/files/patch-kexi_plugins_forms-Makefile.in delete mode 100644 editors/koffice-kde3/files/patch-kexi_plugins_reports-Makefile.in delete mode 100644 editors/koffice-kde3/files/patch-krita_plugins_filters_cimg-Makefile.in delete mode 100644 editors/koffice-kde3/files/patch-post-1.5.1-kexi (limited to 'editors/koffice-kde3') diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 3cb58dc11716..6f27fc720383 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo index 28b58c416210..746a0be2c24d 100644 --- a/editors/koffice-kde3/distinfo +++ b/editors/koffice-kde3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.5.1.tar.bz2) = 50897bd5dfd4eba8a0d78a02003a6ec9 -SHA256 (KDE/koffice/koffice-1.5.1.tar.bz2) = 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119 -SIZE (KDE/koffice/koffice-1.5.1.tar.bz2) = 36010120 +MD5 (KDE/koffice/koffice-1.5.2.tar.bz2) = cbe9deeb7c811a6bb5a954989b25c1f2 +SHA256 (KDE/koffice/koffice-1.5.2.tar.bz2) = d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611 +SIZE (KDE/koffice/koffice-1.5.2.tar.bz2) = 35878218 diff --git a/editors/koffice-kde3/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in b/editors/koffice-kde3/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in deleted file mode 100644 index 2a6b7ab620e5..000000000000 --- a/editors/koffice-kde3/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- kexi/kexidb/drivers/sqlite2/Makefile.in Wed May 17 12:07:36 2006 -+++ kexi/kexidb/drivers/sqlite2/Makefile.in Tue May 23 19:05:20 2006 -@@ -929,12 +929,6 @@ - uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kde_servicesDATA - -- --# we need the .mocs to be built --sqliteconnection.lo: ../sqlite/sqliteconnection.lo --sqlitecursor.lo: ../sqlite/sqlitecursor.lo --sqlitedriver.lo: ../sqlite/sqlitedriver.lo --sqlitepreparedstatement.lo: ../sqlite/sqlitepreparedstatement.lo - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -949,7 +943,7 @@ - - - #>+ 2 --KDE_DIST=sqlitecursor.h sqlitedriver.h sqliteconnection.h Makefile.in kexidb_sqlite2driver.desktop sqliteconnection_p.h sqlite2.pro Makefile.am -+KDE_DIST=sqlitecursor.h sqliteconnection.h sqlite2.pro Makefile.in kexidb_sqlite2driver.desktop Makefile.am sqliteconnection_p.h sqlitedriver.h - - #>+ 3 - clean-closures: -@@ -997,7 +991,7 @@ - - - #>+ 11 --kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp ../sqlite/sqliteconnection.lo $(srcdir)/sqlitedriver.cpp ../sqlite/sqlitedriver.lo $(srcdir)/sqlitecursor.cpp ../sqlite/sqlitecursor.lo $(srcdir)/sqlitepreparedstatement.cpp ../sqlite/sqlitepreparedstatement.lo -+kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp $(srcdir)/sqlitedriver.cpp $(srcdir)/sqlitecursor.cpp $(srcdir)/sqlitepreparedstatement.cpp - @echo 'creating kexidb_sqlite2driver_la.all_cpp.cpp ...'; \ - rm -f kexidb_sqlite2driver_la.all_cpp.files kexidb_sqlite2driver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kexidb_sqlite2driver_la.all_cpp.final; \ diff --git a/editors/koffice-kde3/files/patch-kexi_plugins_forms-Makefile.in b/editors/koffice-kde3/files/patch-kexi_plugins_forms-Makefile.in deleted file mode 100644 index 9dc40bb8226c..000000000000 --- a/editors/koffice-kde3/files/patch-kexi_plugins_forms-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- kexi/plugins/forms/Makefile.in.orig Sun May 21 14:54:47 2006 -+++ kexi/plugins/forms/Makefile.in Sun May 21 14:56:19 2006 -@@ -658,9 +658,10 @@ - kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ - kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp - --libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner diff --git a/editors/koffice-kde3/files/patch-kexi_plugins_reports-Makefile.in b/editors/koffice-kde3/files/patch-kexi_plugins_reports-Makefile.in deleted file mode 100644 index 75d9bb157887..000000000000 --- a/editors/koffice-kde3/files/patch-kexi_plugins_reports-Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ ---- kexi/plugins/reports/Makefile.in.orig Sun May 21 14:56:30 2006 -+++ kexi/plugins/reports/Makefile.in Sun May 21 15:02:13 2006 -@@ -65,16 +65,20 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) - kexihandler_report_la_DEPENDENCIES = ../../core/libkexicore.la \ -- ../../widget/utils/libkexiguiutils.la \ -- ../../widget/libkexiextendedwidgets.la \ -- ../../formeditor/libkformdesigner.la \ -- ../forms/libkexiformutils.la ./libkexireportutils.la -+ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ ./libkexireportutils.la - am_kexihandler_report_la_OBJECTS = kexireports.lo - #>- kexihandler_report_la_OBJECTS = $(am_kexihandler_report_la_OBJECTS) - #>+ 1 - kexihandler_report_la_OBJECTS = kexireports.lo - kexireportwidgets_la_DEPENDENCIES = \ - $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - ./libkexireportutils.la - am_kexireportwidgets_la_OBJECTS = reportwidgets.lo \ - kexireportfactory.lo -@@ -645,10 +649,12 @@ - libkexireportutils_la_SOURCES = \ - kexireportpart.cpp kexireportview.cpp kexireportform.cpp - --libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner - kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop diff --git a/editors/koffice-kde3/files/patch-krita_plugins_filters_cimg-Makefile.in b/editors/koffice-kde3/files/patch-krita_plugins_filters_cimg-Makefile.in deleted file mode 100644 index 7e5d73f256d8..000000000000 --- a/editors/koffice-kde3/files/patch-krita_plugins_filters_cimg-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- krita/plugins/filters/cimg/Makefile.in.orig Mon May 22 12:44:21 2006 -+++ krita/plugins/filters/cimg/Makefile.in Mon May 22 12:44:39 2006 -@@ -562,7 +562,7 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --KDE_CXXFLAGS = $(USE_EXCEPTIONS) -D_POSIX_C_SOURCE=199309L -+KDE_CXXFLAGS = $(USE_EXCEPTIONS) - kde_services_DATA = kritacimg.desktop - - # all_includes must remain last! diff --git a/editors/koffice-kde3/files/patch-post-1.5.1-kexi b/editors/koffice-kde3/files/patch-post-1.5.1-kexi deleted file mode 100644 index 798a3a872111..000000000000 --- a/editors/koffice-kde3/files/patch-post-1.5.1-kexi +++ /dev/null @@ -1,65 +0,0 @@ -Index: kexi/plugins/forms/kexidataprovider.cpp -=================================================================== ---- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) -+++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) -@@ -92,7 +92,8 @@ - for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); - it!=m_fieldNumbersForDataItems.constEnd(); ++it) - { -- kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; -+ kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() -+ << " data=" << row.at(it.data()) << endl; - it.key()->setValue( row.at(it.data()) ); - } - } -Index: kexi/plugins/forms/widgets/kexidbautofield.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) -@@ -446,8 +446,11 @@ - @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] - (see doc/dev/settings.txt) */ - if (!text.isEmpty()) { -- realText = text[0].upper(); -- realText += (text.mid(1) + ": "); -+ realText = text[0].upper() + text.mid(1); -+ if (m_widgetType!=Boolean) { -+//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label -+ realText += ": "; -+ } - } - } - else -Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) -@@ -27,7 +27,9 @@ - : QCheckBox(text, parent, name), KexiFormDataItemInterface() - { - m_invalidState = false; -+//! todo: tristate - setTristate(true); -+ setFocusPolicy(QWidget::StrongFocus); - connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); - } - -@@ -56,13 +58,16 @@ - - void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) - { -- setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+ setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); - } - - QVariant - KexiDBCheckBox::value() - { -- return QVariant( isChecked(), 3 ); -+ if (state()==NoChange) -+ return QVariant(); -+ return QVariant(state()==On, 1); - } - - void KexiDBCheckBox::slotStateChanged(int ) -- cgit