summaryrefslogtreecommitdiff
path: root/misc/koffice
diff options
context:
space:
mode:
Diffstat (limited to 'misc/koffice')
-rw-r--r--misc/koffice/Makefile4
-rw-r--r--misc/koffice/distinfo5
-rw-r--r--misc/koffice/patches/patch-aq140
-rw-r--r--misc/koffice/patches/patch-ar17
-rw-r--r--misc/koffice/patches/patch-as28
5 files changed, 191 insertions, 3 deletions
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 54ce615931a..db0bc154f0b 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2006/03/06 00:18:13 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2006/03/25 22:03:31 markd Exp $
DISTNAME= koffice-1.4.2
-PKGREVISION= 9
+PKGREVISION= 10
CATEGORIES= misc kde
MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/koffice-1.4.2/src/ \
ftp://ftp.us.kde.org/pub/kde/stable/koffice-1.4.2/src/ \
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index 9bf8cd8f479..13cb55612c1 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2006/01/05 10:28:27 markd Exp $
+$NetBSD: distinfo,v 1.29 2006/03/25 22:03:31 markd Exp $
SHA1 (koffice-1.4.2.tar.bz2) = 474ab6d289ff1330c200768b30a3dbe271cd26c5
RMD160 (koffice-1.4.2.tar.bz2) = 117d5c50aa81d669002005f39fc03bc3f999b62c
@@ -15,3 +15,6 @@ SHA1 (patch-am) = 7b23a60d7bac76421d5ec14279b3ab454af2165d
SHA1 (patch-an) = c12e80acc30399bf95b668f64b74186624016956
SHA1 (patch-ao) = c75c00cc380c2249cfaa399151f8ccf3625612f4
SHA1 (patch-ap) = 5ed9f3fed39dec6852f987cd3d5071ed20914cd9
+SHA1 (patch-aq) = 413c31bbb63b3a74f68edd40956036716e554943
+SHA1 (patch-ar) = 49a5228e9d94eb4d80f35aa3c8543c7bec82d3ce
+SHA1 (patch-as) = e42b3594341cd034575ddfec84f4def014a653af
diff --git a/misc/koffice/patches/patch-aq b/misc/koffice/patches/patch-aq
new file mode 100644
index 00000000000..b8694e5cd9a
--- /dev/null
+++ b/misc/koffice/patches/patch-aq
@@ -0,0 +1,140 @@
+$NetBSD: patch-aq,v 1.1 2006/03/25 22:03:31 markd Exp $
+
+--- karbon/Makefile.in.orig 2005-10-05 23:52:36.000000000 +1300
++++ karbon/Makefile.in
+@@ -369,7 +369,9 @@ libkarbonbase_la_SOURCES = \
+ libkarbonbase_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined $(KDE_NO_UNDEFINED)
+ libkarbonbase_la_LIBADD = $(LIB_KOFFICEUI)
+
+-libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH)
++#>- libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
++#>+ 1
++libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -no-undefined $(KDE_NO_UNDEFINED)
+ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
+ dockers/libkarbondockers.la \
+ widgets/libkarbonwidgets.la \
+@@ -388,7 +390,7 @@ libkarboncommon_la_LIBADD = $(LIB_KOFFIC
+ $(LIBFREETYPE_LIBS)
+
+
+-libkarbonpart_la_SOURCES = dummy.cpp
++libkarbonpart_la_SOURCES = karbon_factory_init.cc
+ libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH)
+ libkarbonpart_la_LIBADD = libkarboncommon.la
+ #>- libkarbonpart_la_METASOURCES = AUTO
+@@ -455,10 +457,10 @@ libkarboncommon_la_nofinal_OBJECTS = kar
+ @KDE_USE_FINAL_FALSE@libkarboncommon_la_OBJECTS = $(libkarboncommon_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@libkarboncommon_la_OBJECTS = $(libkarboncommon_la_final_OBJECTS)
+ libkarbonpart_la_DEPENDENCIES = libkarboncommon.la
+-am_libkarbonpart_la_OBJECTS = dummy.lo
++am_libkarbonpart_la_OBJECTS = karbon_factory_init.lo
+ #>- libkarbonpart_la_OBJECTS = $(am_libkarbonpart_la_OBJECTS)
+ #>+ 1
+-libkarbonpart_la_OBJECTS = dummy.lo
++libkarbonpart_la_OBJECTS = karbon_factory_init.lo
+ bin_PROGRAMS =
+ #>- PROGRAMS = $(bin_PROGRAMS)
+ #>+ 2
+@@ -473,9 +475,9 @@ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo \
+-#>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_drag.Plo \
++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/karbon_drag.Plo \
+ #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory_init.Plo \
+ #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_grid_data.Plo \
+ #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_part.Plo \
+ #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_part_base.Plo \
+@@ -486,9 +488,9 @@ am__depfiles_maybe = depfiles
+ #>- @AMDEP_TRUE@ ./$(DEPDIR)/karbon_view_iface.Plo \
+ #>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
+ #>+ 24
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_dummy.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P $(DEPDIR)/libkarbonbase_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cpp.P ./$(DEPDIR)/dummy.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_drag.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_dummy.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P $(DEPDIR)/libkarbonbase_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cc.P $(DEPDIR)/libkarboncommon_la.all_cpp.P ./$(DEPDIR)/karbon_drag.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory_init.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_grid_data.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_part.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_part_base.Plo \
+@@ -498,9 +500,9 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_view_base.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_view_iface.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_dummy.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P ./$(DEPDIR)/dummy.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_drag.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/karbon.la.Po $(DEPDIR)/karbon_dummy.Plo $(DEPDIR)/karbon_part_iface_skel.P $(DEPDIR)/karbon_view_iface_skel.P ./$(DEPDIR)/karbon_drag.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_factory_init.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_grid_data.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_part.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karbon_part_base.Plo \
+@@ -667,7 +669,10 @@ karbon.la: $(karbon_la_OBJECTS) $(karbon
+ @KDE_USE_CLOSURE_TRUE@libkarbonbase.la: libkarbonbase.la.closure $(libkarbonbase_la_OBJECTS) $(libkarbonbase_la_DEPENDENCIES)
+ @KDE_USE_CLOSURE_FALSE@libkarbonbase.la: $(libkarbonbase_la_OBJECTS) $(libkarbonbase_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkarbonbase_la_LDFLAGS) $(libkarbonbase_la_OBJECTS) $(libkarbonbase_la_LIBADD) $(LIBS)
+-libkarboncommon.la: $(libkarboncommon_la_OBJECTS) $(libkarboncommon_la_DEPENDENCIES)
++#>- libkarboncommon.la: $(libkarboncommon_la_OBJECTS) $(libkarboncommon_la_DEPENDENCIES)
++#>+ 2
++@KDE_USE_CLOSURE_TRUE@libkarboncommon.la: libkarboncommon.la.closure $(libkarboncommon_la_OBJECTS) $(libkarboncommon_la_DEPENDENCIES)
++@KDE_USE_CLOSURE_FALSE@libkarboncommon.la: $(libkarboncommon_la_OBJECTS) $(libkarboncommon_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkarboncommon_la_LDFLAGS) $(libkarboncommon_la_OBJECTS) $(libkarboncommon_la_LIBADD) $(LIBS)
+ #>- libkarbonpart.la: $(libkarbonpart_la_OBJECTS) $(libkarbonpart_la_DEPENDENCIES)
+ #>+ 2
+@@ -710,9 +715,9 @@ mostlyclean-compile:
+ distclean-compile:
+ -rm -f *.tab.c
+
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_drag.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_factory.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_factory_init.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_grid_data.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_part.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/karbon_part_base.Plo@am__quote@
+@@ -1021,9 +1026,6 @@ uninstall-info: uninstall-info-recursive
+ uninstall-recursive
+
+
+-dummy.cpp:
+- echo > dummy.cpp
+-
+ messages: rc.cpp
+ $(EXTRACTRC) data/*.rc >> rc.cpp
+ $(XGETTEXT) rc.cpp *.cpp *.cc */*.cc tools/*.h plugins/*/*.cc -o $(podir)/karbon.pot
+@@ -1077,6 +1079,15 @@ karbon_view_iface_skel.cc: karbon_view_i
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub karbon_view_iface.kidl
+
+ #>+ 8
++libkarboncommon.la.closure: $(libkarboncommon_la_OBJECTS) $(libkarboncommon_la_DEPENDENCIES)
++ @echo "int main() {return 0;}" > libkarboncommon_la_closure.cc
++ @$(LTCXXCOMPILE) -c libkarboncommon_la_closure.cc
++ $(CXXLINK) libkarboncommon_la_closure.lo $(libkarboncommon_la_LDFLAGS) $(libkarboncommon_la_OBJECTS) $(libkarboncommon_la_LIBADD) $(LIBS)
++ @rm -f libkarboncommon_la_closure.* libkarboncommon.la.closure
++ @echo "timestamp" > libkarboncommon.la.closure
++
++
++#>+ 8
+ libkarbonpart.la.closure: $(libkarbonpart_la_OBJECTS) $(libkarbonpart_la_DEPENDENCIES)
+ @echo "int main() {return 0;}" > libkarbonpart_la_closure.cc
+ @$(LTCXXCOMPILE) -c libkarbonpart_la_closure.cc
+@@ -1118,7 +1129,7 @@ clean-metasources:
+ -rm -f karbon_view.moc karbon_drag.moc karbon_part.moc karbon_factory.moc
+
+ #>+ 2
+-KDE_DIST=CHANGES IDEAS karbon_aboutdata.h configure.in.in karbon_resourceserver.h karbon_view_iface.h karbon_grid_data.h configure.in.bot usablity-review.txt karbon.dtd
++KDE_DIST=karbon_view_iface.h IDEAS configure.in.bot karbon.dtd usablity-review.txt CHANGES configure.in.in karbon_resourceserver.h karbon_aboutdata.h karbon_grid_data.h
+
+ #>+ 5
+ clean-idl:
+@@ -1128,7 +1139,7 @@ clean-idl:
+
+ #>+ 3
+ clean-closures:
+- -rm -f libkarbonbase.la.closure libkarbonpart.la.closure
++ -rm -f libkarbonbase.la.closure libkarboncommon.la.closure libkarbonpart.la.closure
+
+ #>+ 2
+ docs-am:
diff --git a/misc/koffice/patches/patch-ar b/misc/koffice/patches/patch-ar
new file mode 100644
index 00000000000..7f2fb07a5d7
--- /dev/null
+++ b/misc/koffice/patches/patch-ar
@@ -0,0 +1,17 @@
+$NetBSD: patch-ar,v 1.1 2006/03/25 22:03:31 markd Exp $
+
+--- karbon/karbon_factory.cc.orig 2005-10-05 23:31:43.000000000 +1300
++++ karbon/karbon_factory.cc
+@@ -32,12 +32,8 @@
+
+ #include <kdebug.h>
+
+-
+ KarbonResourceServer* KarbonFactory::s_rserver = 0;
+
+-
+-K_EXPORT_COMPONENT_FACTORY( libkarbonpart, KarbonFactory() )
+-
+ KInstance* KarbonFactory::s_instance = 0L;
+ KAboutData* KarbonFactory::s_aboutData = 0L;
+
diff --git a/misc/koffice/patches/patch-as b/misc/koffice/patches/patch-as
new file mode 100644
index 00000000000..95faee12e31
--- /dev/null
+++ b/misc/koffice/patches/patch-as
@@ -0,0 +1,28 @@
+$NetBSD: patch-as,v 1.1 2006/03/25 22:03:31 markd Exp $
+
+--- /dev/null 2006-03-25 09:41:47.000000000 +1200
++++ karbon/karbon_factory_init.cc 2006-03-25 09:45:57.000000000 +1200
+@@ -0,0 +1,23 @@
++/* This file is part of the KDE project
++ Copyright (C) 2005 The Karbon Developers
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++*/
++
++#include "karbon_factory.h"
++
++K_EXPORT_COMPONENT_FACTORY( libkarbonpart, KarbonFactory() )
++
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 22:31:25 +0000