KDE 3.5.4 / KOffice 1.5.2

4 files changed, 34 insertions, 5 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 5ebd57592748..baf10175e129 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -83,6 +83,9 @@ pre-configure:
 	${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp
 	${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \
 			 -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure
+	${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \
+		${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp
+	${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu
 
 post-configure:
 	${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 1c7be9bf5bbe..2097cf54e7e3 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.3.tar.bz2) = 972c2c6855f912179bd7830bf2ed91d8
-SHA256 (KDE/kdelibs-3.5.3.tar.bz2) = ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9
-SIZE (KDE/kdelibs-3.5.3.tar.bz2) = 15424888
+MD5 (KDE/kdelibs-3.5.4.tar.bz2) = 979d056ca0e21c12caed270126e60e3e
+SHA256 (KDE/kdelibs-3.5.4.tar.bz2) = 9458d94d842855b4f0ea30520dc9ed0988563564bc72c8a86a5c40d57ab6887e
+SIZE (KDE/kdelibs-3.5.4.tar.bz2) = 15450025
diff --git a/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in
new file mode 100644
index 000000000000..cfc259a470c7
--- /dev/null
+++ b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in
@@ -0,0 +1,20 @@
+--- mimetypes/application/Makefile.in.orig	Tue Aug 15 18:56:01 2006
++++ mimetypes/application/Makefile.in	Tue Aug 15 18:56:32 2006
+@@ -525,7 +525,7 @@
+ 	vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop \
+ 	vnd.stardivision.chart.desktop vnd.stardivision.draw.desktop \
+ 	vnd.stardivision.math.desktop vnd.stardivision.writer-global.desktop vnd.sun.xml.writer.master.desktop \
+-	x-xliff.desktop x-7z.desktop xml.desktop x-webarchive.desktop  x-mimearchive.desktop \
++	x-xliff.desktop xml.desktop x-webarchive.desktop  x-mimearchive.desktop \
+ 	xsd.desktop relaxng.desktop \
+ 	vnd.oasis.opendocument.graphics-template.desktop \
+ 	vnd.oasis.opendocument.graphics.desktop \
+@@ -757,7 +757,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-7z.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop 
++KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop 
+ 
+ #>+ 2
+ docs-am:
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 86be34220818..6f2655702458 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -60,7 +60,7 @@ bin/makekdewidgets
 bin/meinproc
 bin/preparetips
 etc/rc.d/kdelibs.sh
-etc/xdg/menus/applications.menu
+etc/xdg/menus/kde-applications.menu
 include/arts/artskde.h
 include/arts/kartsdispatcher.h
 include/arts/kartsfloatwatch.h
@@ -3196,6 +3196,7 @@ share/icons/crystalsvg/128x128/filesystems/zip_overlay.png
 share/icons/crystalsvg/128x128/mimetypes/applix.png
 share/icons/crystalsvg/128x128/mimetypes/ascii.png
 share/icons/crystalsvg/128x128/mimetypes/binary.png
+share/icons/crystalsvg/128x128/mimetypes/bt.png
 share/icons/crystalsvg/128x128/mimetypes/cdimage.png
 share/icons/crystalsvg/128x128/mimetypes/cdr.png
 share/icons/crystalsvg/128x128/mimetypes/cdtrack.png
@@ -3613,6 +3614,7 @@ share/icons/crystalsvg/16x16/filesystems/zip_overlay.png
 share/icons/crystalsvg/16x16/mimetypes/applix.png
 share/icons/crystalsvg/16x16/mimetypes/ascii.png
 share/icons/crystalsvg/16x16/mimetypes/binary.png
+share/icons/crystalsvg/16x16/mimetypes/bt.png
 share/icons/crystalsvg/16x16/mimetypes/cdimage.png
 share/icons/crystalsvg/16x16/mimetypes/cdr.png
 share/icons/crystalsvg/16x16/mimetypes/cdtrack.png
@@ -3975,6 +3977,7 @@ share/icons/crystalsvg/22x22/filesystems/zip_overlay.png
 share/icons/crystalsvg/22x22/mimetypes/applix.png
 share/icons/crystalsvg/22x22/mimetypes/ascii.png
 share/icons/crystalsvg/22x22/mimetypes/binary.png
+share/icons/crystalsvg/22x22/mimetypes/bt.png
 share/icons/crystalsvg/22x22/mimetypes/cdimage.png
 share/icons/crystalsvg/22x22/mimetypes/cdtrack.png
 share/icons/crystalsvg/22x22/mimetypes/colorscm.png
@@ -4345,6 +4348,7 @@ share/icons/crystalsvg/32x32/filesystems/zip_overlay.png
 share/icons/crystalsvg/32x32/mimetypes/applix.png
 share/icons/crystalsvg/32x32/mimetypes/ascii.png
 share/icons/crystalsvg/32x32/mimetypes/binary.png
+share/icons/crystalsvg/32x32/mimetypes/bt.png
 share/icons/crystalsvg/32x32/mimetypes/cdimage.png
 share/icons/crystalsvg/32x32/mimetypes/cdr.png
 share/icons/crystalsvg/32x32/mimetypes/cdtrack.png
@@ -4568,6 +4572,7 @@ share/icons/crystalsvg/48x48/filesystems/zip_overlay.png
 share/icons/crystalsvg/48x48/mimetypes/applix.png
 share/icons/crystalsvg/48x48/mimetypes/ascii.png
 share/icons/crystalsvg/48x48/mimetypes/binary.png
+share/icons/crystalsvg/48x48/mimetypes/bt.png
 share/icons/crystalsvg/48x48/mimetypes/cdimage.png
 share/icons/crystalsvg/48x48/mimetypes/cdr.png
 share/icons/crystalsvg/48x48/mimetypes/cdtrack.png
@@ -4750,6 +4755,7 @@ share/icons/crystalsvg/64x64/filesystems/zip_overlay.png
 share/icons/crystalsvg/64x64/mimetypes/applix.png
 share/icons/crystalsvg/64x64/mimetypes/ascii.png
 share/icons/crystalsvg/64x64/mimetypes/binary.png
+share/icons/crystalsvg/64x64/mimetypes/bt.png
 share/icons/crystalsvg/64x64/mimetypes/cdimage.png
 share/icons/crystalsvg/64x64/mimetypes/cdr.png
 share/icons/crystalsvg/64x64/mimetypes/cdtrack.png
@@ -5133,7 +5139,6 @@ share/mimelnk/application/vnd.sun.xml.writer.desktop
 share/mimelnk/application/vnd.sun.xml.writer.master.desktop
 share/mimelnk/application/vnd.sun.xml.writer.template.desktop
 share/mimelnk/application/wordperfect.desktop
-share/mimelnk/application/x-7z.desktop
 share/mimelnk/application/x-abiword.desktop
 share/mimelnk/application/x-ace.desktop
 share/mimelnk/application/x-afm.desktop
@@ -5206,6 +5211,7 @@ share/mimelnk/application/x-lyx.desktop
 share/mimelnk/application/x-lzop.desktop
 share/mimelnk/application/x-magicpoint.desktop
 share/mimelnk/application/x-mimearchive.desktop
+share/mimelnk/application/x-mplayer2.desktop
 share/mimelnk/application/x-msaccess.desktop
 share/mimelnk/application/x-msdos-program.desktop
 share/mimelnk/application/x-msmetafile.desktop