diff options
author | skrll <skrll> | 2002-06-25 22:14:10 +0000 |
---|---|---|
committer | skrll <skrll> | 2002-06-25 22:14:10 +0000 |
commit | 095d68b4301631d77e90f70b86fc3ced1eb02a8d (patch) | |
tree | 33bc4b2b693819196b2b3c30b3e01e0a7dfcf492 /x11/kdebase3 | |
parent | d09ce62f6a94483e0fe7951facc4d6859f407722 (diff) | |
download | pkgsrc-095d68b4301631d77e90f70b86fc3ced1eb02a8d.tar.gz |
Fix more kde_module/lib problems. The most obvious example of this was the
"There was an error loading the module Navigation Panel." when loading
konqueror.
Diffstat (limited to 'x11/kdebase3')
-rw-r--r-- | x11/kdebase3/PLIST | 13 | ||||
-rw-r--r-- | x11/kdebase3/distinfo | 12 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-ai | 13 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-bz | 22 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-ej | 13 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-eq | 22 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-er | 22 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-es | 22 | ||||
-rw-r--r-- | x11/kdebase3/patches/patch-et | 22 |
9 files changed, 150 insertions, 11 deletions
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index 21232ec4510..d9cd65310bc 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/06/17 07:54:05 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/06/25 22:14:10 skrll Exp $ bin/appletproxy bin/chooser bin/conttest @@ -360,6 +360,9 @@ lib/kde3/konq_listview.so lib/kde3/konq_shellcmdplugin.a lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so +lib/kde3/konq_sidebar.a +lib/kde3/konq_sidebar.la +lib/kde3/konq_sidebar.so lib/kde3/konq_sidebartree_bookmarks.a lib/kde3/konq_sidebartree_bookmarks.la lib/kde3/konq_sidebartree_bookmarks.so @@ -372,6 +375,9 @@ lib/kde3/konq_sidebartree_history.so lib/kde3/konq_sound.a lib/kde3/konq_sound.la lib/kde3/konq_sound.so +lib/kde3/konqsidebar_tree.a +lib/kde3/konqsidebar_tree.la +lib/kde3/konqsidebar_tree.so lib/kde3/kwin_b2.a lib/kde3/kwin_b2.la lib/kde3/kwin_b2.so @@ -650,6 +656,11 @@ lib/libksgrd.la lib/libksgrd.so lib/libksgrd.so.0 lib/libksgrd.so.0.0 +lib/libksmserver_main.a +lib/libksmserver_main.la +lib/libksmserver_main.so +lib/libksmserver_main.so.0 +lib/libksmserver_main.so.0.0 lib/libkwin.a lib/libkwin.la lib/libkwin.so diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 19f9a2b6586..c89df64e80c 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:18:39 skrll Exp $ +$NetBSD: distinfo,v 1.2 2002/06/25 22:14:11 skrll Exp $ SHA1 (kdebase-3.0.1.tar.bz2) = 6783091359dc0fa9e29c9f93f40ef835e9e45a59 Size (kdebase-3.0.1.tar.bz2) = 13087668 bytes @@ -14,7 +14,7 @@ SHA1 (patch-ae) = 5ff81a4237c17c73e04d36519972b167638b4fdd SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1 SHA1 (patch-ag) = 10618ca30e36b45446f66854a33d4c05b1f355e6 SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5 -SHA1 (patch-ai) = bdf976d854d3f733ed9ac2a47c32a55633dbec9c +SHA1 (patch-ai) = f00d1142918cfc5bd0572b499fe8bd09681d5327 SHA1 (patch-aj) = 0a1b96448c4372bd8cea70b8c72016148a824cd6 SHA1 (patch-ak) = 1bb9e60a0bd31e0d9d53f883541a906a971fd3ed SHA1 (patch-al) = ee1f5c7500af18e9583ae3d63093f9eef6fe60bc @@ -57,7 +57,7 @@ SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16 SHA1 (patch-bw) = cb212ff65b55b8e190f3d1feef4986906bf9a7e6 SHA1 (patch-bx) = dcdec38d984452032176946bafddc9a6614b2b6f SHA1 (patch-by) = 6196da890587636881baac5ac477c850773618e3 -SHA1 (patch-bz) = a7cae1df9771decc33a8392604c6701091c3e2e0 +SHA1 (patch-bz) = 2cbe8ae4be49a1977b3ec04abb974c4f3ab62a40 SHA1 (patch-ca) = 21f45e1498c5a61838d844ad5b53189400f97355 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b SHA1 (patch-cc) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c @@ -119,10 +119,14 @@ SHA1 (patch-ef) = 637afdf8af3517987a10cd4bb7876096a4148dfa SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610 SHA1 (patch-eh) = 5e3e743849016e54b7209153a8ca0adaa4033241 SHA1 (patch-ei) = 69312f1e54ba35908dfe7650ba92686acead542b -SHA1 (patch-ej) = cf8c5250eba2dfcd94941e830e23ca56b14de110 +SHA1 (patch-ej) = 58463db42818977fce088603330ae4bb940746f2 SHA1 (patch-ek) = 004a6c7933c90e1bcbd9d271708e4432f79a8986 SHA1 (patch-el) = 00629891dbd5c668162213f0bcd5183878e7baf4 SHA1 (patch-em) = 2e42263d67e5e44035bed13dc3e5245fc3a86709 SHA1 (patch-en) = f755e2ddf16eb6df6c2f4498f4193a61509dc45f SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1 SHA1 (patch-ep) = 77d65151a6e74adcfc1143ced2cb393d08029b2c +SHA1 (patch-eq) = 3735ba37c53c8498f8709bdc8b8a857eb2903277 +SHA1 (patch-er) = b8986e7f10c95fecfd8d0af0ed440c730ae3fabd +SHA1 (patch-es) = 5ceea551d02474cc09b6cf1e345a6b6b250aa4aa +SHA1 (patch-et) = 89ceae37e0c858f920aecc279bf490e62226e5e0 diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai index e7540fc693b..84e9864c037 100644 --- a/x11/kdebase3/patches/patch-ai +++ b/x11/kdebase3/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ +$NetBSD: patch-ai,v 1.2 2002/06/25 22:14:12 skrll Exp $ ---- kcontrol/access/Makefile.in.orig Mon May 13 23:57:36 2002 +--- kcontrol/access/Makefile.in.orig Tue Jun 25 19:31:44 2002 +++ kcontrol/access/Makefile.in @@ -292,16 +292,20 @@ @@ -133,6 +133,15 @@ $NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -670,7 +683,7 @@ + + #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES ++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES + + install-info: install-info-am + @@ -713,9 +726,6 @@ messages: $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz index d50a56373bd..f1598378027 100644 --- a/x11/kdebase3/patches/patch-bz +++ b/x11/kdebase3/patches/patch-bz @@ -1,6 +1,6 @@ -$NetBSD: patch-bz,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ +$NetBSD: patch-bz,v 1.2 2002/06/25 22:14:12 skrll Exp $ ---- klipper/Makefile.in.orig Mon May 13 23:57:48 2002 +--- klipper/Makefile.in.orig Tue Jun 25 19:31:40 2002 +++ klipper/Makefile.in @@ -290,24 +290,26 @@ INCLUDES = $(all_includes) @@ -153,6 +153,15 @@ $NetBSD: patch-bz,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -741,7 +751,7 @@ + + #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES ++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES + + install-info: install-info-am + @@ -863,19 +873,6 @@ @@ -258,3 +267,12 @@ $NetBSD: patch-bz,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -953,7 +975,7 @@ + -rm -f *.rpo + + #>+ 5 +-$(srcdir)/configdialog.cpp: configdialog.moc + $(srcdir)/urlgrabber.cpp: urlgrabber.moc + $(srcdir)/toplevel.cpp: toplevel.moc ++$(srcdir)/configdialog.cpp: configdialog.moc + $(srcdir)/applet.cpp: applet.moc diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej index 03b0056e3d0..776f7019c0a 100644 --- a/x11/kdebase3/patches/patch-ej +++ b/x11/kdebase3/patches/patch-ej @@ -1,6 +1,6 @@ -$NetBSD: patch-ej,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ +$NetBSD: patch-ej,v 1.2 2002/06/25 22:14:12 skrll Exp $ ---- kxkb/Makefile.in.orig Mon May 13 23:57:57 2002 +--- kxkb/Makefile.in.orig Tue Jun 25 19:31:39 2002 +++ kxkb/Makefile.in @@ -292,11 +292,11 @@ @@ -133,6 +133,15 @@ $NetBSD: patch-ej,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -672,7 +684,7 @@ + + #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES ++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES + + install-info: install-info-am + @@ -722,9 +734,6 @@ messages: $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot diff --git a/x11/kdebase3/patches/patch-eq b/x11/kdebase3/patches/patch-eq new file mode 100644 index 00000000000..e9958aa648d --- /dev/null +++ b/x11/kdebase3/patches/patch-eq @@ -0,0 +1,22 @@ +$NetBSD: patch-eq,v 1.1 2002/06/25 22:14:12 skrll Exp $ + +--- admin/am_edit.orig Tue Jun 25 10:10:02 2002 ++++ admin/am_edit +@@ -384,7 +384,16 @@ + # all modules are installed. automake doesn't know this, so we need to move + # this here from install-data to install-exec. + if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) { +- $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES"; ++ my $lookup2 = 'install-exec-am:\s*([^\n]*)'; ++ if ($MakefileData =~ /\n$lookup2\n/) { ++ my $newdeps = $1; ++ if ($newdeps =~ m/\s*install-libLTLIBRARIES\s*/) { ++ $newdeps =~ s/(install-libLTLIBRARIES)/$1 install-kde_moduleLTLIBRARIES/g; ++ substituteLine($lookup2, "install-exec-am: " . $newdeps); ++ } else { ++ $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES"; ++ } ++ } + my $lookup = 'install-data-am:\s*(.*)'; + if ($MakefileData =~ /\n$lookup\n/) { + my $newdeps = $1; diff --git a/x11/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er new file mode 100644 index 00000000000..9c304dc1182 --- /dev/null +++ b/x11/kdebase3/patches/patch-er @@ -0,0 +1,22 @@ +$NetBSD: patch-er,v 1.1 2002/06/25 22:14:13 skrll Exp $ + +--- konqueror/sidebar/trees/Makefile.in.orig Tue Jun 25 19:31:48 2002 ++++ konqueror/sidebar/trees/Makefile.in +@@ -576,7 +576,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=konq_sidebartreetoplevelitem.h konq_sidebartree.h konq_sidebartreemodule.h konqsidebar_tree.h konq_sidebartreeitem.h ++KDE_DIST=konq_sidebartree.h konq_sidebartreemodule.h konqsidebar_tree.h konq_sidebartreetoplevelitem.h konq_sidebartreeitem.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -672,7 +672,7 @@ + + #>- install-exec-am: install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES ++install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES + + install-info: install-info-recursive + diff --git a/x11/kdebase3/patches/patch-es b/x11/kdebase3/patches/patch-es new file mode 100644 index 00000000000..67fbee37571 --- /dev/null +++ b/x11/kdebase3/patches/patch-es @@ -0,0 +1,22 @@ +$NetBSD: patch-es,v 1.1 2002/06/25 22:14:13 skrll Exp $ + +--- konqueror/sidebar/Makefile.in.orig Tue Jun 25 19:31:48 2002 ++++ konqueror/sidebar/Makefile.in +@@ -672,7 +672,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=konq_sidebartng.desktop kmultiverttabbar.h konqsidebartng.rc ++KDE_DIST=kmultiverttabbar.h konqsidebartng.rc konq_sidebartng.desktop + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -770,7 +770,7 @@ + + #>- install-exec-am: install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES ++install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES + + install-info: install-info-recursive + diff --git a/x11/kdebase3/patches/patch-et b/x11/kdebase3/patches/patch-et new file mode 100644 index 00000000000..b125f2aa9cb --- /dev/null +++ b/x11/kdebase3/patches/patch-et @@ -0,0 +1,22 @@ +$NetBSD: patch-et,v 1.1 2002/06/25 22:14:14 skrll Exp $ + +--- libkonq/Makefile.in.orig Tue Jun 25 19:31:42 2002 ++++ libkonq/Makefile.in +@@ -738,7 +738,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=konq_settings.cc konqpopupmenuplugin.desktop konq_xmlguiclient.cc kbookmarkexporter.cc konq_iconviewwidget.cc konq_historymgr.cc konq_undo.cc DESIGN konq_operations.cc konq_bgnddlg.cc kfileivi.cc SERVICEMENUS konq_faviconmgr.cc konq_dirpart.cc konq_events.cc directory_bookmarkbar.desktop konq_historycomm.cc konq_propsview.cc PLUGINS konq_drag.cc konq_sound.cc konq_pixmapprovider.cc ++KDE_DIST=DESIGN konq_sound.la.closure konq_settings.cc konq_operations.cc konq_drag.cc libkonq.la.closure konq_historycomm_skel.cc konq_sound.cc konq_faviconmgr.kidl konqpopupmenuplugin.desktop konq_xmlguiclient.cc kbookmarkexporter.cc konq_dirpart.cc konq_events.cc konq_bgnddlg.cc konq_faviconmgr_skel.cc directory_bookmarkbar.desktop kfileivi.cc konq_undo.kidl SERVICEMENUS konq_historycomm.cc konq_historycomm.kidl konq_iconviewwidget.cc konq_pixmapprovider.cc konq_historymgr.cc konq_propsview.cc konq_undo_skel.cc konq_faviconmgr.cc konq_undo.cc PLUGINS + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -836,7 +836,7 @@ + + #>- install-exec-am: install-libLTLIBRARIES + #>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES ++install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES + + install-info: install-info-recursive + |