Author: ranger
Date: Fri May 19 14:06:09 2006
New Revision: 41
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=41&repname=user%3a+ranger>
Log:
last-minute fix from kde-packagers
Modified:
trunk/experimental/10.3/main/finkinfo/kde/koffice.patch
trunk/experimental/10.4-transitional/main/finkinfo/kde/koffice.patch
trunk/experimental/10.4/main/finkinfo/kde/koffice.patch
trunk/experimental/common/main/finkinfo/kde/koffice.patch
Modified: trunk/experimental/10.3/main/finkinfo/kde/koffice.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.3/main/finkinfo/kde/koffice.patch&rev=41&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.3/main/finkinfo/kde/koffice.patch (original)
+++ trunk/experimental/10.3/main/finkinfo/kde/koffice.patch Fri May 19 14:06:09
2006
@@ -2543,3 +2543,55 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la
+--- koffice-1.5.1/kexi/plugins/forms/Makefile.am 2006-05-10
14:19:58.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/forms/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -23,9 +23,10 @@
+ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
+ 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
+--- koffice-1.5.1/kexi/plugins/reports/Makefile.am 2006-05-10
14:20:02.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/reports/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -5,24 +5,29 @@
+ kexihandler_report_la_SOURCES = kexireports.cpp
+ kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module -no-undefined
+ kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
+- ../../widget/utils/libkexiguiutils.la \
+- ../../widget/libkexiextendedwidgets.la \
+- ../../formeditor/libkformdesigner.la \
+- ../forms/libkexiformutils.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
+
+ kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module
+ kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp
+ kexireportwidgets_la_LIBADD =
$(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
+
+ lib_LTLIBRARIES = libkexireportutils.la
+ 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
Modified: trunk/experimental/10.4-transitional/main/finkinfo/kde/koffice.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4-transitional/main/finkinfo/kde/koffice.patch&rev=41&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4-transitional/main/finkinfo/kde/koffice.patch
(original)
+++ trunk/experimental/10.4-transitional/main/finkinfo/kde/koffice.patch Fri
May 19 14:06:09 2006
@@ -2543,3 +2543,55 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la
+--- koffice-1.5.1/kexi/plugins/forms/Makefile.am 2006-05-10
14:19:58.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/forms/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -23,9 +23,10 @@
+ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
+ 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
+--- koffice-1.5.1/kexi/plugins/reports/Makefile.am 2006-05-10
14:20:02.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/reports/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -5,24 +5,29 @@
+ kexihandler_report_la_SOURCES = kexireports.cpp
+ kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module -no-undefined
+ kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
+- ../../widget/utils/libkexiguiutils.la \
+- ../../widget/libkexiextendedwidgets.la \
+- ../../formeditor/libkformdesigner.la \
+- ../forms/libkexiformutils.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
+
+ kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module
+ kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp
+ kexireportwidgets_la_LIBADD =
$(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
+
+ lib_LTLIBRARIES = libkexireportutils.la
+ 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
Modified: trunk/experimental/10.4/main/finkinfo/kde/koffice.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/koffice.patch&rev=41&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/koffice.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/koffice.patch Fri May 19 14:06:09
2006
@@ -2543,3 +2543,55 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la
+--- koffice-1.5.1/kexi/plugins/forms/Makefile.am 2006-05-10
14:19:58.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/forms/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -23,9 +23,10 @@
+ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
+ 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
+--- koffice-1.5.1/kexi/plugins/reports/Makefile.am 2006-05-10
14:20:02.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/reports/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -5,24 +5,29 @@
+ kexihandler_report_la_SOURCES = kexireports.cpp
+ kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module -no-undefined
+ kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
+- ../../widget/utils/libkexiguiutils.la \
+- ../../widget/libkexiextendedwidgets.la \
+- ../../formeditor/libkformdesigner.la \
+- ../forms/libkexiformutils.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
+
+ kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module
+ kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp
+ kexireportwidgets_la_LIBADD =
$(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
+
+ lib_LTLIBRARIES = libkexireportutils.la
+ 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
Modified: trunk/experimental/common/main/finkinfo/kde/koffice.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/koffice.patch&rev=41&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/koffice.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/koffice.patch Fri May 19
14:06:09 2006
@@ -2666,3 +2666,57 @@
METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la
+diff -uNr koffice-1.5.1/kexi/plugins/forms/Makefile.am
koffice-1.5.1-new/kexi/plugins/forms/Makefile.am
+--- koffice-1.5.1/kexi/plugins/forms/Makefile.am 2006-05-10
14:19:58.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/forms/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -23,9 +23,10 @@
+ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
+ 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 -uNr koffice-1.5.1/kexi/plugins/reports/Makefile.am
koffice-1.5.1-new/kexi/plugins/reports/Makefile.am
+--- koffice-1.5.1/kexi/plugins/reports/Makefile.am 2006-05-10
14:20:02.000000000 -0400
++++ koffice-1.5.1-new/kexi/plugins/reports/Makefile.am 2006-05-19
13:57:55.000000000 -0400
+@@ -5,24 +5,29 @@
+ kexihandler_report_la_SOURCES = kexireports.cpp
+ kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module -no-undefined
+ kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
+- ../../widget/utils/libkexiguiutils.la \
+- ../../widget/libkexiextendedwidgets.la \
+- ../../formeditor/libkformdesigner.la \
+- ../forms/libkexiformutils.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
+
+ kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO)
-module
+ kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp
+ kexireportwidgets_la_LIBADD =
$(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
+
+ lib_LTLIBRARIES = libkexireportutils.la
+ 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
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
