Update to KDE 3.4.3 / KOffice 1.4.2

This commit is contained in:
Michael Nottebrock 2005-11-05 11:19:58 +00:00
parent b3fc541cf1
commit de94e0e160
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=147365
726 changed files with 1802 additions and 5449 deletions

View File

@ -117,7 +117,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
# Yeah, it's namespace pollution, but this is really the best place for this
# stuff. Arts does NOT use it anymore.
KDE_VERSION= 3.4.2
KDE_VERSION= 3.4.3
KDE_ORIGVER= ${KDE_VERSION}
KDE_PREFIX?= ${LOCALBASE}

View File

@ -117,7 +117,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
# Yeah, it's namespace pollution, but this is really the best place for this
# stuff. Arts does NOT use it anymore.
KDE_VERSION= 3.4.2
KDE_VERSION= 3.4.3
KDE_ORIGVER= ${KDE_VERSION}
KDE_PREFIX?= ${LOCALBASE}

View File

@ -6,6 +6,22 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
20051105:
AFFECTS: users of x11-toolkits/qt33
AUTHOR: kde@FreeBSD.org
If the compilation of qt fails due to uic segfaulting
(example:
/usr/ports/x11-toolkits/qt33/work/qt-x11-free-3.3.5/bin/uic -L
/usr/ports/x11-toolkits/qt33/work/qt-x11-free-3.3.5/plugins
listboxeditor.ui -i listboxeditor.h -o listboxeditor.cpp
*** Signal 11)
delete your old .qt directories:
rm -r ~/.qt /root/.qt
20051105:
AFFECTS: all users of gnome/glib/gtk
AUTHOR: gnome@FreeBSD.org

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeaccessibility-3.4.2.tar.bz2) = 9ad0e81fc51de5513d778a2e4104d2c3
SIZE (KDE/kdeaccessibility-3.4.2.tar.bz2) = 7413579
MD5 (KDE/kdeaccessibility-3.4.3.tar.bz2) = 02f8ffe95f253aaab8a13ab7211494dc
SIZE (KDE/kdeaccessibility-3.4.3.tar.bz2) = 7414953

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeaccessibility-3.4.2.tar.bz2) = 9ad0e81fc51de5513d778a2e4104d2c3
SIZE (KDE/kdeaccessibility-3.4.2.tar.bz2) = 7413579
MD5 (KDE/kdeaccessibility-3.4.3.tar.bz2) = 02f8ffe95f253aaab8a13ab7211494dc
SIZE (KDE/kdeaccessibility-3.4.3.tar.bz2) = 7414953

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeaccessibility-3.4.2.tar.bz2) = 9ad0e81fc51de5513d778a2e4104d2c3
SIZE (KDE/kdeaccessibility-3.4.2.tar.bz2) = 7413579
MD5 (KDE/kdeaccessibility-3.4.3.tar.bz2) = 02f8ffe95f253aaab8a13ab7211494dc
SIZE (KDE/kdeaccessibility-3.4.3.tar.bz2) = 7414953

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeaccessibility-3.4.2.tar.bz2) = 9ad0e81fc51de5513d778a2e4104d2c3
SIZE (KDE/kdeaccessibility-3.4.2.tar.bz2) = 7413579
MD5 (KDE/kdeaccessibility-3.4.3.tar.bz2) = 02f8ffe95f253aaab8a13ab7211494dc
SIZE (KDE/kdeaccessibility-3.4.3.tar.bz2) = 7414953

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeaccessibility-3.4.2.tar.bz2) = 9ad0e81fc51de5513d778a2e4104d2c3
SIZE (KDE/kdeaccessibility-3.4.2.tar.bz2) = 7413579
MD5 (KDE/kdeaccessibility-3.4.3.tar.bz2) = 02f8ffe95f253aaab8a13ab7211494dc
SIZE (KDE/kdeaccessibility-3.4.3.tar.bz2) = 7414953

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeaccessibility-3.4.2.tar.bz2) = 9ad0e81fc51de5513d778a2e4104d2c3
SIZE (KDE/kdeaccessibility-3.4.2.tar.bz2) = 7413579
MD5 (KDE/kdeaccessibility-3.4.3.tar.bz2) = 02f8ffe95f253aaab8a13ab7211494dc
SIZE (KDE/kdeaccessibility-3.4.3.tar.bz2) = 7414953

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/kde-i18n-ar-3.4.2.tar.bz2) = 58e437f117e280045be25004e520ba19
SIZE (KDE/kde-i18n/kde-i18n-ar-3.4.2.tar.bz2) = 1615737
MD5 (KDE/kde-i18n/kde-i18n-ar-3.4.3.tar.bz2) = ce01c8fd9addbc389b6847a0f71ca3d2
SIZE (KDE/kde-i18n/kde-i18n-ar-3.4.3.tar.bz2) = 1616757

View File

@ -233,7 +233,6 @@ share/locale/ar/LC_MESSAGES/kig.mo
share/locale/ar/LC_MESSAGES/kinetd.mo
share/locale/ar/LC_MESSAGES/kio.mo
share/locale/ar/LC_MESSAGES/kio_audiocd.mo
share/locale/ar/LC_MESSAGES/kio_devices.mo
share/locale/ar/LC_MESSAGES/kio_finger.mo
share/locale/ar/LC_MESSAGES/kio_fish.mo
share/locale/ar/LC_MESSAGES/kio_floppy.mo
@ -242,6 +241,7 @@ share/locale/ar/LC_MESSAGES/kio_imap4.mo
share/locale/ar/LC_MESSAGES/kio_lan.mo
share/locale/ar/LC_MESSAGES/kio_mac.mo
share/locale/ar/LC_MESSAGES/kio_man.mo
share/locale/ar/LC_MESSAGES/kio_media.mo
share/locale/ar/LC_MESSAGES/kio_mobile.mo
share/locale/ar/LC_MESSAGES/kio_nfs.mo
share/locale/ar/LC_MESSAGES/kio_nntp.mo

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/kde-i18n-ar-3.4.2.tar.bz2) = 58e437f117e280045be25004e520ba19
SIZE (KDE/kde-i18n/kde-i18n-ar-3.4.2.tar.bz2) = 1615737
MD5 (KDE/kde-i18n/kde-i18n-ar-3.4.3.tar.bz2) = ce01c8fd9addbc389b6847a0f71ca3d2
SIZE (KDE/kde-i18n/kde-i18n-ar-3.4.3.tar.bz2) = 1616757

View File

@ -233,7 +233,6 @@ share/locale/ar/LC_MESSAGES/kig.mo
share/locale/ar/LC_MESSAGES/kinetd.mo
share/locale/ar/LC_MESSAGES/kio.mo
share/locale/ar/LC_MESSAGES/kio_audiocd.mo
share/locale/ar/LC_MESSAGES/kio_devices.mo
share/locale/ar/LC_MESSAGES/kio_finger.mo
share/locale/ar/LC_MESSAGES/kio_fish.mo
share/locale/ar/LC_MESSAGES/kio_floppy.mo
@ -242,6 +241,7 @@ share/locale/ar/LC_MESSAGES/kio_imap4.mo
share/locale/ar/LC_MESSAGES/kio_lan.mo
share/locale/ar/LC_MESSAGES/kio_mac.mo
share/locale/ar/LC_MESSAGES/kio_man.mo
share/locale/ar/LC_MESSAGES/kio_media.mo
share/locale/ar/LC_MESSAGES/kio_mobile.mo
share/locale/ar/LC_MESSAGES/kio_nfs.mo
share/locale/ar/LC_MESSAGES/kio_nntp.mo

View File

@ -32,5 +32,3 @@ share/locale/ar/LC_MESSAGES/olefilterswinword97filter.mo
share/locale/ar/LC_MESSAGES/xsltexportfilter.mo
share/locale/ar/LC_MESSAGES/xsltfilter.mo
share/locale/ar/LC_MESSAGES/xsltimportfilter.mo
@dirrm share/locale/ar/LC_MESSAGES
@dirrm share/locale/ar

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeutils-3.4.2.tar.bz2) = 62500e5ee043937592ebc6ad91dd670d
SIZE (KDE/kdeutils-3.4.2.tar.bz2) = 2290150
MD5 (KDE/kdeutils-3.4.3.tar.bz2) = d467284b523bb1268da776cd016ede4d
SIZE (KDE/kdeutils-3.4.3.tar.bz2) = 2257060

View File

@ -45,6 +45,7 @@ pre-configure:
@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -37,6 +37,7 @@ pre-configure:
@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -39,6 +39,7 @@ pre-configure:
@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -37,6 +37,7 @@ pre-configure:
@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -39,6 +39,7 @@ pre-configure:
@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -39,6 +39,7 @@ pre-configure:
@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -42,6 +42,7 @@ pre-configure:
@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -71,8 +71,12 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_src_resampler.so:${PORTSDIR}/audio/akode
RUN_DEPENDS+= ${LOCALBASE}/lib/libakode_xiph_decoder.so:${PORTSDIR}/audio/akode-plugins-xiph
.endif
pre-configure:
${ECHO_CMD} "akode" > ${WRKSRC}/inst-apps
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
do-install:
cd ${WRKSRC}/akode && gmake install
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -7,7 +7,7 @@
#
PORTNAME= arts
PORTVERSION= 1.4.2
PORTVERSION= 1.4.3
PORTEPOCH= 1
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}

View File

@ -1,2 +1,2 @@
MD5 (KDE/arts-1.4.2.tar.bz2) = bfa5b0efa7454c15976c4e5c618d2db4
SIZE (KDE/arts-1.4.2.tar.bz2) = 975790
MD5 (KDE/arts-1.4.3.tar.bz2) = 58585969a9a33784601122c77bd15a1e
SIZE (KDE/arts-1.4.3.tar.bz2) = 945025

View File

@ -1,14 +1,5 @@
--- soundserver/Makefile.in.orig Fri Mar 4 10:58:22 2005
+++ soundserver/Makefile.in Wed Mar 16 04:32:04 2005
@@ -20,7 +20,7 @@
-SOURCES = $(libartsgslplayobject_la_SOURCES) $(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) $(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) $(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) $(artsrec_SOURCES) $(artsshell_SOURCES) $(artswrapper_SOURCES)
+SOURCES = $(libartsgslplayobject_la_SOURCES) $(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) $(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) $(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) $(artsrec_SOURCES) $(artsshell_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -46,7 +46,7 @@
host_triplet = @host@
target_triplet = @target@

View File

@ -7,7 +7,6 @@
PORTNAME= juk
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@ -62,8 +61,10 @@ pre-everything::
@${ECHO_MSG}
.endif
pre-configure:
${ECHO_CMD} "akode juk" > ${WRKSRC}/inst-apps
do-build:
cd ${WRKSRC}/arts/runtime && gmake
cd ${WRKSRC}/akode && gmake
cd ${WRKSRC}/juk && gmake
do-install:
cd ${WRKSRC}/juk && gmake install

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdemultimedia-3.4.2.tar.bz2) = 7da7ba5fd676acfdf662113a4cdfe43c
SIZE (KDE/kdemultimedia-3.4.2.tar.bz2) = 5535960
MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757

View File

@ -6,7 +6,7 @@
#
PORTNAME= koffice-i18n
PORTVERSION= 1.4.0
PORTVERSION= 1.4.2
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.0.tar.bz2) = e98a9df0ee26a10267355b612dd0a019
SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.0.tar.bz2) = 393532
MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.2.tar.bz2) = 5733aa59661f8828c66ef0d2335d4242
SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.2.tar.bz2) = 393618

View File

@ -2,7 +2,6 @@ share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo
share/locale/zh_CN/LC_MESSAGES/example.mo
share/locale/zh_CN/LC_MESSAGES/karbon.mo
share/locale/zh_CN/LC_MESSAGES/kchart.mo
share/locale/zh_CN/LC_MESSAGES/kdgantt.mo
share/locale/zh_CN/LC_MESSAGES/kexi.mo
share/locale/zh_CN/LC_MESSAGES/kfile_koffice.mo
share/locale/zh_CN/LC_MESSAGES/kfile_ooo.mo

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.4.2.tar.bz2) = 68d7901893e8154a9beec0cb87207013
SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.4.2.tar.bz2) = 1817030
MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.4.3.tar.bz2) = 6efbbf16c3cd3db89b8806101e2a6a0e
SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.4.3.tar.bz2) = 1817416

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.4.2.tar.bz2) = 68d7901893e8154a9beec0cb87207013
SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.4.2.tar.bz2) = 1817030
MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.4.3.tar.bz2) = 6efbbf16c3cd3db89b8806101e2a6a0e
SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.4.3.tar.bz2) = 1817416

View File

@ -6,7 +6,7 @@
#
PORTNAME= koffice-i18n
PORTVERSION= 1.4.0
PORTVERSION= 1.4.2
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.0.tar.bz2) = e98a9df0ee26a10267355b612dd0a019
SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.0.tar.bz2) = 393532
MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.2.tar.bz2) = 5733aa59661f8828c66ef0d2335d4242
SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.2.tar.bz2) = 393618

View File

@ -2,7 +2,6 @@ share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo
share/locale/zh_CN/LC_MESSAGES/example.mo
share/locale/zh_CN/LC_MESSAGES/karbon.mo
share/locale/zh_CN/LC_MESSAGES/kchart.mo
share/locale/zh_CN/LC_MESSAGES/kdgantt.mo
share/locale/zh_CN/LC_MESSAGES/kexi.mo
share/locale/zh_CN/LC_MESSAGES/kfile_koffice.mo
share/locale/zh_CN/LC_MESSAGES/kfile_ooo.mo

View File

@ -6,7 +6,7 @@
#
PORTNAME= koffice-i18n
PORTVERSION= 1.4.0
PORTVERSION= 1.4.2
CATEGORIES?= chinese kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.0.tar.bz2) = e98a9df0ee26a10267355b612dd0a019
SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.0.tar.bz2) = 393532
MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.2.tar.bz2) = 5733aa59661f8828c66ef0d2335d4242
SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.4.2.tar.bz2) = 393618

View File

@ -2,7 +2,6 @@ share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo
share/locale/zh_CN/LC_MESSAGES/example.mo
share/locale/zh_CN/LC_MESSAGES/karbon.mo
share/locale/zh_CN/LC_MESSAGES/kchart.mo
share/locale/zh_CN/LC_MESSAGES/kdgantt.mo
share/locale/zh_CN/LC_MESSAGES/kexi.mo
share/locale/zh_CN/LC_MESSAGES/kfile_koffice.mo
share/locale/zh_CN/LC_MESSAGES/kfile_ooo.mo

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeutils-3.4.2.tar.bz2) = 62500e5ee043937592ebc6ad91dd670d
SIZE (KDE/kdeutils-3.4.2.tar.bz2) = 2290150
MD5 (KDE/kdeutils-3.4.3.tar.bz2) = d467284b523bb1268da776cd016ede4d
SIZE (KDE/kdeutils-3.4.3.tar.bz2) = 2257060

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdeutils-3.4.2.tar.bz2) = 62500e5ee043937592ebc6ad91dd670d
SIZE (KDE/kdeutils-3.4.2.tar.bz2) = 2290150
MD5 (KDE/kdeutils-3.4.3.tar.bz2) = d467284b523bb1268da776cd016ede4d
SIZE (KDE/kdeutils-3.4.3.tar.bz2) = 2257060

View File

@ -7,7 +7,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@ -43,7 +42,7 @@ OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl
RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl-stable
.endif
.if exists(${LOCALBASE}/bin/gnokii)

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdepim-3.4.2.tar.bz2) = e7bd012faa559bcf2a949b6a8ed5ff7f
SIZE (KDE/kdepim-3.4.2.tar.bz2) = 11368492
MD5 (KDE/kdepim-3.4.3.tar.bz2) = b2c145f3779578c9208dcbec9a4a5aea
SIZE (KDE/kdepim-3.4.3.tar.bz2) = 11327132

View File

@ -1,19 +0,0 @@
--- kmail/partNode.cpp.orig Tue Aug 2 00:59:57 2005
+++ kmail/partNode.cpp Tue Aug 2 01:01:06 2005
@@ -36,6 +36,7 @@
#include "kmmimeparttree.h"
#include <mimelib/utility.h>
#include <qregexp.h>
+#include <kasciistricmp.h>
/*
===========================================================================
@@ -414,7 +415,7 @@
partNode* partNode::findNodeForDwPart( DwBodyPart* part )
{
partNode* found = 0;
- if( dwPart()->partId() == part->partId() )
+ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 )
return this;
if( mChild )
found = mChild->findNodeForDwPart( part );

View File

@ -1,10 +0,0 @@
--- kmail/smimeconfiguration.ui.orig Thu Sep 15 19:26:25 2005
+++ kmail/smimeconfiguration.ui Thu Sep 15 19:26:51 2005
@@ -410,7 +410,4 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kleo::keyrequester.h</includehint>
-</includehints>
</UI>

View File

@ -1,49 +0,0 @@
--- kmailcvt/filter_oe.cxx Mon May 23 14:12:15 2005
+++ kmailcvt/filter_oe.cxx Tue Jun 21 14:50:03 2005
@@ -389,20 +389,20 @@
{
bool found = false;
bool foundFilename = false;
- QString folder = "";
+ QString folder;
// we must do this because folder with more than one upper letter
// at start have maybe not a file named like the folder !!!
QString search = filename.lower();
while (!found)
{
- for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
- QString tmp[4] = *it;
+ for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
+ FolderStructure tmp = *it;
if(foundFilename == false) {
QString _tmpFileName = tmp[1];
_tmpFileName = _tmpFileName.lower();
if(_tmpFileName == search) {
- folder.prepend( "-" + tmp[0]);
+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
search = tmp[3];
foundFilename = true;
}
@@ -410,18 +410,18 @@
QString _currentID = tmp[2];
QString _parentID = tmp[3];
if(_currentID == search) {
- if(_parentID == "") { // this is the root of the folder
+ if(_parentID.isEmpty()) { // this is the root of the folder
found = true;
break;
} else {
- folder.prepend( "-" + tmp[0]);
+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
search = tmp[3];
}
}
}
}
// need to break the while loop maybe in some cases
- if((foundFilename == false) && (folder == "")) return folder;
+ if((foundFilename == false) && (folder.isEmpty())) return folder;
}
return folder;
}

View File

@ -1,18 +0,0 @@
Index: filter_oe.hxx
===================================================================
--- kmailcvt/filter_oe.hxx (revision 427509)
+++ kmailcvt/filter_oe.hxx (working copy)
@@ -63,8 +63,12 @@
bool parsedFolder;
/** true if the current parsing file is the folder file */
bool currentIsFolderFile;
+
+ /** Folder structure here has 4 entries. */
+ typedef FolderStructureBase<4> FolderStructure;
/** matrix with information about the folder structure*/
- QValueList<QString[4]> folderStructure;
+ QValueList<FolderStructure> folderStructure;
+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
/** name of the current folder */
QString folderName;

View File

@ -1,15 +0,0 @@
Index: filter_pmail.cxx
===================================================================
--- kmailcvt/filter_pmail.cxx (revision 427509)
+++ kmailcvt/filter_pmail.cxx (working copy)
@@ -325,8 +325,8 @@
while (!found)
{
- for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
- QString tmp[5] = *it;
+ for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
+ FolderStructure tmp = *it;
QString _ID = tmp[2];
if(_ID == search) {

View File

@ -1,19 +0,0 @@
Index: filter_pmail.hxx
===================================================================
--- kmailcvt/filter_pmail.hxx (revision 427509)
+++ kmailcvt/filter_pmail.hxx (working copy)
@@ -50,8 +50,12 @@
QDir dir;
/** pointer to the info */
FilterInfo * inf;
- /** QStringList with the foldernames, First String contains the ID, the second the folder */
- QValueList<QString[5]> folderMatrix;
+
+ /** Folder structure here has 5 entries. */
+ typedef FolderStructureBase<5> FolderStructure;
+ /** List with the foldernames, First String contains the ID, the second the folder. Rest have no semantics at all but are essential anyway. */
+ QValueList<FolderStructure> folderMatrix;
+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
bool folderParsed;

View File

@ -1,63 +0,0 @@
Index: filters.hxx
===================================================================
--- kmailcvt/filters.hxx (revision 427509)
+++ kmailcvt/filters.hxx (working copy)
@@ -86,7 +86,58 @@
QString m_info;
};
+/** Glorified QString[N] for (a) understandability (b) older gcc
+* compatibility, see for instance
+* http://mail.kde.org/pipermail/kmail-devel/2005-April/017690.html
+*/
+template <unsigned int size> class FolderStructureBase
+{
+public:
+ typedef QString NString[size];
+ /** Constructor. Need a default constructor for QValueList. */
+ FolderStructureBase() {} ;
+ /** Constructor. Turn N QStrings into a folder structure
+ * description.
+ */
+ FolderStructureBase(const NString &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ } ;
+
+ /** Copy Constructor. */
+ FolderStructureBase(const FolderStructureBase &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ } ;
+
+ /** Assignment operator. Does the same thing as
+ * the copy constructor.
+ */
+ FolderStructureBase &operator =(const FolderStructureBase &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ return *this;
+ } ;
+
+ /** Access the different fields. There doesn't seem to
+ * be a real semantics for the fields.
+ */
+ const QString operator [](unsigned int i) const
+ {
+ if (i<size) return d[i]; else return QString::null;
+ } ;
+
+ /** Access the different fields, for writing. */
+ QString &operator [](unsigned int i)
+ {
+ Q_ASSERT(i<size);
+ if (i<size) return d[i]; else return d[0];
+ } ;
+private:
+ QString d[size];
+} ;
+
#endif
// vim: ts=2 sw=2 et

View File

@ -1,10 +0,0 @@
--- korn/kornboxcfg.ui.orig Thu Sep 15 12:20:01 2005
+++ korn/kornboxcfg.ui Thu Sep 15 12:21:14 2005
@@ -1692,7 +1692,6 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>keditlistboxmanager.h</includehint>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>

View File

@ -1,10 +0,0 @@
--- korn/korncfg.ui.orig Thu Sep 15 12:21:41 2005
+++ korn/korncfg.ui Thu Sep 15 12:22:00 2005
@@ -162,7 +162,4 @@
<slot access="protected">slotEditBox()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>keditlistboxmanager.h</includehint>
-</includehints>
</UI>

View File

@ -1073,6 +1073,7 @@ share/apps/libkholidays/holiday_co
share/apps/libkholidays/holiday_cz
share/apps/libkholidays/holiday_de
share/apps/libkholidays/holiday_dk
share/apps/libkholidays/holiday_ee
share/apps/libkholidays/holiday_es
share/apps/libkholidays/holiday_fi
share/apps/libkholidays/holiday_fr

View File

@ -7,7 +7,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@ -43,7 +42,7 @@ OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl
RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl-stable
.endif
.if exists(${LOCALBASE}/bin/gnokii)

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdepim-3.4.2.tar.bz2) = e7bd012faa559bcf2a949b6a8ed5ff7f
SIZE (KDE/kdepim-3.4.2.tar.bz2) = 11368492
MD5 (KDE/kdepim-3.4.3.tar.bz2) = b2c145f3779578c9208dcbec9a4a5aea
SIZE (KDE/kdepim-3.4.3.tar.bz2) = 11327132

View File

@ -1,19 +0,0 @@
--- kmail/partNode.cpp.orig Tue Aug 2 00:59:57 2005
+++ kmail/partNode.cpp Tue Aug 2 01:01:06 2005
@@ -36,6 +36,7 @@
#include "kmmimeparttree.h"
#include <mimelib/utility.h>
#include <qregexp.h>
+#include <kasciistricmp.h>
/*
===========================================================================
@@ -414,7 +415,7 @@
partNode* partNode::findNodeForDwPart( DwBodyPart* part )
{
partNode* found = 0;
- if( dwPart()->partId() == part->partId() )
+ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 )
return this;
if( mChild )
found = mChild->findNodeForDwPart( part );

View File

@ -1,10 +0,0 @@
--- kmail/smimeconfiguration.ui.orig Thu Sep 15 19:26:25 2005
+++ kmail/smimeconfiguration.ui Thu Sep 15 19:26:51 2005
@@ -410,7 +410,4 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kleo::keyrequester.h</includehint>
-</includehints>
</UI>

View File

@ -1,49 +0,0 @@
--- kmailcvt/filter_oe.cxx Mon May 23 14:12:15 2005
+++ kmailcvt/filter_oe.cxx Tue Jun 21 14:50:03 2005
@@ -389,20 +389,20 @@
{
bool found = false;
bool foundFilename = false;
- QString folder = "";
+ QString folder;
// we must do this because folder with more than one upper letter
// at start have maybe not a file named like the folder !!!
QString search = filename.lower();
while (!found)
{
- for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
- QString tmp[4] = *it;
+ for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
+ FolderStructure tmp = *it;
if(foundFilename == false) {
QString _tmpFileName = tmp[1];
_tmpFileName = _tmpFileName.lower();
if(_tmpFileName == search) {
- folder.prepend( "-" + tmp[0]);
+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
search = tmp[3];
foundFilename = true;
}
@@ -410,18 +410,18 @@
QString _currentID = tmp[2];
QString _parentID = tmp[3];
if(_currentID == search) {
- if(_parentID == "") { // this is the root of the folder
+ if(_parentID.isEmpty()) { // this is the root of the folder
found = true;
break;
} else {
- folder.prepend( "-" + tmp[0]);
+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
search = tmp[3];
}
}
}
}
// need to break the while loop maybe in some cases
- if((foundFilename == false) && (folder == "")) return folder;
+ if((foundFilename == false) && (folder.isEmpty())) return folder;
}
return folder;
}

View File

@ -1,18 +0,0 @@
Index: filter_oe.hxx
===================================================================
--- kmailcvt/filter_oe.hxx (revision 427509)
+++ kmailcvt/filter_oe.hxx (working copy)
@@ -63,8 +63,12 @@
bool parsedFolder;
/** true if the current parsing file is the folder file */
bool currentIsFolderFile;
+
+ /** Folder structure here has 4 entries. */
+ typedef FolderStructureBase<4> FolderStructure;
/** matrix with information about the folder structure*/
- QValueList<QString[4]> folderStructure;
+ QValueList<FolderStructure> folderStructure;
+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
/** name of the current folder */
QString folderName;

View File

@ -1,15 +0,0 @@
Index: filter_pmail.cxx
===================================================================
--- kmailcvt/filter_pmail.cxx (revision 427509)
+++ kmailcvt/filter_pmail.cxx (working copy)
@@ -325,8 +325,8 @@
while (!found)
{
- for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
- QString tmp[5] = *it;
+ for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
+ FolderStructure tmp = *it;
QString _ID = tmp[2];
if(_ID == search) {

View File

@ -1,19 +0,0 @@
Index: filter_pmail.hxx
===================================================================
--- kmailcvt/filter_pmail.hxx (revision 427509)
+++ kmailcvt/filter_pmail.hxx (working copy)
@@ -50,8 +50,12 @@
QDir dir;
/** pointer to the info */
FilterInfo * inf;
- /** QStringList with the foldernames, First String contains the ID, the second the folder */
- QValueList<QString[5]> folderMatrix;
+
+ /** Folder structure here has 5 entries. */
+ typedef FolderStructureBase<5> FolderStructure;
+ /** List with the foldernames, First String contains the ID, the second the folder. Rest have no semantics at all but are essential anyway. */
+ QValueList<FolderStructure> folderMatrix;
+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
bool folderParsed;

View File

@ -1,63 +0,0 @@
Index: filters.hxx
===================================================================
--- kmailcvt/filters.hxx (revision 427509)
+++ kmailcvt/filters.hxx (working copy)
@@ -86,7 +86,58 @@
QString m_info;
};
+/** Glorified QString[N] for (a) understandability (b) older gcc
+* compatibility, see for instance
+* http://mail.kde.org/pipermail/kmail-devel/2005-April/017690.html
+*/
+template <unsigned int size> class FolderStructureBase
+{
+public:
+ typedef QString NString[size];
+ /** Constructor. Need a default constructor for QValueList. */
+ FolderStructureBase() {} ;
+ /** Constructor. Turn N QStrings into a folder structure
+ * description.
+ */
+ FolderStructureBase(const NString &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ } ;
+
+ /** Copy Constructor. */
+ FolderStructureBase(const FolderStructureBase &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ } ;
+
+ /** Assignment operator. Does the same thing as
+ * the copy constructor.
+ */
+ FolderStructureBase &operator =(const FolderStructureBase &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ return *this;
+ } ;
+
+ /** Access the different fields. There doesn't seem to
+ * be a real semantics for the fields.
+ */
+ const QString operator [](unsigned int i) const
+ {
+ if (i<size) return d[i]; else return QString::null;
+ } ;
+
+ /** Access the different fields, for writing. */
+ QString &operator [](unsigned int i)
+ {
+ Q_ASSERT(i<size);
+ if (i<size) return d[i]; else return d[0];
+ } ;
+private:
+ QString d[size];
+} ;
+
#endif
// vim: ts=2 sw=2 et

View File

@ -1,10 +0,0 @@
--- korn/kornboxcfg.ui.orig Thu Sep 15 12:20:01 2005
+++ korn/kornboxcfg.ui Thu Sep 15 12:21:14 2005
@@ -1692,7 +1692,6 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>keditlistboxmanager.h</includehint>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>

View File

@ -1,10 +0,0 @@
--- korn/korncfg.ui.orig Thu Sep 15 12:21:41 2005
+++ korn/korncfg.ui Thu Sep 15 12:22:00 2005
@@ -162,7 +162,4 @@
<slot access="protected">slotEditBox()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>keditlistboxmanager.h</includehint>
-</includehints>
</UI>

View File

@ -1073,6 +1073,7 @@ share/apps/libkholidays/holiday_co
share/apps/libkholidays/holiday_cz
share/apps/libkholidays/holiday_de
share/apps/libkholidays/holiday_dk
share/apps/libkholidays/holiday_ee
share/apps/libkholidays/holiday_es
share/apps/libkholidays/holiday_fi
share/apps/libkholidays/holiday_fr

View File

@ -7,7 +7,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= deskutils mail news palm kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
@ -43,7 +42,7 @@ OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 500035
RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl
RUN_DEPENDS+= ${LOCALBASE}/lib/libssl.so:${PORTSDIR}/security/openssl-stable
.endif
.if exists(${LOCALBASE}/bin/gnokii)

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdepim-3.4.2.tar.bz2) = e7bd012faa559bcf2a949b6a8ed5ff7f
SIZE (KDE/kdepim-3.4.2.tar.bz2) = 11368492
MD5 (KDE/kdepim-3.4.3.tar.bz2) = b2c145f3779578c9208dcbec9a4a5aea
SIZE (KDE/kdepim-3.4.3.tar.bz2) = 11327132

View File

@ -1,19 +0,0 @@
--- kmail/partNode.cpp.orig Tue Aug 2 00:59:57 2005
+++ kmail/partNode.cpp Tue Aug 2 01:01:06 2005
@@ -36,6 +36,7 @@
#include "kmmimeparttree.h"
#include <mimelib/utility.h>
#include <qregexp.h>
+#include <kasciistricmp.h>
/*
===========================================================================
@@ -414,7 +415,7 @@
partNode* partNode::findNodeForDwPart( DwBodyPart* part )
{
partNode* found = 0;
- if( dwPart()->partId() == part->partId() )
+ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 )
return this;
if( mChild )
found = mChild->findNodeForDwPart( part );

View File

@ -1,10 +0,0 @@
--- kmail/smimeconfiguration.ui.orig Thu Sep 15 19:26:25 2005
+++ kmail/smimeconfiguration.ui Thu Sep 15 19:26:51 2005
@@ -410,7 +410,4 @@
</connection>
</connections>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>kleo::keyrequester.h</includehint>
-</includehints>
</UI>

View File

@ -1,49 +0,0 @@
--- kmailcvt/filter_oe.cxx Mon May 23 14:12:15 2005
+++ kmailcvt/filter_oe.cxx Tue Jun 21 14:50:03 2005
@@ -389,20 +389,20 @@
{
bool found = false;
bool foundFilename = false;
- QString folder = "";
+ QString folder;
// we must do this because folder with more than one upper letter
// at start have maybe not a file named like the folder !!!
QString search = filename.lower();
while (!found)
{
- for ( QValueList<QString[4]>::Iterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
- QString tmp[4] = *it;
+ for ( FolderStructureIterator it = folderStructure.begin(); it != folderStructure.end(); it++) {
+ FolderStructure tmp = *it;
if(foundFilename == false) {
QString _tmpFileName = tmp[1];
_tmpFileName = _tmpFileName.lower();
if(_tmpFileName == search) {
- folder.prepend( "-" + tmp[0]);
+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
search = tmp[3];
foundFilename = true;
}
@@ -410,18 +410,18 @@
QString _currentID = tmp[2];
QString _parentID = tmp[3];
if(_currentID == search) {
- if(_parentID == "") { // this is the root of the folder
+ if(_parentID.isEmpty()) { // this is the root of the folder
found = true;
break;
} else {
- folder.prepend( "-" + tmp[0]);
+ folder.prepend( tmp[0] + QString::fromLatin1("-") );
search = tmp[3];
}
}
}
}
// need to break the while loop maybe in some cases
- if((foundFilename == false) && (folder == "")) return folder;
+ if((foundFilename == false) && (folder.isEmpty())) return folder;
}
return folder;
}

View File

@ -1,18 +0,0 @@
Index: filter_oe.hxx
===================================================================
--- kmailcvt/filter_oe.hxx (revision 427509)
+++ kmailcvt/filter_oe.hxx (working copy)
@@ -63,8 +63,12 @@
bool parsedFolder;
/** true if the current parsing file is the folder file */
bool currentIsFolderFile;
+
+ /** Folder structure here has 4 entries. */
+ typedef FolderStructureBase<4> FolderStructure;
/** matrix with information about the folder structure*/
- QValueList<QString[4]> folderStructure;
+ QValueList<FolderStructure> folderStructure;
+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
/** name of the current folder */
QString folderName;

View File

@ -1,15 +0,0 @@
Index: filter_pmail.cxx
===================================================================
--- kmailcvt/filter_pmail.cxx (revision 427509)
+++ kmailcvt/filter_pmail.cxx (working copy)
@@ -325,8 +325,8 @@
while (!found)
{
- for ( QValueList<QString[5]>::Iterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
- QString tmp[5] = *it;
+ for ( FolderStructureIterator it = folderMatrix.begin(); it != folderMatrix.end(); it++) {
+ FolderStructure tmp = *it;
QString _ID = tmp[2];
if(_ID == search) {

View File

@ -1,19 +0,0 @@
Index: filter_pmail.hxx
===================================================================
--- kmailcvt/filter_pmail.hxx (revision 427509)
+++ kmailcvt/filter_pmail.hxx (working copy)
@@ -50,8 +50,12 @@
QDir dir;
/** pointer to the info */
FilterInfo * inf;
- /** QStringList with the foldernames, First String contains the ID, the second the folder */
- QValueList<QString[5]> folderMatrix;
+
+ /** Folder structure here has 5 entries. */
+ typedef FolderStructureBase<5> FolderStructure;
+ /** List with the foldernames, First String contains the ID, the second the folder. Rest have no semantics at all but are essential anyway. */
+ QValueList<FolderStructure> folderMatrix;
+ typedef QValueList<FolderStructure>::Iterator FolderStructureIterator;
bool folderParsed;

View File

@ -1,63 +0,0 @@
Index: filters.hxx
===================================================================
--- kmailcvt/filters.hxx (revision 427509)
+++ kmailcvt/filters.hxx (working copy)
@@ -86,7 +86,58 @@
QString m_info;
};
+/** Glorified QString[N] for (a) understandability (b) older gcc
+* compatibility, see for instance
+* http://mail.kde.org/pipermail/kmail-devel/2005-April/017690.html
+*/
+template <unsigned int size> class FolderStructureBase
+{
+public:
+ typedef QString NString[size];
+ /** Constructor. Need a default constructor for QValueList. */
+ FolderStructureBase() {} ;
+ /** Constructor. Turn N QStrings into a folder structure
+ * description.
+ */
+ FolderStructureBase(const NString &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ } ;
+
+ /** Copy Constructor. */
+ FolderStructureBase(const FolderStructureBase &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ } ;
+
+ /** Assignment operator. Does the same thing as
+ * the copy constructor.
+ */
+ FolderStructureBase &operator =(const FolderStructureBase &s)
+ {
+ for(unsigned int i=0; i<size; i++) d[i]=s[i];
+ return *this;
+ } ;
+
+ /** Access the different fields. There doesn't seem to
+ * be a real semantics for the fields.
+ */
+ const QString operator [](unsigned int i) const
+ {
+ if (i<size) return d[i]; else return QString::null;
+ } ;
+
+ /** Access the different fields, for writing. */
+ QString &operator [](unsigned int i)
+ {
+ Q_ASSERT(i<size);
+ if (i<size) return d[i]; else return d[0];
+ } ;
+private:
+ QString d[size];
+} ;
+
#endif
// vim: ts=2 sw=2 et

View File

@ -1,10 +0,0 @@
--- korn/kornboxcfg.ui.orig Thu Sep 15 12:20:01 2005
+++ korn/kornboxcfg.ui Thu Sep 15 12:21:14 2005
@@ -1692,7 +1692,6 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>keditlistboxmanager.h</includehint>
<includehint>keditlistbox.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>

View File

@ -1,10 +0,0 @@
--- korn/korncfg.ui.orig Thu Sep 15 12:21:41 2005
+++ korn/korncfg.ui Thu Sep 15 12:22:00 2005
@@ -162,7 +162,4 @@
<slot access="protected">slotEditBox()</slot>
</slots>
<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>keditlistboxmanager.h</includehint>
-</includehints>
</UI>

View File

@ -1073,6 +1073,7 @@ share/apps/libkholidays/holiday_co
share/apps/libkholidays/holiday_cz
share/apps/libkholidays/holiday_de
share/apps/libkholidays/holiday_dk
share/apps/libkholidays/holiday_ee
share/apps/libkholidays/holiday_es
share/apps/libkholidays/holiday_fi
share/apps/libkholidays/holiday_fr

View File

@ -7,7 +7,6 @@
PORTNAME= kdesdk
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdesdk-3.4.2.tar.bz2) = ec794b8f2a492a188cae8fb38208e1b9
SIZE (KDE/kdesdk-3.4.2.tar.bz2) = 4596440
MD5 (KDE/kdesdk-3.4.3.tar.bz2) = d0d51c35769709b00b2ff7d59ed90631
SIZE (KDE/kdesdk-3.4.3.tar.bz2) = 4584263

View File

@ -1,16 +0,0 @@
--- umbrello/umbrello/dialogs/codevieweroptionsbase.ui.orig Thu Sep 15 21:46:21 2005
+++ umbrello/umbrello/dialogs/codevieweroptionsbase.ui Thu Sep 15 21:46:42 2005
@@ -364,13 +364,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kfontchooser.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
</includehints>
</UI>

View File

@ -7,7 +7,6 @@
PORTNAME= kdesdk
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdesdk-3.4.2.tar.bz2) = ec794b8f2a492a188cae8fb38208e1b9
SIZE (KDE/kdesdk-3.4.2.tar.bz2) = 4596440
MD5 (KDE/kdesdk-3.4.3.tar.bz2) = d0d51c35769709b00b2ff7d59ed90631
SIZE (KDE/kdesdk-3.4.3.tar.bz2) = 4584263

View File

@ -1,16 +0,0 @@
--- umbrello/umbrello/dialogs/codevieweroptionsbase.ui.orig Thu Sep 15 21:46:21 2005
+++ umbrello/umbrello/dialogs/codevieweroptionsbase.ui Thu Sep 15 21:46:42 2005
@@ -364,13 +364,6 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kfontchooser.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
</includehints>
</UI>

View File

@ -6,7 +6,7 @@
#
PORTNAME= kdevelop
PORTVERSION= 3.2.2
PORTVERSION= 3.2.3
CATEGORIES?= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION:S/.0//}/src

View File

@ -1,2 +1,2 @@
MD5 (KDE/kdevelop-3.2.2.tar.bz2) = 6d788b8ec89ea9b19f5c281a574b48fe
SIZE (KDE/kdevelop-3.2.2.tar.bz2) = 8350892
MD5 (KDE/kdevelop-3.2.3.tar.bz2) = 7dfae96e274c6dcb4748419452ebdf35
SIZE (KDE/kdevelop-3.2.3.tar.bz2) = 8353809

View File

@ -1,9 +0,0 @@
--- parts/tools/addtooldlg.ui 2005/07/26 18:54:59 438982
+++ parts/tools/addtooldlg.ui 2005/09/15 07:27:50 460783
@@ -241,6 +241,5 @@
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
- <includehint>kdevapplicationtree.h</includehint>
</includehints>
</UI>

View File

@ -6,7 +6,7 @@
#
PORTNAME= koffice-i18n
PORTVERSION= 1.4.1
PORTVERSION= 1.4.2
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = f011aa527e4b476f18f1fda9a043f81b
SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.1.tar.bz2) = 398993
MD5 (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 8a546eec2897af073bb564edf7150b6d
SIZE (KDE/kde-i18n/koffice-l10n-ca-1.4.2.tar.bz2) = 438905

View File

@ -3,7 +3,6 @@ share/locale/ca/LC_MESSAGES/desktop_koffice.mo
share/locale/ca/LC_MESSAGES/example.mo
share/locale/ca/LC_MESSAGES/karbon.mo
share/locale/ca/LC_MESSAGES/kchart.mo
share/locale/ca/LC_MESSAGES/kdgantt.mo
share/locale/ca/LC_MESSAGES/kexi.mo
share/locale/ca/LC_MESSAGES/kfile_koffice.mo
share/locale/ca/LC_MESSAGES/kfile_ooo.mo

View File

@ -6,7 +6,7 @@
#
PORTNAME= koffice-i18n
PORTVERSION= 1.4.1
PORTVERSION= 1.4.2
CATEGORIES?= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src/koffice-l10n

View File

@ -1,2 +1,2 @@
MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 3bcda6ccf32a2b0916f5de47981be655
SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.1.tar.bz2) = 817010
MD5 (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = f6c3b0afcb299519f0663aa5a3ff3362
SIZE (KDE/kde-i18n/koffice-l10n-da-1.4.2.tar.bz2) = 832248

Some files were not shown because too many files have changed in this diff Show More